dhcpv6-ia : code style fixes

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

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 5774a4f..e83a700 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) {
@@ -254,24 +276,21 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
        return ret;
 }
 
-int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr)
+int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr)
 {
-       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;
+               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;
                }
-       }
 
-       return ret;
+               close(sock);
+               return status;
 }
 
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
@@ -370,6 +389,15 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
                struct sockaddr_nl nl;
        } addr;
 
+       if (u->error) {
+               int ret = -1;
+               socklen_t ret_len = sizeof(ret);
+               getsockopt(u->fd, SOL_SOCKET, SO_ERROR, &ret, &ret_len);
+               u->error = false;
+               if (e->handle_error)
+                       e->handle_error(ret);
+       }
+
        while (true) {
                struct iovec iov = {data_buf, sizeof(data_buf)};
                struct msghdr msg = {
@@ -437,7 +465,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");
 
@@ -449,7 +476,8 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 int odhcpd_register(struct odhcpd_event *event)
 {
        event->uloop.cb = odhcpd_receive_packets;
-       return uloop_fd_add(&event->uloop, ULOOP_READ);
+       return uloop_fd_add(&event->uloop, ULOOP_READ |
+                       ((event->handle_error) ? ULOOP_ERROR_CB : 0));
 }
 
 void odhcpd_process(struct odhcpd_event *event)