From: Roy Marples <roy@marples.name>
Date: Tue, 10 Oct 2017 20:51:55 +0000 (+0100)
Subject: OpenBSD: Remove route labelling support
X-Git-Tag: v7.0.0-rc4~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc0c20fbcbd49d3b159f0ce88f290a38e624d77;p=thirdparty%2Fdhcpcd.git

OpenBSD: Remove route labelling support

It was only added because OpenBSD dhclient did similar .... that
was removed so dhcpcd is following suit.
---

diff --git a/src/if-bsd.c b/src/if-bsd.c
index 6e65f584..5dcdc71b 100644
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -461,9 +461,6 @@ if_route(unsigned char cmd, const struct rt *rt)
 	char *bp = rtmsg.buffer;
 	struct sockaddr_dl sdl;
 	bool gateway_unspec;
-#ifdef RTA_LABEL
-	struct sockaddr_rtlabel label;
-#endif
 
 	assert(rt != NULL);
 	ctx = rt->rt_ifp->ctx;
@@ -585,23 +582,6 @@ if_route(unsigned char cmd, const struct rt *rt)
 	if (rtm->rtm_addrs & RTA_IFA)
 		ADDSA(&rt->rt_ifa);
 
-#ifdef RTA_LABEL
-	if (rtm->rtm_addrs & RTA_LABEL) {
-		int len;
-
-		memset(&label, 0, sizeof(label));
-		label.sr_family = AF_UNSPEC;
-		label.sr_len = sizeof(label);
-		len = snprintf(label.sr_label, sizeof(label.sr_label),
-		    PACKAGE " %d", getpid());
-		/* Don't add the label if we failed to create it. */
-		if (len == -1 || (size_t)len > sizeof(label.sr_label))
-			rtm->rtm_addrs &= ~RTA_LABEL;
-		else
-			ADDSA((struct sockaddr *)&label);
-	}
-#endif
-
 #undef ADDSA
 
 	rtm->rtm_msglen = (unsigned short)(bp - (char *)rtm);