]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
OpenBSD: Remove route labelling support
authorRoy Marples <roy@marples.name>
Tue, 10 Oct 2017 20:51:55 +0000 (21:51 +0100)
committerRoy Marples <roy@marples.name>
Tue, 10 Oct 2017 20:51:55 +0000 (21:51 +0100)
It was only added because OpenBSD dhclient did similar .... that
was removed so dhcpcd is following suit.

src/if-bsd.c

index 6e65f5848cde7bb528fc7572dd473f5bd40b21a0..5dcdc71be97bc02c4f87b158bd6ce9dfa1176097 100644 (file)
@@ -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);