Since deleting all the addresses on an interface removes all the

relevant entries from the arp cache, don't bother asking for/processing
arp entries in the route dumps. Thus allowing use of NET_RT_FLAGS
with RTF_GATEWAY and AF_INET, to ask for only the routes dhclient
wants to expunge rather than all routes in existance.

Greatly shrinks and simplifies the code. No intentional functional
change. Tested by sthen@.

5 files changed, 32 insertions, 69 deletions

diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 9aab9204880..59932f7aaaa 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhclient.c,v 1.241 2013/03/22 23:58:51 krw Exp $	*/
+/*	$OpenBSD: dhclient.c,v 1.242 2013/03/30 16:10:01 krw Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -796,8 +796,9 @@ bind_lease(void)
 	struct option_data *options;
 	struct client_lease *lease;
 
+	/* Deleting the addresses also clears out arp entries. */
 	delete_addresses(ifi->name, ifi->rdomain);
-	flush_routes_and_arp_cache(ifi->name, ifi->rdomain);
+	flush_routes(ifi->name, ifi->rdomain);
 
 	lease = apply_defaults(client->new);
 	options = lease->options;
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 4e4f4055864..1c2bbdeaf68 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.111 2013/02/18 15:57:08 krw Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.112 2013/03/30 16:10:01 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -336,6 +336,6 @@ void delete_address(char *, int, struct in_addr);
 
 void add_address(char *, int, struct in_addr, struct in_addr);
 
-void flush_routes_and_arp_cache(char *, int);
+void flush_routes(char *, int);
 
 void add_default_route(int, struct in_addr, struct in_addr);
diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c
index 56b1c9ec025..d8aafa3c82d 100644
--- a/sbin/dhclient/kroute.c
+++ b/sbin/dhclient/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.46 2013/03/24 12:53:20 krw Exp $	*/
+/*	$OpenBSD: kroute.c,v 1.47 2013/03/30 16:10:01 krw Exp $	*/
 
 /*
  * Copyright 2012 Kenneth R Westerback <krw@openbsd.org>
@@ -49,7 +49,7 @@ void	delete_route(int, int, struct rt_msghdr *);
  *	arp -dan
  */
 void
-flush_routes_and_arp_cache(char *ifname, int rdomain)
+flush_routes(char *ifname, int rdomain)
 {
 	struct imsg_flush_routes imsg;
 	int			 rslt;
@@ -63,18 +63,16 @@ flush_routes_and_arp_cache(char *ifname, int rdomain)
 	rslt = imsg_compose(unpriv_ibuf, IMSG_FLUSH_ROUTES, 0, 0, -1,
 	    &imsg, sizeof(imsg));
 	if (rslt == -1)
-		warning("flush_routes_and_arp_cache: imsg_compose: %s",
-		    strerror(errno));
+		warning("flush_routes: imsg_compose: %s", strerror(errno));
 
 	/* Do flush to maximize chances of cleaning up routes on exit. */
 	rslt = imsg_flush(unpriv_ibuf);
 	if (rslt == -1)
-		warning("flush_routes_and_arp_cache: imsg_flush: %s",
-		    strerror(errno));
+		warning("flush_routes: imsg_flush: %s", strerror(errno));
 }
 
 void
