odhcpd: extra syslog tracing

[project/odhcpd.git] / src / odhcpd.c

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 74830ac..6a3ba86 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -54,11 +54,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_WARNING;
+       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 +219,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,13 +234,16 @@ 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));
+                               return ret;
                        }
                }
 
-               if (nhm->nlmsg_type != RTM_NEWADDR)
+               if (nhm->nlmsg_type != RTM_NEWADDR) {
+                       syslog(LOG_WARNING, "Unexpected rtnetlink message (%d) in response to IPv6 address dump", nhm->nlmsg_type);
                        break;
+               }
 
                // Skip address but keep clearing socket buffer
                if (ret >= (ssize_t)cnt)
@@ -443,7 +470,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");