diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2010-11-17 19:25:50 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2010-11-17 19:25:50 +0000 |
| commit | fba69b74bcc33f33bfb568967517a2990fa781bd (patch) | |
| tree | 719494fb31a98a3501e19952ec4c8b1b1c19845f /sys/net/if_spppsubr.c | |
| parent | fca6097ec78e2ba41a18ba185ebefad4abc48c50 (diff) | |
an extra parameter for in_ifinit, indicating wether the ifaddr passed to it
is new or an already existing one. for existing ones, call ifa_del first
tested by many as part of a larger diff, ok claudio dlg krw sthen
Diffstat (limited to 'sys/net/if_spppsubr.c')
| -rw-r--r-- | sys/net/if_spppsubr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 13931a8ca4a..6b5cd37ac03 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.82 2010/09/13 08:53:06 claudio Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.83 2010/11/17 19:25:49 henning Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -4743,7 +4743,7 @@ sppp_set_ip_addrs(struct sppp *sp, u_int32_t myaddr, u_int32_t hisaddr) *dest = new_dst; /* fix dstaddr in place */ } } - if (!(error = in_ifinit(ifp, ifatoia(ifa), &new_sin, 0))) + if (!(error = in_ifinit(ifp, ifatoia(ifa), &new_sin, 0, 0))) dohooks(ifp->if_addrhooks, 0); if (debug && error) { log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addrs: in_ifinit " @@ -4795,7 +4795,7 @@ sppp_clear_ip_addrs(struct sppp *sp) if (sp->ipcp.flags & IPCP_HISADDR_DYN) /* replace peer addr in place */ dest->sin_addr.s_addr = sp->ipcp.saved_hisaddr; - if (!in_ifinit(ifp, ifatoia(ifa), &new_sin, 0)) + if (!in_ifinit(ifp, ifatoia(ifa), &new_sin, 0, 0)) dohooks(ifp->if_addrhooks, 0); sppp_update_gw(ifp); } |