ubus: use safe iterator

[project/odhcpd.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9515f40..bf48d78 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -22,6 +22,8 @@
 #include "odhcpd.h"
 #include "dhcpv6.h"
 
 #include "odhcpd.h"
 #include "dhcpv6.h"
 

+static const char *excluded_class = "HOMENET";
+

 
 static void relay_client_request(struct sockaddr_in6 *source,
                const void *data, size_t len, struct interface *iface);
 
 static void relay_client_request(struct sockaddr_in6 *source,
                const void *data, size_t len, struct interface *iface);


@@ -32,67 +34,69 @@ static void handle_dhcpv6(void *addr, void *data, size_t len,
 static void handle_client_request(void *addr, void *data, size_t len,
                struct interface *iface);
 
 static void handle_client_request(void *addr, void *data, size_t len,
                struct interface *iface);
 

-static struct odhcpd_event dhcpv6_event = {{.fd = -1}, handle_dhcpv6};
-

 
 
 // Create socket and register events
 int init_dhcpv6(void)
 {
 
 
 // Create socket and register events
 int init_dhcpv6(void)
 {

-       int sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
-
-       // Basic IPv6 configuration
-       int val = 1;
-       setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
-       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-       setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));
-
-       val = DHCPV6_HOP_COUNT_LIMIT;
-       setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val));
-
-       val = 0;
-       setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val));
+       dhcpv6_ia_init();
+       return 0;
+}

 
 

-       struct sockaddr_in6 bind_addr = {AF_INET6, htons(DHCPV6_SERVER_PORT),
-                               0, IN6ADDR_ANY_INIT, 0};

 
 

-       if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) {
-               syslog(LOG_ERR, "Failed to open DHCPv6 server socket: %s",
-                               strerror(errno));
-               return -1;
+int setup_dhcpv6_interface(struct interface *iface, bool enable)
+{
+       if (iface->dhcpv6_event.uloop.fd > 0) {
+               uloop_fd_delete(&iface->dhcpv6_event.uloop);
+               close(iface->dhcpv6_event.uloop.fd);
+               iface->dhcpv6_event.uloop.fd = -1;

        }
 
        }
 

-       dhcpv6_event.uloop.fd = sock;
-       odhcpd_register(&dhcpv6_event);
+       // Configure multicast settings
+       if (enable && iface->dhcpv6 && !iface->master) {
+               int sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
+               if (sock < 0) {
+                       syslog(LOG_ERR, "Failed to create DHCPv6 server socket: %s",
+                                       strerror(errno));
+                       return -1;
+               }

 
 

-       dhcpv6_ia_init(dhcpv6_event.uloop.fd);
+               // Basic IPv6 configuration
+               setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, iface->ifname, strlen(iface->ifname));

 
 

-       return 0;
-}
+               int val = 1;
+               setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
+               setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+               setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));

 
 

+               val = DHCPV6_HOP_COUNT_LIMIT;
+               setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val));

 
 

-int setup_dhcpv6_interface(struct interface *iface, bool enable)
-{
-       // Configure multicast settings
-       struct ipv6_mreq relay = {ALL_DHCPV6_RELAYS, iface->ifindex};
-       struct ipv6_mreq server = {ALL_DHCPV6_SERVERS, iface->ifindex};
+               val = 0;
+               setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val));

 
 

-       setsockopt(dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-                       IPV6_DROP_MEMBERSHIP, &relay, sizeof(relay));
-       setsockopt(dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-                       IPV6_DROP_MEMBERSHIP, &server, sizeof(server));
+               struct sockaddr_in6 bind_addr = {AF_INET6, htons(DHCPV6_SERVER_PORT),
+                                       0, IN6ADDR_ANY_INIT, 0};

 
 

-       if (enable && iface->dhcpv6 && !iface->master) {
-               setsockopt(dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-                               IPV6_ADD_MEMBERSHIP, &relay, sizeof(relay));
+               if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) {
+                       syslog(LOG_ERR, "Failed to open DHCPv6 server socket: %s",
+                                       strerror(errno));
+                       return -1;
+               }
+
+               struct ipv6_mreq relay = {ALL_DHCPV6_RELAYS, iface->ifindex};
+               struct ipv6_mreq server = {ALL_DHCPV6_SERVERS, iface->ifindex};
+               setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &relay, sizeof(relay));

 
                if (iface->dhcpv6 == RELAYD_SERVER)
 
                if (iface->dhcpv6 == RELAYD_SERVER)

-                       setsockopt(dhcpv6_event.uloop.fd, IPPROTO_IPV6,
-                                       IPV6_ADD_MEMBERSHIP, &server, sizeof(server));
+                       setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &server, sizeof(server));
+
+               iface->dhcpv6_event.uloop.fd = sock;
+               iface->dhcpv6_event.handle_dgram = handle_dhcpv6;
+               odhcpd_register(&iface->dhcpv6_event);

        }
 
        }
 

-       setup_dhcpv6_ia_interface(iface, enable);
-       return 0;
+       return setup_dhcpv6_ia_interface(iface, enable);

 }
 
 
 }
 
 


@@ -273,6 +277,13 @@ static void handle_client_request(void *addr, void *data, size_t len,
                        if (olen != ntohs(dest.serverid_length) ||
                                        memcmp(odata, &dest.duid_type, olen))
                                return; // Not for us
                        if (olen != ntohs(dest.serverid_length) ||
                                        memcmp(odata, &dest.duid_type, olen))
                                return; // Not for us

+               } else if (otype == DHCPV6_OPT_USER_CLASS) {
+                       uint8_t *c = odata, *cend = &odata[olen];
+                       for (; &c[2] <= cend && &c[2 + (c[0] << 8) + c[1]] <= cend; c = &c[2 + (c[0] << 8) + c[1]]) {
+                               size_t elen = strlen(excluded_class);
+                               if (((((size_t)c[0]) << 8) | c[1]) == elen && !memcmp(&c[2], excluded_class, elen))
+                                       return; // Ignore from homenet
+                       }

                }
        }
 
                }
        }
 


@@ -287,7 +298,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
                                iov[3].iov_len + iov[4].iov_len + iov[5].iov_len +
                                iov[6].iov_len - (4 + opts_end - opts));
 
                                iov[3].iov_len + iov[4].iov_len + iov[5].iov_len +
                                iov[6].iov_len - (4 + opts_end - opts));
 

-       odhcpd_send(dhcpv6_event.uloop.fd, addr, iov, ARRAY_SIZE(iov), iface);
+       odhcpd_send(iface->dhcpv6_event.uloop.fd, addr, iov, ARRAY_SIZE(iov), iface);

 }
 
 
 }
 
 


@@ -391,7 +402,7 @@ static void relay_server_response(uint8_t *data, size_t len)
        }
 
        struct iovec iov = {payload_data, payload_len};
        }
 
        struct iovec iov = {payload_data, payload_len};

-       odhcpd_send(dhcpv6_event.uloop.fd, &target, &iov, 1, iface);
+       odhcpd_send(iface->dhcpv6_event.uloop.fd, &target, &iov, 1, iface);

 }
 
 
 }
 
 


@@ -448,5 +459,5 @@ static void relay_client_request(struct sockaddr_in6 *source,
        struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
                        htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};
        struct iovec iov[2] = {{&hdr, sizeof(hdr)}, {(void*)data, len}};
        struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
                        htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};
        struct iovec iov[2] = {{&hdr, sizeof(hdr)}, {(void*)data, len}};

-       odhcpd_send(dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);
+       odhcpd_send(iface->dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);

 }
 }