diff options
| author |   millert <millert@openbsd.org> | 1997-09-28 21:44:37 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1997-09-28 21:44:37 +0000 |
| commit | a7532b01362286f15f08e3a0848c9d570f5b8b77 (patch) | |
| tree | 8ed227902406c6ac5a350ca32530033d28204a6e /usr.sbin/pppd/sys-bsd.c | |
| parent | cpu_reset() changes, inspired by netbsd (diff) | |
| download | wireguard-openbsd-a7532b01362286f15f08e3a0848c9d570f5b8b77.tar.xz wireguard-openbsd-a7532b01362286f15f08e3a0848c9d570f5b8b77.zip | |
Allow pppd to change interface addr when demand dialing & dynamic addressing.
Fix from Dave Huang <khym@bga.com> based on what ifconfig does.
Diffstat (limited to 'usr.sbin/pppd/sys-bsd.c')
| -rw-r--r-- | usr.sbin/pppd/sys-bsd.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index 3ded09d9a2a..d307cc32778 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys-bsd.c,v 1.8 1997/09/05 04:32:45 millert Exp $ */ +/* $OpenBSD: sys-bsd.c,v 1.9 1997/09/28 21:44:37 millert Exp $ */ /* * sys-bsd.c - System-dependent procedures for setting up @@ -26,7 +26,7 @@ #if 0 static char rcsid[] = "Id: sys-bsd.c,v 1.28 1997/04/30 05:57:46 paulus Exp"; #else -static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.8 1997/09/05 04:32:45 millert Exp $"; +static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.9 1997/09/28 21:44:37 millert Exp $"; #endif #endif @@ -1062,6 +1062,7 @@ sifaddr(u, o, h, m) u_int32_t o, h, m; { struct ifaliasreq ifra; + struct ifreq ifr; strncpy(ifra.ifra_name, ifname, sizeof(ifra.ifra_name) - 1); ifra.ifra_name[sizeof(ifra.ifra_name) - 1] = '\0'; @@ -1074,6 +1075,13 @@ sifaddr(u, o, h, m) ((struct sockaddr_in *) &ifra.ifra_mask)->sin_addr.s_addr = m; } else BZERO(&ifra.ifra_mask, sizeof(ifra.ifra_mask)); + BZERO(&ifr, sizeof(ifr)); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); + ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; + if (ioctl(sockfd, SIOCDIFADDR, (caddr_t) &ifr) < 0) { + if (errno != EADDRNOTAVAIL) + syslog(LOG_WARNING, "Couldn't remove interface address: %m"); + } if (ioctl(sockfd, SIOCAIFADDR, (caddr_t) &ifra) < 0) { if (errno != EEXIST) { syslog(LOG_ERR, "Couldn't set interface address: %m"); |