ui/ncurses: Use pmenu_item destrutor to free ncurses ITEMs

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 2857076902cd4b23554b4bb405f74a923a2e0190..60d1f6e0f4e1790ba4b2bb2b18bd3a7b81efe70b 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -14,13 +14,13 @@
 #include <types/types.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
-#include <pb-config/pb-config.h>
 #include <process/process.h>
 #include <system/system.h>
 
 #include "file.h"
 #include "network.h"
 #include "sysinfo.h"
+#include "platform.h"
 #include "device-handler.h"
 
 #define HWADDR_SIZE    6
@@ -181,6 +181,15 @@ static int interface_change(struct interface *interface, bool up)
                process_release(interface->udhcpc_process);
        }
 
+       if (!up) {
+               rc = process_run_simple(interface, pb_system_apps.ip,
+                               "address", "flush", "dev", interface->name,
+                               NULL);
+               if (rc)
+                       pb_log("failed to flush addresses from interface %s\n",
+                               interface->name);
+       }
+
        rc = process_run_simple(interface, pb_system_apps.ip,
                        "link", "set", interface->name, statestr, NULL);
        if (rc) {
@@ -212,22 +221,32 @@ static void udhcpc_process_exit(struct process *process)
 
 static void configure_interface_dhcp(struct interface *interface)
 {
+       const struct platform *platform;
+       char pidfile[256], id[10];
        struct process *process;
-       char pidfile[256];
        int rc;
        const char *argv[] = {
                pb_system_apps.udhcpc,
                "-R",
                "-n",
+               "-f",
                "-O", "pxeconffile",
                "-O", "pxepathprefix",
                "-p", pidfile,
                "-i", interface->name,
+               "-x", id, /* [11,12] - dhcp client identifier */
                NULL,
        };
+
        snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
                        PIDFILE_BASE, interface->name);
 
+       platform = platform_get();
+       if (platform && platform->dhcp_arch_id != 0xffff)
+               snprintf(id, sizeof(id), "0x5d:%04x", platform->dhcp_arch_id);
+       else
+               argv[11] = NULL;
+
        process = process_create(interface);
 
        process->path = pb_system_apps.udhcpc;
@@ -524,7 +543,7 @@ static void network_init_dns(struct network *network)
                buf = talloc_realloc(network, buf, char, len + dns_conf_len + 1);
                memcpy(buf + len, dns_conf, dns_conf_len);
                len += dns_conf_len;
-               buf[len - 1] = '\0';
+               buf[len] = '\0';
                modified = true;
 
                talloc_free(dns_conf);
@@ -575,7 +594,6 @@ err:
        return NULL;
 }
 
-
 int network_shutdown(struct network *network)
 {
        struct interface *interface;