odhcpd: fix coding style
[project/odhcpd.git] / src / odhcpd.c
index 0c9542c..b1e89b3 100644 (file)
@@ -29,6 +29,7 @@
 #include <net/if.h>
 #include <netinet/ip6.h>
 #include <netpacket/packet.h>
+#include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
 #include <sys/socket.h>
@@ -54,11 +55,33 @@ static void sighandler(_unused int signal)
        uloop_end();
 }
 
+static void print_usage(const char *app)
+{
+       printf(
+       "== %s Usage ==\n\n"
+        "  -h, --help   Print this help\n"
+        "  -l level     Specify log level 0..7 (default %d)\n",
+               app, LOG_WARNING
+       );
+}
 
-int main()
+int main(int argc, char **argv)
 {
        openlog("odhcpd", LOG_PERROR | LOG_PID, LOG_DAEMON);
-       setlogmask(LOG_UPTO(LOG_WARNING));
+       int opt;
+       int log_level = LOG_INFO;
+       while ((opt = getopt(argc, argv, "hl:")) != -1) {
+               switch (opt) {
+               case 'h':
+                       print_usage(argv[0]);
+                       return 0;
+               case 'l':
+                       log_level = atoi(optarg);
+                       fprintf(stderr, "Log level set to %d\n", log_level);
+                       break;
+               }
+       }
+       setlogmask(LOG_UPTO(log_level));
        uloop_init();
 
        if (getuid() != 0) {
@@ -197,8 +220,10 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
                struct ifaddrmsg ifa;
        } req = {{sizeof(req), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP,
                        ++rtnl_seq, 0}, {AF_INET6, 0, 0, 0, ifindex}};
-       if (send(rtnl_socket, &req, sizeof(req), 0) < (ssize_t)sizeof(req))
+       if (send(rtnl_socket, &req, sizeof(req), 0) < (ssize_t)sizeof(req)) {
+               syslog(LOG_WARNING, "Request failed to dump IPv6 addresses (%s)", strerror(errno));
                return 0;
+       }
 
        uint8_t buf[8192];
        ssize_t len = 0, ret = 0;
@@ -210,65 +235,77 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
                        if (len < 0 || !NLMSG_OK(nhm, (size_t)len)) {
                                if (errno == EINTR)
                                        continue;
-                               else
-                                       return ret;
+
+                               syslog(LOG_WARNING, "Failed to receive IPv6 address rtnetlink message (%s)", strerror(errno));
+                               ret = -1;
+                               goto out;
                        }
                }
 
-               if (nhm->nlmsg_type != RTM_NEWADDR)
-                       break;
-
-               // Skip address but keep clearing socket buffer
-               if (ret >= (ssize_t)cnt)
-                       continue;
+               switch (nhm->nlmsg_type) {
+               case RTM_NEWADDR: {
+                       // Skip address but keep clearing socket buffer
+                       if (ret >= (ssize_t)cnt)
+                               continue;
 
-               struct ifaddrmsg *ifa = NLMSG_DATA(nhm);
-               if (ifa->ifa_scope != RT_SCOPE_UNIVERSE ||
-                               (ifindex && ifa->ifa_index != (unsigned)ifindex))
-                       continue;
+                       struct ifaddrmsg *ifa = NLMSG_DATA(nhm);
+                       if (ifa->ifa_scope != RT_SCOPE_UNIVERSE ||
+                                       (ifindex && ifa->ifa_index != (unsigned)ifindex))
+                               continue;
 
-               struct rtattr *rta = (struct rtattr*)&ifa[1];
-               size_t alen = NLMSG_PAYLOAD(nhm, sizeof(*ifa));
-               memset(&addrs[ret], 0, sizeof(addrs[ret]));
-               addrs[ret].prefix = ifa->ifa_prefixlen;
-
-               while (RTA_OK(rta, alen)) {
-                       if (rta->rta_type == IFA_ADDRESS) {
-                               memcpy(&addrs[ret].addr, RTA_DATA(rta),
-                                               sizeof(struct in6_addr));
-                       } else if (rta->rta_type == IFA_CACHEINFO) {
-                               struct ifa_cacheinfo *ifc = RTA_DATA(rta);
-                               addrs[ret].preferred = ifc->ifa_prefered;
-                               addrs[ret].valid = ifc->ifa_valid;
+                       struct rtattr *rta = (struct rtattr*)&ifa[1];
+                       size_t alen = NLMSG_PAYLOAD(nhm, sizeof(*ifa));
+                       memset(&addrs[ret], 0, sizeof(addrs[ret]));
+                       addrs[ret].prefix = ifa->ifa_prefixlen;
+
+                       while (RTA_OK(rta, alen)) {
+                               if (rta->rta_type == IFA_ADDRESS) {
+                                       memcpy(&addrs[ret].addr, RTA_DATA(rta),
+                                                       sizeof(struct in6_addr));
+                               } else if (rta->rta_type == IFA_CACHEINFO) {
+                                       struct ifa_cacheinfo *ifc = RTA_DATA(rta);
+                                       addrs[ret].preferred = ifc->ifa_prefered;
+                                       addrs[ret].valid = ifc->ifa_valid;
+                               }
+
+                               rta = RTA_NEXT(rta, alen);
                        }
 
-                       rta = RTA_NEXT(rta, alen);
-               }
+                       if (ifa->ifa_flags & IFA_F_DEPRECATED)
+                               addrs[ret].preferred = 0;
 
-               if (ifa->ifa_flags & IFA_F_DEPRECATED)
-                       addrs[ret].preferred = 0;
+                       ++ret;
+                       break;
+               }
+               case NLMSG_DONE:
+                       goto out;
+               default:
+                       syslog(LOG_WARNING, "Unexpected rtnetlink message (%d) in response to IPv6 address dump", nhm->nlmsg_type);
+                       ret = -1;
+                       goto out;
+               }
 
-               ++ret;
        }
-
+out:
        return ret;
 }
 
 int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr)
 {
-               int status = -1;
-               struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, ifindex};
-               socklen_t alen = sizeof(addr);
-               int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-
-               if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) &&
-                               !getsockname(sock, (struct sockaddr*)&addr, &alen)) {
-                       *lladdr = addr.sin6_addr;
-                       status = 0;
-               }
+       int status = -1;
+       struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, ifindex};
+       socklen_t alen = sizeof(addr);
+       int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+
+       if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) &&
+                       !getsockname(sock, (struct sockaddr*)&addr, &alen)) {
+               *lladdr = addr.sin6_addr;
+               status = 0;
+       }
+
+       close(sock);
 
-               close(sock);
-               return status;
+       return status;
 }
 
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
@@ -374,7 +411,6 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
                u->error = false;
                if (e->handle_error)
                        e->handle_error(ret);
-               return;
        }
 
        while (true) {
@@ -444,7 +480,6 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
                else if (addr.in.sin_family == AF_INET)
                        inet_ntop(AF_INET, &addr.in.sin_addr, ipbuf, sizeof(ipbuf));
 
-               syslog(LOG_DEBUG, "--");
                syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
                                ipbuf, (iface) ? iface->ifname : "netlink");