diff options
author | Brian Somers <brian@FreeBSD.org> | 1997-08-25 00:29:32 +0000 |
---|---|---|
committer | Brian Somers <brian@FreeBSD.org> | 1997-08-25 00:29:32 +0000 |
commit | 944f709824ad3bd24c8318843a65198f6ef36c85 (patch) | |
tree | 462e956d74fef28e32846916ec1a402792684dc4 /usr.sbin/ppp/os.c | |
parent | 30761f8783061e89a32aa2109678f3cfa65cbaac (diff) | |
download | src-944f709824ad3bd24c8318843a65198f6ef36c85.tar.gz src-944f709824ad3bd24c8318843a65198f6ef36c85.zip |
Make the code format more in line with style(9).
Update loadalias to use the new libalias api.
Update to version 1.1.
Notes
Notes:
svn path=/head/; revision=28679
Diffstat (limited to 'usr.sbin/ppp/os.c')
-rw-r--r-- | usr.sbin/ppp/os.c | 169 |
1 files changed, 84 insertions, 85 deletions
diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c index a37a76034a81..6f9073cf7e0b 100644 --- a/usr.sbin/ppp/os.c +++ b/usr.sbin/ppp/os.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: os.c,v 1.22 1997/06/09 03:27:31 brian Exp $ + * $Id: os.c,v 1.23 1997/06/13 02:07:30 brian Exp $ * */ #include "fsm.h" @@ -53,15 +53,17 @@ static int linkup; #ifdef bsdi extern char *inet_ntoa(); + #endif extern void HangupModem(); char *IfDevName; static int -SetIpDevice(myaddr, hisaddr, netmask, updown) -struct in_addr myaddr, hisaddr, netmask; -int updown; +SetIpDevice(struct in_addr myaddr, + struct in_addr hisaddr, + struct in_addr netmask, + int updown) { struct sockaddr_in *sin; int s; @@ -71,15 +73,14 @@ int updown; s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { LogPrintf(LogERROR, "socket: %s", strerror(errno)); - return(-1); + return (-1); } - if (updown == 0) { if (Enabled(ConfProxy)) cifproxyarp(s, oldhis.s_addr); if (oldmine.s_addr == 0 && oldhis.s_addr == 0) { close(s); - return(0); + return (0); } bzero(&ifra.ifra_addr, sizeof(ifra.ifra_addr)); bzero(&ifra.ifra_broadaddr, sizeof(ifra.ifra_addr)); @@ -87,40 +88,44 @@ int updown; if (ioctl(s, SIOCDIFADDR, &ifra) < 0) { LogPrintf(LogERROR, "ioctl(SIOCDIFADDR): %s", strerror(errno)); close(s); - return(-1); + return (-1); } - oldmine.s_addr = oldhis.s_addr = 0; } else { + /* * If given addresses are alreay set, then ignore this request. */ if (oldmine.s_addr == myaddr.s_addr && oldhis.s_addr == hisaddr.s_addr) { close(s); - return(0); + return (0); } + /* * If different address has been set, then delete it first. */ if (oldmine.s_addr || oldhis.s_addr) { changeaddr = 1; } + /* - * Set interface address + * Set interface address */ - sin = (struct sockaddr_in *)&(ifra.ifra_addr); + sin = (struct sockaddr_in *) & (ifra.ifra_addr); sin->sin_family = AF_INET; sin->sin_addr = oldmine = myaddr; sin->sin_len = sizeof(*sin); + /* - * Set destination address + * Set destination address */ - sin = (struct sockaddr_in *)&(ifra.ifra_broadaddr); + sin = (struct sockaddr_in *) & (ifra.ifra_broadaddr); sin->sin_family = AF_INET; sin->sin_addr = oldhis = hisaddr; sin->sin_len = sizeof(*sin); + /* - */ + * */ addr = ntohl(myaddr.s_addr); if (IN_CLASSA(addr)) mask = IN_CLASSA_NET; @@ -128,49 +133,52 @@ int updown; mask = IN_CLASSB_NET; else mask = IN_CLASSC_NET; + /* - * if subnet mask is given, use it instead of class mask. + * if subnet mask is given, use it instead of class mask. */ if (netmask.s_addr && (ntohl(netmask.s_addr) & mask) == mask) mask = ntohl(netmask.s_addr); - sin = (struct sockaddr_in *)&(ifra.ifra_mask); + sin = (struct sockaddr_in *) & (ifra.ifra_mask); sin->sin_family = AF_INET; sin->sin_addr.s_addr = htonl(mask); sin->sin_len = sizeof(*sin); if (changeaddr) { + /* * Interface already exists. Just change the address. */ bcopy(&ifra.ifra_addr, &ifrq.ifr_addr, sizeof(struct sockaddr)); if (ioctl(s, SIOCSIFADDR, &ifra) < 0) - LogPrintf(LogERROR, "ioctl(SIFADDR): %s", strerror(errno)); + LogPrintf(LogERROR, "ioctl(SIFADDR): %s", strerror(errno)); bcopy(&ifra.ifra_broadaddr, &ifrq.ifr_dstaddr, sizeof(struct sockaddr)); if (ioctl(s, SIOCSIFDSTADDR, &ifrq) < 0) - LogPrintf(LogERROR, "ioctl(SIFDSTADDR): %s", strerror(errno)); + LogPrintf(LogERROR, "ioctl(SIFDSTADDR): %s", strerror(errno)); #ifdef notdef bcopy(&ifra.ifra_mask, &ifrq.ifr_broadaddr, sizeof(struct sockaddr)); if (ioctl(s, SIOCSIFBRDADDR, &ifrq) < 0) - LogPrintf(LogERROR, "ioctl(SIFBRDADDR): %s", strerror(errno)); + LogPrintf(LogERROR, "ioctl(SIFBRDADDR): %s", strerror(errno)); #endif } else if (ioctl(s, SIOCAIFADDR, &ifra) < 0) { LogPrintf(LogERROR, "ioctl(SIOCAIFADDR): %s", strerror(errno)); close(s); - return(-1); + return (-1); } if (Enabled(ConfProxy)) sifproxyarp(s, hisaddr.s_addr); } close(s); - return(0); + return (0); } int -OsSetIpaddress(myaddr, hisaddr, netmask) -struct in_addr myaddr, hisaddr, netmask; +OsSetIpaddress(struct in_addr myaddr, + struct in_addr hisaddr, + struct in_addr netmask) { - return(SetIpDevice(myaddr, hisaddr, netmask, 1)); + return (SetIpDevice(myaddr, hisaddr, netmask, 1)); } static struct in_addr peer_addr; @@ -184,16 +192,17 @@ OsLinkup() if (linkup == 0) { reconnectState = RECON_UNKNOWN; if (mode & MODE_BACKGROUND && BGFiledes[1] != -1) { - char c = EX_NORMAL; - if (write(BGFiledes[1],&c,1) == 1) - LogPrintf(LogPHASE,"Parent notified of success.\n"); - else - LogPrintf(LogPHASE,"Failed to notify parent of success.\n"); - close(BGFiledes[1]); - BGFiledes[1] = -1; + char c = EX_NORMAL; + + if (write(BGFiledes[1], &c, 1) == 1) + LogPrintf(LogPHASE, "Parent notified of success.\n"); + else + LogPrintf(LogPHASE, "Failed to notify parent of success.\n"); + close(BGFiledes[1]); + BGFiledes[1] = -1; } peer_addr = IpcpInfo.his_ipaddr; - s = (char *)inet_ntoa(peer_addr); + s = (char *) inet_ntoa(peer_addr); if (LogIsKept(LogLINK)) LogPrintf(LogLINK, "OsLinkup: %s\n", s); else @@ -201,10 +210,10 @@ OsLinkup() if (SelectSystem(inet_ntoa(IpcpInfo.want_ipaddr), LINKUPFILE) < 0) { if (dstsystem) { - if (SelectSystem(dstsystem, LINKUPFILE) < 0) - SelectSystem("MYADDR", LINKUPFILE); + if (SelectSystem(dstsystem, LINKUPFILE) < 0) + SelectSystem("MYADDR", LINKUPFILE); } else - SelectSystem("MYADDR", LINKUPFILE); + SelectSystem("MYADDR", LINKUPFILE); } linkup = 1; } @@ -216,7 +225,7 @@ OsLinkdown() char *s; if (linkup) { - s = (char *)inet_ntoa(peer_addr); + s = (char *) inet_ntoa(peer_addr); if (LogIsKept(LogLINK)) LogPrintf(LogLINK, "OsLinkdown: %s\n", s); else @@ -227,46 +236,43 @@ OsLinkdown() linkup = 0; if (SelectSystem(s, LINKDOWNFILE) < 0) { if (dstsystem) { - if (SelectSystem(dstsystem, LINKDOWNFILE) < 0) - SelectSystem("MYADDR", LINKDOWNFILE); + if (SelectSystem(dstsystem, LINKDOWNFILE) < 0) + SelectSystem("MYADDR", LINKDOWNFILE); } else - SelectSystem("MYADDR", LINKDOWNFILE); + SelectSystem("MYADDR", LINKDOWNFILE); } } } int -OsInterfaceDown(final) -int final; +OsInterfaceDown(int final) { struct in_addr zeroaddr; int s; OsLinkdown(); if (!final && (mode & MODE_AUTO)) /* We still want interface alive */ - return(0); + return (0); s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { LogPrintf(LogERROR, "socket: %s", strerror(errno)); - return(-1); + return (-1); } ifrq.ifr_flags &= ~IFF_UP; if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { LogPrintf(LogERROR, "ioctl(SIOCSIFFLAGS): %s", strerror(errno)); close(s); - return(-1); + return (-1); } - zeroaddr.s_addr = 0; SetIpDevice(zeroaddr, zeroaddr, zeroaddr, 0); close(s); - return(0); + return (0); } void -OsSetInterfaceParams(type, mtu, speed) -int type, mtu, speed; +OsSetInterfaceParams(int type, int mtu, int speed) { struct tuninfo info; @@ -289,32 +295,31 @@ int type, mtu, speed; * 'Device not configured' (ENXIO), or the third * * 'No such file or directory' (ENOENT) error. */ int -OpenTunnel(ptun) -int *ptun; +OpenTunnel(int *ptun) { int s; char ifname[IFNAMSIZ]; - static char devname[14]; /* sufficient room for "/dev/tun65535" */ - unsigned unit, enoentcount=0; + static char devname[14]; /* sufficient room for "/dev/tun65535" */ + unsigned unit, enoentcount = 0; int err; err = ENOENT; - for( unit=0; unit <= MAX_TUN ; unit++ ) { - snprintf( devname, sizeof(devname), "/dev/tun%d", unit ); + for (unit = 0; unit <= MAX_TUN; unit++) { + snprintf(devname, sizeof(devname), "/dev/tun%d", unit); tun_out = open(devname, O_RDWR); - if( tun_out >= 0 ) - break; - if( errno == ENXIO ) { + if (tun_out >= 0) + break; + if (errno == ENXIO) { + unit = MAX_TUN; + err = errno; + } else if (errno == ENOENT) { + enoentcount++; + if (enoentcount > 2) unit = MAX_TUN; - err = errno; - } else if( errno == ENOENT ) { - enoentcount++; - if( enoentcount > 2 ) - unit=MAX_TUN; } else - err = errno; + err = errno; } - if( unit > MAX_TUN ) { + if (unit > MAX_TUN) { if (VarTerm) fprintf(VarTerm, "No tunnel device is available (%s).\n", strerror(err)); return -1; @@ -326,66 +331,60 @@ int *ptun; /* * At first, name the interface. */ - strncpy(ifname, devname + 5, IFNAMSIZ-1); + strncpy(ifname, devname + 5, IFNAMSIZ - 1); - bzero((char *)&ifra, sizeof(ifra)); - bzero((char *)&ifrq, sizeof(ifrq)); + bzero((char *) &ifra, sizeof(ifra)); + bzero((char *) &ifrq, sizeof(ifrq)); - strncpy(ifrq.ifr_name, ifname, IFNAMSIZ-1); - strncpy(ifra.ifra_name, ifname, IFNAMSIZ-1); + strncpy(ifrq.ifr_name, ifname, IFNAMSIZ - 1); + strncpy(ifra.ifra_name, ifname, IFNAMSIZ - 1); s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { LogPrintf(LogERROR, "socket: %s", strerror(errno)); - return(-1); + return (-1); } /* - * Now, bring up the interface. + * Now, bring up the interface. */ if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { LogPrintf(LogERROR, "ioctl(SIOCGIFFLAGS): %s", strerror(errno)); close(s); - return(-1); + return (-1); } - ifrq.ifr_flags |= IFF_UP; if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { LogPrintf(LogERROR, "ioctl(SIOCSIFFLAGS): %s", strerror(errno)); close(s); - return(-1); + return (-1); } - tun_in = tun_out; IfDevName = devname + 5; if (GetIfIndex(IfDevName) < 0) { LogPrintf(LogERROR, "OpenTunnel: Can't find ifindex.\n"); close(s); - return(-1); + return (-1); } if (VarTerm) fprintf(VarTerm, "Using interface: %s\n", IfDevName); LogPrintf(LogPHASE, "Using interface: %s\n", IfDevName); close(s); - return(0); + return (0); } void -OsCloseLink(flag) -int flag; +OsCloseLink(int flag) { HangupModem(flag); } void -OsAddInOctets(cnt) -int cnt; +OsAddInOctets(int cnt) { } void -OsAddOutOctets(cnt) -int cnt; +OsAddOutOctets(int cnt) { } - |