X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-osf.c;h=3578f67f861b3289d6326924910ba90e0bf77d70;hp=5f8233ebb8ca0d79e3094a6bd21a7df9846f40ca;hb=88890fc13f9b346db647c882b376926686177112;hpb=fbd84e94fedad26d52d3ab46de501da4945c98ca diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c index 5f8233e..3578f67 100644 --- a/pppd/sys-osf.c +++ b/pppd/sys-osf.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-osf.c,v 1.6 1996/01/01 23:07:07 paulus Exp $"; +static char rcsid[] = "$Id: sys-osf.c,v 1.9 1996/05/26 23:58:46 paulus Exp $"; #endif /* @@ -74,6 +74,7 @@ static int sockfd; /* socket for doing interface ioctls */ int orig_ttyfd = -1; /* Original ttyfd if we did a streamify() */ static int if_is_up; /* Interface has been marked up */ +static u_int32_t ifaddrs[2]; /* Local and remote addrs we've set */ static u_int32_t default_route_gateway; /* Gateway for default route added */ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ @@ -89,11 +90,6 @@ static int get_ether_addr __P((u_int32_t, struct sockaddr *)); void sys_init() { - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); - /* Get an internet socket for doing socket ioctl's on. */ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { syslog(LOG_ERR, "Couldn't create IP socket: %m"); @@ -119,27 +115,14 @@ sys_cleanup() ioctl(sockfd, SIOCSIFFLAGS, &ifr); } } - + if (ifaddrs[0]) + cifaddr(0, ifaddrs[0], ifaddrs[1]); if (default_route_gateway) cifdefaultroute(0, default_route_gateway); if (proxy_arp_addr) cifproxyarp(0, proxy_arp_addr); } -/* - * note_debug_level - note a change in the debug level. - */ -void -note_debug_level() -{ - if (debug) { - syslog(LOG_INFO, "Debug turned ON, Level %d", debug); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); - } -} - /* * daemon - Detach us from the terminal session. */ @@ -928,7 +911,6 @@ sifup(u) int u; { struct ifreq ifr; - struct npioctl npi; strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, (int)SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -941,14 +923,6 @@ sifup(u) return 0; } if_is_up = 1; - npi.protocol = PPP_IP; - npi.mode = NPMODE_PASS; - if (ioctl(ttyfd, (int)SIOCSETNPMODE, &npi) < 0) { - if (errno != ENOTTY) { - syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); - return 0; - } - } return 1; } @@ -966,12 +940,7 @@ sifdown(u) rv = 1; npi.protocol = PPP_IP; npi.mode = NPMODE_ERROR; - if (ioctl(ttyfd, (int)SIOCSETNPMODE, (caddr_t) &npi) < 0) { - if (errno != ENOTTY) { - syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); - rv = 0; - } - } + ioctl(ttyfd, (int)SIOCSETNPMODE, (caddr_t) &npi); /* ignore errors */ strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, (int)SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -993,7 +962,8 @@ sifdown(u) */ #define SET_SA_FAMILY(addr, family) \ BZERO((char *) &(addr), sizeof(addr)); \ - addr.sa_family = (family); + addr.sa_family = (family); \ + addr.sa_len = sizeof ((addr)) /* * sifaddr - Config the interface IP addresses and netmask. @@ -1003,40 +973,47 @@ sifaddr(u, o, h, m) int u; u_int32_t o, h, m; { - int ret; struct ifreq ifr; + struct ifaliasreq addreq; + int ret; ret = 1; + + /* flush old address, if any + */ + bzero(&ifr, sizeof (ifr)); strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); SET_SA_FAMILY(ifr.ifr_addr, AF_INET); ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o; - if (ioctl(sockfd, (int)SIOCSIFADDR, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m"); - ret = 0; - } - ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h; - if (ioctl(sockfd, (int)SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); + if ((ioctl(sockfd, (int)SIOCDIFADDR, (caddr_t) &ifr) < 0) + && errno != EADDRNOTAVAIL) { + syslog(LOG_ERR, "ioctl(SIOCDIFADDR): %m"); ret = 0; } + + bzero(&addreq, sizeof (addreq)); + strncpy(addreq.ifra_name, ifname, sizeof (addreq.ifra_name)); + SET_SA_FAMILY(addreq.ifra_addr, AF_INET); + SET_SA_FAMILY(addreq.ifra_broadaddr, AF_INET); + ((struct sockaddr_in *)&addreq.ifra_addr)->sin_addr.s_addr = o; + ((struct sockaddr_in *)&addreq.ifra_broadaddr)->sin_addr.s_addr = h; + if (m != 0) { - ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = m; + ((struct sockaddr_in *)&addreq.ifra_mask)->sin_addr.s_addr = m; + addreq.ifra_mask.sa_len = sizeof (struct sockaddr); syslog(LOG_INFO, "Setting interface mask to %s\n", ip_ntoa(m)); - if (ioctl(sockfd, (int)SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m"); - ret = 0; - } } - -/* Reset if address --- This is stupid, but seems to be necessary... */ - - ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o; - if (ioctl(sockfd, (int)SIOCSIFADDR, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m"); - ret = 0; + + /* install new src/dst and (possibly) netmask + */ + if (ioctl(sockfd, SIOCPIFADDR, &addreq) < 0) { + syslog(LOG_ERR, "ioctl(SIOCPIFADDR): %m"); + ret = 0; } - - return ret; + + ifaddrs[0] = o; + ifaddrs[1] = h; + return (ret); } /* @@ -1048,15 +1025,15 @@ cifaddr(u, o, h) int u; u_int32_t o, h; { - struct ortentry rt; + struct ifreq ifr; - SET_SA_FAMILY(rt.rt_dst, AF_INET); - ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = h; - SET_SA_FAMILY(rt.rt_gateway, AF_INET); - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = o; - rt.rt_flags = RTF_HOST; - if (ioctl(sockfd, (int)SIOCDELRT, (caddr_t) &rt) < 0) { - syslog(LOG_ERR, "ioctl(SIOCDELRT): %m"); + ifaddrs[0] = 0; + bzero(&ifr, sizeof (ifr)); + strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + SET_SA_FAMILY(ifr.ifr_addr, AF_INET); + ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o; + if (ioctl(sockfd, (int)SIOCDIFADDR, (caddr_t) &ifr) < 0) { + syslog(LOG_ERR, "ioctl(SIOCDIFADDR): %m"); return 0; } return 1; @@ -1072,6 +1049,7 @@ sifdefaultroute(u, g) { struct ortentry rt; + BZERO(&rt, sizeof(rt)); SET_SA_FAMILY(rt.rt_dst, AF_INET); SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; @@ -1094,6 +1072,7 @@ cifdefaultroute(u, g) { struct ortentry rt; + BZERO(&rt, sizeof(rt)); SET_SA_FAMILY(rt.rt_dst, AF_INET); SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; @@ -1193,7 +1172,8 @@ get_ether_addr(ipaddr, hwaddr) * address on the same subnet as `ipaddr'. */ ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); - for (ifr = ifc.ifc_req; ifr < ifend; ) { + for (ifr = ifc.ifc_req; ifr < ifend; +ifr = (struct ifreq *) + ((char *)&ifr->ifr_addr + ifr->ifr_addr.sa_len) { if (ifr->ifr_addr.sa_family == AF_INET) { ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); @@ -1218,7 +1198,6 @@ get_ether_addr(ipaddr, hwaddr) break; } - ifr++; } if (ifr >= ifend)