DHCPv6: Transpose DHCP userclass option into DHCPv6

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 89f71d79a7957200fa812c179e16d09c8fdb75e0..e03b156cc84ce78eefde13ad5390b2fbe821bb56 100644 (file)
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -193,6 +193,48 @@ dhcp6_printoptions(const struct dhcpcd_ctx *ctx,
        }
 }
 
+static size_t
+dhcp6_makeuser(void *data, const struct interface *ifp)
+{
+       const struct if_options *ifo = ifp->options;
+       struct dhcp6_option o;
+       uint8_t *p;
+       const uint8_t *up, *ue;
+       uint16_t ulen, unlen;
+       size_t olen;
+
+       /* Convert the DHCPv4 user class option to DHCPv6 */
+       up = ifo->userclass;
+       ulen = *up++;
+       if (ulen == 0)
+               return 0;
+
+       p = data;
+       olen = 0;
+       if (p != NULL)
+               p += sizeof(o);
+
+       ue = up + ulen;
+       for (; up < ue; up += ulen) {
+               ulen = *up++;
+               olen += sizeof(ulen) + ulen;
+               if (data == NULL)
+                       continue;
+               unlen = htons(ulen);
+               memcpy(p, &unlen, sizeof(unlen));
+               p += sizeof(unlen);
+               memcpy(p, up, ulen);
+               p += ulen;
+       }
+       if (data != NULL) {
+               o.code = htons(D6_OPTION_USER_CLASS);
+               o.len = htons(olen);
+               memcpy(data, &o, sizeof(o));
+       }
+
+       return sizeof(o) + olen;
+}
+
 static size_t
 dhcp6_makevendor(void *data, const struct interface *ifp)
 {
@@ -677,6 +719,8 @@ dhcp6_makemessage(struct interface *ifp)
        len += sizeof(*state->send);
        len += sizeof(o) + ifp->ctx->duid_len;
        len += sizeof(o) + sizeof(uint16_t); /* elapsed */
+       if (!has_option_mask(ifo->nomask6, D6_OPTION_USER_CLASS))
+               len += dhcp6_makeuser(NULL, ifp);
        if (!has_option_mask(ifo->nomask6, D6_OPTION_VENDOR_CLASS))
                len += dhcp6_makevendor(NULL, ifp);
 
@@ -844,6 +888,8 @@ dhcp6_makemessage(struct interface *ifp)
        si_len = 0;
        COPYIN(D6_OPTION_ELAPSED, &si_len, sizeof(si_len));
 
+       if (!has_option_mask(ifo->nomask6, D6_OPTION_USER_CLASS))
+               p += dhcp6_makeuser(p, ifp);
        if (!has_option_mask(ifo->nomask6, D6_OPTION_VENDOR_CLASS))
                p += dhcp6_makevendor(p, ifp);
 

diff --git a/src/dhcp6.h b/src/dhcp6.h
index 50b7c9e8e33f3967ef636d81e29fcc4e08650764..f9f8c40369543fba2a19c9596dd3b7a13f7fada7 100644 (file)
--- a/src/dhcp6.h
+++ b/src/dhcp6.h
@@ -67,6 +67,7 @@
 #define D6_OPTION_UNICAST              12
 #define D6_OPTION_STATUS_CODE          13
 #define D6_OPTION_RAPID_COMMIT         14
+#define D6_OPTION_USER_CLASS           15
 #define D6_OPTION_VENDOR_CLASS         16
 #define D6_OPTION_VENDOR_OPTS          17
 #define D6_OPTION_INTERFACE_ID         18