X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=aad5b37b2e5b831c9c910660bcc453659060e5ce;hp=3c384e831cd5b76267e0981fb7b9b766ec9466d8;hb=ebbff3872a1f242ef5b0a7c029895848876a54b2;hpb=549a4a7d93a828d7d2b9354bc1b1957de4333e65

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 3c384e8..aad5b37 100644
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -113,11 +113,11 @@ int odhcpd_open_rtnl(void)
 
 
 // Read IPv6 MTU for interface
-int odhcpd_get_interface_mtu(const char *ifname)
+int odhcpd_get_interface_config(const char *ifname, const char *what)
 {
 	char buf[64];
-	const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/mtu";
-	snprintf(buf, sizeof(buf), sysctl_pattern, ifname);
+	const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/%s";
+	snprintf(buf, sizeof(buf), sysctl_pattern, ifname, what);
 
 	int fd = open(buf, O_RDONLY);
 	ssize_t len = read(fd, buf, sizeof(buf) - 1);
@@ -126,10 +126,8 @@ int odhcpd_get_interface_mtu(const char *ifname)
 	if (len < 0)
 		return -1;
 
-
 	buf[len] = 0;
 	return atoi(buf);
-
 }
 
 
@@ -153,8 +151,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);
@@ -249,14 +254,6 @@ 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;
 	}
 
@@ -331,8 +328,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) {
@@ -409,9 +413,9 @@ void odhcpd_process(struct odhcpd_event *event)
 	odhcpd_receive_packets(&event->uloop, 0);
 }
 
-void odhcpd_urandom(void *data, size_t len)
+int odhcpd_urandom(void *data, size_t len)
 {
-	read(urandom_fd, data, len);
+	return read(urandom_fd, data, len);
 }