properly handle return codes

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index 54cf086d11356501bcba02c5cd0cc1bd4aa52f95..09d5c1d9ce5985dd6300c4dca3d53ff3c0d60849 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -160,19 +160,21 @@ static void ra_send_rs(int signal __attribute__((unused)))
 static int16_t pref_to_priority(uint8_t flags)
 {
        flags = (flags >> 3) & 0x03;
-       return (flags == 0x0) ? 1024 : (flags == 0x1) ? 512 :
-                       (flags == 0x3) ? 2048 : -1;
+       return (flags == 0x0) ? 512 : (flags == 0x1) ? 384 :
+                       (flags == 0x3) ? 640 : -1;
 }
 
 
-static void update_proc(const char *sect, const char *opt, uint32_t value)
+static int update_proc(const char *sect, const char *opt, uint32_t value)
 {
        char buf[64];
        snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/%s/%s/%s", sect, if_name, opt);
 
        int fd = open(buf, O_WRONLY);
-       write(fd, buf, snprintf(buf, sizeof(buf), "%u", value));
+       int ret = write(fd, buf, snprintf(buf, sizeof(buf), "%u", value));
        close(fd);
+
+       return ret;
 }
 
 
@@ -271,8 +273,15 @@ bool ra_process(void)
        while (true) {
                struct sockaddr_in6 from;
                struct iovec iov = {buf, sizeof(buf)};
-               struct msghdr msg = {&from, sizeof(from), &iov, 1,
-                               cmsg_buf, sizeof(cmsg_buf), 0};
+               struct msghdr msg = {
+                       .msg_name = (void *) &from,
+                       .msg_namelen = sizeof(from),
+                       .msg_iov = &iov,
+                       .msg_iovlen = 1,
+                       .msg_control = cmsg_buf,
+                       .msg_controllen = sizeof(cmsg_buf),
+                       .msg_flags = 0
+               };
 
                ssize_t len = recvmsg(sock, &msg, MSG_DONTWAIT);
                if (len <= 0)