-priv_flush_routes_and_arp_cache(struct imsg_flush_routes *imsg)
+priv_flush_routes(struct imsg_flush_routes *imsg)
 {
 	char ifname[IF_NAMESIZE];
 	struct sockaddr *rti_info[RTAX_MAX];
@@ -82,8 +80,6 @@ priv_flush_routes_and_arp_cache(struct imsg_flush_routes *imsg)
 	size_t needed;
 	char *lim, *buf = NULL, *bufp, *next, *errmsg = NULL;
 	struct rt_msghdr *rtm;
-	struct sockaddr *sa;
-	struct sockaddr_dl *sdl;
 	struct sockaddr_in *sa_in;
 	struct sockaddr_rtlabel *sa_rl;
 	int s;
@@ -91,9 +87,9 @@ priv_flush_routes_and_arp_cache(struct imsg_flush_routes *imsg)
 	mib[0] = CTL_NET;
 	mib[1] = PF_ROUTE;
 	mib[2] = 0;
-	mib[3] = 0;
-	mib[4] = NET_RT_DUMP;
-	mib[5] = 0;
+	mib[3] = AF_INET;
+	mib[4] = NET_RT_FLAGS;
+	mib[5] = RTF_GATEWAY;
 	mib[6] = imsg->rdomain;
 
 	while (1) {
@@ -136,71 +132,37 @@ priv_flush_routes_and_arp_cache(struct imsg_flush_routes *imsg)
 		if (rtm->rtm_version != RTM_VERSION)
 			continue;
 
-		sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
-		if (sa->sa_family == AF_KEY || sa->sa_family == AF_INET6)
-			continue;  /* Don't flush SPD or INET6 routes */
-
 		populate_rti_info(rti_info, rtm);
 
 		sa_rl = (struct sockaddr_rtlabel *)rti_info[RTAX_LABEL];
+		sa_in = (struct sockaddr_in *)rti_info[RTAX_NETMASK];
+
 		switch (check_route_label(sa_rl)) {
 		case ROUTE_LABEL_DHCLIENT_OURS:
 			/* Always delete routes we labeled. */
 			delete_route(s, imsg->rdomain, rtm);
-			continue;
+			break;;
 		case ROUTE_LABEL_DHCLIENT_DEAD:
 			if (imsg->zapzombies)
 				delete_route(s, imsg->rdomain, rtm);
-			continue;
+			break;
 		case ROUTE_LABEL_DHCLIENT_LIVE:
 		case ROUTE_LABEL_DHCLIENT_UNKNOWN:
-			/* Never delete routes labelled by another dhclient. */
-			continue;
-		default:
+			/* Another dhclient's responsibility. */
 			break;
-		}
-
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (rtm->rtm_flags & RTF_GATEWAY)
-				continue;
-			if (rtm->rtm_flags & RTF_PERMANENT_ARP)
-				continue;
-			sdl = (struct sockaddr_dl *)rti_info[RTAX_GATEWAY];
-			if (sdl == NULL)
-				continue;
-
-			/* XXXX Check for AF_INET too? (arp ask for them) */
-			/* XXXX Need 'retry' for proxy entries? (arp does) */
-
-			if (sdl->sdl_family == AF_LINK) {
-				switch (sdl->sdl_type) {
-				case IFT_ETHER:
-				case IFT_FDDI:
-				case IFT_ISO88023:
-				case IFT_ISO88024:
-				case IFT_ISO88025:
-				case IFT_CARP:
-					delete_route(s, imsg->rdomain, rtm);
-					break;
-				default:
-					break;
-				}
-			}
-			continue;
-		}
-
-		if (rtm->rtm_flags & RTF_GATEWAY) {
+		case ROUTE_LABEL_NONE:
+		case ROUTE_LABEL_NOT_DHCLIENT:
+			/* Delete default routes on our interface. */
 			memset(ifname, 0, sizeof(ifname));
-			if (if_indextoname(rtm->rtm_index, ifname) == NULL)
-				continue;
-			sa_in = (struct sockaddr_in *)rti_info[RTAX_NETMASK];
-			if (sa_in && 
+			if (if_indextoname(rtm->rtm_index, ifname) &&
+			    sa_in && 
 			    sa_in->sin_addr.s_addr == INADDR_ANY &&
 			    rtm->rtm_tableid == imsg->rdomain &&
-			    strcmp(imsg->ifname, ifname) == 0) {
+			    strcmp(imsg->ifname, ifname) == 0)
 				delete_route(s, imsg->rdomain, rtm);
-				continue;
-			}
+			break;
+		default:
+			break;
 		}
 	}
 
@@ -623,7 +585,7 @@ priv_cleanup(struct imsg_hup *imsg)
 	memset(&fimsg, 0, sizeof(fimsg));
 	fimsg.rdomain = imsg->rdomain;
 	fimsg.zapzombies = 0;	/* Only zapzombies when binding a lease. */
-	priv_flush_routes_and_arp_cache(&fimsg);
+	priv_flush_routes(&fimsg);
 
 	if (imsg->addr.s_addr == INADDR_ANY)
 		return;
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index 5ac3aea8110..fa4b5ecabcb 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.30 2013/02/18 15:57:08 krw Exp $ */
+/*	$OpenBSD: privsep.c,v 1.31 2013/03/30 16:10:01 krw Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -60,7 +60,7 @@ dispatch_imsg(struct imsgbuf *ibuf)
 			    sizeof(struct imsg_flush_routes))
 				warning("bad IMSG_FLUSH_ROUTES");
 			else
-				priv_flush_routes_and_arp_cache(imsg.data);
+				priv_flush_routes(imsg.data);
 			break;
 
 		case IMSG_ADD_DEFAULT_ROUTE:
diff --git a/sbin/dhclient/privsep.h b/sbin/dhclient/privsep.h
index b1a664ba575..6d93f9175dd 100644
--- a/sbin/dhclient/privsep.h
+++ b/sbin/dhclient/privsep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.h,v 1.17 2013/03/11 16:01:01 krw Exp $ */
+/*	$OpenBSD: privsep.h,v 1.18 2013/03/30 16:10:01 krw Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -75,7 +75,7 @@ struct imsg_write_file {
 void	dispatch_imsg(struct imsgbuf *);
 void	priv_delete_address(struct imsg_delete_address *);
 void	priv_add_address(struct imsg_add_address *);
-void	priv_flush_routes_and_arp_cache(struct imsg_flush_routes *);
+void	priv_flush_routes(struct imsg_flush_routes *);
 void	priv_add_default_route(struct imsg_add_default_route *);
 void	priv_cleanup(struct imsg_hup *);
 void	priv_write_file(struct imsg_write_file *);