X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=52bca13c4db7019a2ccbaee44c6ed88fa30ae022;hp=b8651ddd621155584b741ab344dbba2d67c566e9;hb=9bdbc5a4be1ab75145431bc728159a55c723e2ca;hpb=634d9fe9142f62b7b2e7647ef88d6606e54ab155

diff --git a/src/odhcpd.c b/src/odhcpd.c
index b8651dd..52bca13 100644
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -49,6 +49,12 @@ static int rtnl_seq = 0;
 static int urandom_fd = -1;
 
 
+static void sighandler(_unused int signal)
+{
+	uloop_end();
+}
+
+
 int main()
 {
 	openlog("odhcpd", LOG_PERROR | LOG_PID, LOG_DAEMON);
@@ -71,6 +77,8 @@ int main()
 		return 4;
 
 	signal(SIGUSR1, SIG_IGN);
+	signal(SIGINT, sighandler);
+	signal(SIGTERM, sighandler);
 
 	if (init_router())
 		return 4;
@@ -145,8 +153,15 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 {
 	// Construct headers
 	uint8_t cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))] = {0};
-	struct msghdr msg = {(void*)dest, sizeof(*dest), iov, iov_len,
-				cmsg_buf, sizeof(cmsg_buf), 0};
+	struct msghdr msg = {
+		.msg_name = (void *) dest,
+		.msg_namelen = sizeof(*dest),
+		.msg_iov = iov,
+		.msg_iovlen = iov_len,
+		.msg_control = cmsg_buf,
+		.msg_controllen = sizeof(cmsg_buf),
+		.msg_flags = 0
+	};
 
 	// Set control data (define destination interface)
 	struct cmsghdr *chdr = CMSG_FIRSTHDR(&msg);
@@ -241,20 +256,31 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
 		if (ifa->ifa_flags & IFA_F_DEPRECATED)
 			addrs[ret].preferred = 0;
 
-		addrs[ret].has_class = false;
-		addrs[ret].class = 0;
-#ifdef WITH_UBUS
-		struct interface *iface = odhcpd_get_interface_by_index(ifindex);
-		if (iface)
-			addrs[ret].has_class = ubus_get_class(iface->ifname,
-					&addrs[ret].addr, &addrs[ret].class);
-#endif
 		++ret;
 	}
 
 	return ret;
 }
 
+int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr)
+{
+	struct odhcpd_ipaddr ipaddrs[8];
+	ssize_t ip_cnt = odhcpd_get_interface_addresses(ifindex, ipaddrs, ARRAY_SIZE(ipaddrs));
+	uint32_t preferred = 0;
+	int ret = 0;
+
+	for (ssize_t i = 0; i < ip_cnt; i++) {
+		struct odhcpd_ipaddr *ipaddr = &ipaddrs[i];
+
+		if (ipaddr->preferred > preferred || !preferred) {
+			preferred = ipaddr->preferred;
+			*addr = ipaddr->addr;
+			ret = 1;
+		}
+	}
+
+	return ret;
+}
 
 struct interface* odhcpd_get_interface_by_index(int ifindex)
 {
@@ -304,8 +330,15 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 
 	while (true) {
 		struct iovec iov = {data_buf, sizeof(data_buf)};
-		struct msghdr msg = {&addr, sizeof(addr), &iov, 1,
-				cmsg_buf, sizeof(cmsg_buf), 0};
+		struct msghdr msg = {
+			.msg_name = (void *) &addr,
+			.msg_namelen = sizeof(addr),
+			.msg_iov = &iov,
+			.msg_iovlen = 1,
+			.msg_control = cmsg_buf,
+			.msg_controllen = sizeof(cmsg_buf),
+			.msg_flags = 0
+		};
 
 		ssize_t len = recvmsg(u->fd, &msg, MSG_DONTWAIT);
 		if (len < 0) {
@@ -377,9 +410,14 @@ int odhcpd_register(struct odhcpd_event *event)
 	return uloop_fd_add(&event->uloop, ULOOP_READ);
 }
 
-void odhcpd_urandom(void *data, size_t len)
+void odhcpd_process(struct odhcpd_event *event)
+{
+	odhcpd_receive_packets(&event->uloop, 0);
+}
+
+int odhcpd_urandom(void *data, size_t len)
 {
-	read(urandom_fd, data, len);
+	return read(urandom_fd, data, len);
 }