Fix cmake script

CMakeLists.txt

@@ -36,7 +36,7 @@ if(${DHCPV4_SUPPORT})
 	set(EXT_SRC ${EXT_SRC} src/dhcpv4.c)
 endif(${DHCPV4_SUPPORT})
 
-add_executable(odhcpd src/odhcpd.c src/config.c src/router.c src/dhcpv6.c src/ndp.c src/dhcpv6-ia.c src/netlink.c ${EXT_SRC})
+add_executable(odhcpd src/odhcpd.c src/config.c src/router.c src/dhcpv6.c src/ndp.c src/dhcpv6-ia.c src/dhcpv6-pxe.c src/netlink.c ${EXT_SRC})
 target_link_libraries(odhcpd resolv ubox uci ${libnl} ${EXT_LINK})
 
 # Installation

src/config.c

@@ -18,7 +18,7 @@
 #include <libubox/vlist.h>
 
 #include "odhcpd.h"
-#include "dhcpv6-pxe.c"
+#include "dhcpv6-pxe.h"
 
 static struct blob_buf b;
 static int reload_pipe[2] = { -1, -1 };

src/dhcpv6-pxe.c

@@ -5,14 +5,28 @@
 #include <sys/timerfd.h>
 #include <arpa/inet.h>
 
-#include "odhcpd.h"
+#include <libubox/utils.h>
+#include <libubox/list.h>
+
 #include "dhcpv6.h"
 #include "dhcpv6-pxe.h"
 
+struct ipv6_pxe_entry {
+	struct list_head list;	// List head for linking
+	uint32_t arch;
+
+	// Ready to send
+	struct __attribute__((packed)) {
+		uint16_t type;		// In network endianess
+		uint16_t len;		// In network endianess, without /0
+		char payload[];		// Null-terminated here
+	} bootfile_url;
+};
+
 static struct ipv6_pxe_entry* ipv6_pxe_default = NULL;
 LIST_HEAD(ipv6_pxe_list);
 
-struct ipv6_pxe_entry* ipv6_pxe_entry_new(uint32_t arch, const char* url) {
+const struct ipv6_pxe_entry* ipv6_pxe_entry_new(uint32_t arch, const char* url) {
 	size_t url_len = strlen(url);
 	struct ipv6_pxe_entry* ipe = malloc(sizeof(struct ipv6_pxe_entry) + url_len + 1);
 	if (!ipe)
@@ -33,7 +47,7 @@ struct ipv6_pxe_entry* ipv6_pxe_entry_new(uint32_t arch, const char* url) {
 	return ipe;
 }
 
-static const struct ipv6_pxe_entry* ipv6_pxe_of_arch(uint16_t arch) {
+const struct ipv6_pxe_entry* ipv6_pxe_of_arch(uint16_t arch) {
 	struct ipv6_pxe_entry* entry;
 	list_for_each_entry(entry, &ipv6_pxe_list, list) {
 		if (arch == entry->arch)

src/dhcpv6-pxe.h

@@ -2,22 +2,12 @@
 
 #include <unistd.h>
 #include <stddef.h>
-#include <libubox/utils.h>
-#include <libubox/list.h>
 
-struct ipv6_pxe_entry {
-	struct list_head list;	// List head for linking
-	uint32_t arch;
+// The detail is hidden except for dhcpv6-pxe.c
+struct ipv6_pxe_entry;
 
-	// Ready to send
-	struct __attribute__((packed)) {
-		uint16_t type;		// In network endianess
-		uint16_t len;		// In network endianess, without /0
-		char payload[];		// Null-terminated here
-	} bootfile_url;
-};
-
-struct ipv6_pxe_entry* ipv6_pxe_entry_new(uint32_t arch, const char* url);
+const struct ipv6_pxe_entry* ipv6_pxe_entry_new(uint32_t arch, const char* url);
+const struct ipv6_pxe_entry* ipv6_pxe_of_arch(uint16_t arch);
 void ipv6_pxe_serve_boot_url(uint16_t arch, struct iovec* iov);
 void ipv6_pxe_dump(void);
 void ipv6_pxe_clear(void);

src/dhcpv6.c

@@ -539,6 +539,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		.addr = iface->dhcpv6_pd_cer,
 	};
 
+
 	uint8_t pdbuf[512];
 	struct iovec iov[IOV_TOTAL] = {
 		[IOV_NESTED] = {NULL, 0},