discover/udev: copy dev->device path from udev devnode

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index edb7358b5c36618cc6ee46d94cb7e1fb2f789483..bc7e186a1921e8531bb2fd37ed026f5e47e5977e 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -25,6 +25,7 @@
 
 #define HWADDR_SIZE    6
 #define PIDFILE_BASE   (LOCAL_STATE_DIR "/petitboot/")
+#define INITIAL_BUFSIZE        4096
 
 #define for_each_nlmsg(buf, nlmsg, len) \
        for (nlmsg = (struct nlmsghdr *)buf; \
@@ -58,6 +59,8 @@ struct network {
        struct device_handler   *handler;
        struct waiter           *waiter;
        int                     netlink_sd;
+       void                    *netlink_buf;
+       unsigned int            netlink_buf_size;
        bool                    manual_config;
        bool                    dry_run;
 };
@@ -66,7 +69,7 @@ static const struct interface_config *find_config_by_hwaddr(
                uint8_t *hwaddr)
 {
        const struct config *config;
-       int i;
+       unsigned int i;
 
        config = config_get();
        if (!config)
@@ -116,6 +119,10 @@ static int network_init_netlink(struct network *network)
                return -1;
        }
 
+       network->netlink_buf_size = INITIAL_BUFSIZE;
+       network->netlink_buf = talloc_array(network, char,
+                               network->netlink_buf_size);
+
        return 0;
 }
 
@@ -197,7 +204,7 @@ static int interface_down(struct interface *interface)
 static void udhcpc_process_exit(struct process *process)
 {
        struct interface *interface = process->data;
-       pb_log("udhcp client [pid %d] for interface %s exited, rc %d\n",
+       pb_debug("udhcp client [pid %d] for interface %s exited, rc %d\n",
                        process->pid, interface->name, process->exit_status);
        interface->udhcpc_process = NULL;
        process_release(process);
@@ -212,6 +219,7 @@ static void configure_interface_dhcp(struct interface *interface)
                pb_system_apps.udhcpc,
                "-R",
                "-n",
+               "-O", "pxeconffile",
                "-p", pidfile,
                "-i", interface->name,
                NULL,
@@ -362,6 +370,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
        info = NLMSG_DATA(nlmsg);
 
        have_ifaddr = have_ifname = false;
+       mtu = 1;
 
        attrlen = nlmsg->nlmsg_len - sizeof(*info);
 
@@ -426,19 +435,48 @@ static int network_netlink_process(void *arg)
 {
        struct network *network = arg;
        struct nlmsghdr *nlmsg;
+       struct msghdr msg;
+       struct iovec iov;
        unsigned int len;
-       char buf[4096];
-       int rc;
+       int rc, flags;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+
+       flags = MSG_PEEK;
+
+retry:
+       iov.iov_len = network->netlink_buf_size;
+       iov.iov_base = network->netlink_buf;
+
+       rc = recvmsg(network->netlink_sd, &msg, flags);
 
-       rc = recv(network->netlink_sd, buf, sizeof(buf), 0);
        if (rc < 0) {
-               perror("netlink recv");
+               perror("netlink recv header");
                return -1;
        }
 
        len = rc;
 
-       for_each_nlmsg(buf, nlmsg, len)
+       /* if the netlink message was larger than our buffer, realloc
+        * before reading again */
+       if (len > network->netlink_buf_size || msg.msg_flags & MSG_TRUNC) {
+               network->netlink_buf_size *= 2;
+               network->netlink_buf = talloc_realloc(network,
+                                       network->netlink_buf,
+                                       char *,
+                                       network->netlink_buf_size);
+               goto retry;
+       }
+
+       /* otherwise, we're good to read the entire message without PEEK */
+       if (flags == MSG_PEEK) {
+               flags = 0;
+               goto retry;
+       }
+
+       for_each_nlmsg(network->netlink_buf, nlmsg, len)
                network_handle_nlmsg(network, nlmsg);
 
        return 0;
@@ -447,7 +485,8 @@ static int network_netlink_process(void *arg)
 static void network_init_dns(struct network *network)
 {
        const struct config *config;
-       int i, rc, len;
+       unsigned int i;
+       int rc, len;
        bool modified;
        char *buf;
 
@@ -508,8 +547,8 @@ struct network *network_init(struct device_handler *handler,
        network = talloc(handler, struct network);
        list_init(&network->interfaces);
        network->handler = handler;
-       network->manual_config = false;
        network->dry_run = dry_run;
+       network->manual_config = config_get()->network.n_interfaces != 0;
 
        network_init_dns(network);