diff options
| -rw-r--r-- | sys/net/route.c | 7 | ||||
| -rw-r--r-- | sys/netinet/in.c | 11 | ||||
| -rw-r--r-- | sys/netinet/in_rmx.c | 18 | ||||
| -rw-r--r-- | usr.bin/netstat/netstat.1 | 11 | ||||
| -rw-r--r-- | usr.bin/netstat/route.c | 4 |
5 files changed, 33 insertions, 18 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 38867f4..884f0eb 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -496,8 +496,9 @@ rtrequest(req, dst, gateway, netmask, flags, ret_nrt) * Now search what's left of the subtree for any cloned * routes which might have been formed from this node. */ - if ((rt->rt_flags & RTF_PRCLONING) && netmask) { - rnh->rnh_walktree_from(rnh, dst, netmask, + if ((rt->rt_flags & (RTF_CLONING | RTF_PRCLONING)) && + rt_mask(rt)) { + rnh->rnh_walktree_from(rnh, dst, rt_mask(rt), rt_fixdelete, rt); } @@ -654,7 +655,7 @@ rtrequest(req, dst, gateway, netmask, flags, ret_nrt) */ if (req == RTM_RESOLVE) { rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */ - if ((*ret_nrt)->rt_flags & RTF_PRCLONING) { + if ((*ret_nrt)->rt_flags & (RTF_CLONING | RTF_PRCLONING)) { rt->rt_parent = (*ret_nrt); (*ret_nrt)->rt_refcnt++; } diff --git a/sys/netinet/in.c b/sys/netinet/in.c index b9ab8b3..27fbefb 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -413,8 +413,19 @@ in_control(so, cmd, data, ifp, p) return (error); case SIOCDIFADDR: + /* + * in_ifscrub kills the interface route. + */ in_ifscrub(ifp, ia); /* + * in_ifadown gets rid of all the rest of + * the routes. This is not quite the right + * thing to do, but at least if we are running + * a routing process they will come back. + */ + in_ifadown(&ia->ia_ifa); + + /* * Protect from ipintr() traversing address list * while we're modifying it. */ diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index 52d062d..51a5846 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -357,14 +357,12 @@ in_inithead(void **head, int off) /* - * This zaps old routes when the interface goes down. - * Currently it doesn't delete static routes; there are - * arguments one could make for both behaviors. For the moment, - * we will adopt the Principle of Least Surprise and leave them - * alone (with the knowledge that this will not be enough for some - * people). The ones we really want to get rid of are things like ARP - * entries, since the user might down the interface, walk over to a completely - * different network, and plug back in. + * This zaps old routes (including ARP entries) when the interface + * address is deleted. Previously it didn't delete static routes, + * and this caused some weird things to happen. In particular, if + * you changed the address on an interface, and the default route + * was using this interface and address, outgoing datagrams still + * used the old address. */ struct in_ifadown_arg { struct radix_node_head *rnh; @@ -378,7 +376,7 @@ in_ifadownkill(struct radix_node *rn, void *xap) struct rtentry *rt = (struct rtentry *)rn; int err; - if (rt->rt_ifa == ap->ifa && !(rt->rt_flags & RTF_STATIC)) { + if (rt->rt_ifa == ap->ifa) { /* * We need to disable the automatic prune that happens * in this case in rtrequest() because it will blow @@ -387,7 +385,7 @@ in_ifadownkill(struct radix_node *rn, void *xap) * the routes that rtrequest() would have in any case, * so that behavior is not needed there. */ - rt->rt_flags &= ~RTF_PRCLONING; + rt->rt_flags &= ~(RTF_CLONING | RTF_PRCLONING); err = rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); if (err) { diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 2f4a02d..2568227 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -100,9 +100,14 @@ With the default display, show the state of all sockets; normally sockets used by server processes are not shown. With the routing table display (option -.Fl r -, as described below), show protocol-cloned routes (routes -generated by a RTF_PRCLONING parent route); normally these routes are +.Fl r , +as described below), show cloned routes (routes +generated by a +parent route with either +.Dv RTF_CLONING +or +.Dv RTF_PRCLONING +flag set); normally these routes are not shown. .It Fl b With the interface display (option diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index e10d07a..7e4b69d 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -588,9 +588,9 @@ p_rtentry(rt) sa_u addr, mask; /* - * Don't print protocol-cloned routes unless -a. + * Don't print cloned routes unless -a. */ - if (rt->rt_parent && !aflag) + if (rt->rt_flags & RTF_WASCLONED && !aflag) return; bzero(&addr, sizeof(addr)); |
