Overhaul dhcpcd for chrome os use

dhcpcd.c

 /* 
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2009 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
 #include <unistd.h>
 #include <time.h>
 
 #include "arp.h"
 #include "bind.h"
 #include "config.h"
 #include "common.h"
 #include "configure.h"
 #include "control.h"
 #include "dhcpcd.h"
+#include "dhcpcd-dbus.h"
 #include "duid.h"
 #include "eloop.h"
 #include "if-options.h"
 #include "if-pref.h"
 #include "ipv4ll.h"
 #include "net.h"
 #include "signals.h"
 
 /* We should define a maximum for the NAK exponential backoff */ 
 #define NAKOFF_MAX              60
@@ skipping 1217 matching lines @@
                 ifp->dst.s_addr = dst ? dst->s_addr : INADDR_ANY;
                 if (dst) {
                         for (i = 1; i < 255; i++)
                                 if (i != DHO_ROUTER &&
                                     has_option_mask(ifo->dstmask, i))
                                         dhcp_message_add_addr(
                                                 ifp->state->new,
                                                 i, *dst);
                 }
                 ifp->state->reason = "STATIC";
-                build_routes();
                 run_script(ifp);
                 if (ifo->options & DHCPCD_INFORM) {
                         ifp->state->state = DHS_INFORM;
                         ifp->state->xid = arc4random();
                         ifp->state->lease.server.s_addr =
                             dst ? dst->s_addr : INADDR_ANY;
                         ifp->addr = *addr;
                         ifp->net = *net;
                         open_sockets(ifp);
                         send_inform(ifp);
                 }
                 break;
         }
 }
 
 /* ARGSUSED */
 static void
 handle_link(_unused void *arg)
 {
         if (manage_link(linkfd) == -1)
                 syslog(LOG_ERR, "manage_link: %m");
 }
 
 /* ARGSUSED */
-static void
+void
 handle_signal(_unused void *arg)
 {
         struct interface *iface, *ifl;
         int sig = signal_read();
         int do_release = 0;
 
         switch (sig) {
         case SIGINT:
                 syslog(LOG_INFO, "received SIGINT, stopping");
                 break;
@@ skipping 76 matching lines @@
 handle_args(struct fd_list *fd, int argc, char **argv)
 {
         struct interface *ifs, *ifp, *ifl, *ifn, *ift;
         int do_exit = 0, do_release = 0, do_reboot = 0, do_reconf = 0;
         int opt, oi = 0;
         ssize_t len;
         size_t l;
         struct iovec iov[2];
         char *tmp, *p;
 
-        if (fd != NULL) {
-                /* Special commands for our control socket */
-                if (strcmp(*argv, "--version") == 0) {
-                        len = strlen(VERSION) + 1;
-                        iov[0].iov_base = &len;
-                        iov[0].iov_len = sizeof(ssize_t);
-                        iov[1].iov_base = UNCONST(VERSION);
-                        iov[1].iov_len = len;
-                        if (writev(fd->fd, iov, 2) == -1) {
-                                syslog(LOG_ERR, "writev: %m");
-                                return -1;
-                        }
-                        return 0;
-                } else if (strcmp(*argv, "--getconfigfile") == 0) {
-                        len = strlen(cffile ? cffile : CONFIG) + 1;
-                        iov[0].iov_base = &len;
-                        iov[0].iov_len = sizeof(ssize_t);
-                        iov[1].iov_base = cffile ? cffile : UNCONST(CONFIG);
-                        iov[1].iov_len = len;
-                        if (writev(fd->fd, iov, 2) == -1) {
-                                syslog(LOG_ERR, "writev: %m");
-                                return -1;
-                        }
-                        return 0;
-                } else if (strcmp(*argv, "--getinterfaces") == 0) {
-                        len = 0;
-                        if (argc == 1) {
-                                for (ifp = ifaces; ifp; ifp = ifp->next)
-                                        len++;
-                                len = write(fd->fd, &len, sizeof(len));
-                                if (len != sizeof(len))
-                                        return -1;
-                                for (ifp = ifaces; ifp; ifp = ifp->next)
-                                        send_interface(fd->fd, ifp);
-                                return 0;
-                        }
-                        opt = 0;
-                        while (argv[++opt] != NULL) {
-                                for (ifp = ifaces; ifp; ifp = ifp->next)
-                                        if (strcmp(argv[opt], ifp->name) == 0)
-                                                len++;
-                        }
-                        len = write(fd->fd, &len, sizeof(len));
-                        if (len != sizeof(len))
-                                return -1;
-                        opt = 0;
-                        while (argv[++opt] != NULL) {
-                                for (ifp = ifaces; ifp; ifp = ifp->next)
-                                        if (strcmp(argv[opt], ifp->name) == 0)
-                                                send_interface(fd->fd, ifp);
-                        }
-                        return 0;
-                } else if (strcmp(*argv, "--listen") == 0) {
-                        fd->listener = 1;
-                        return 0;
-                }
-        }
-
         /* Log the command */
         len = 0;
         for (opt = 0; opt < argc; opt++)
                 len += strlen(argv[opt]) + 1;
         tmp = p = xmalloc(len + 1);
         for (opt = 0; opt < argc; opt++) {
                 l = strlen(argv[opt]);
                 strlcpy(p, argv[opt], l + 1);
                 p += l;
                 *p++ = ' ';
@@ skipping 77 matching lines @@
 main(int argc, char **argv)
 {
         struct if_options *ifo;
         struct interface *iface;
         int opt, oi = 0, signal_fd, sig = 0, i, control_fd;
         size_t len;
         pid_t pid;
         struct timespec ts;
 
         closefrom(3);
-        openlog(PACKAGE, LOG_PERROR, LOG_DAEMON);
+        openlog(PACKAGE, LOG_PID | LOG_PERROR, LOG_DAEMON);
         setlogmask(LOG_UPTO(LOG_INFO));
 
         /* Test for --help and --version */
         if (argc > 1) {
                 if (strcmp(argv[1], "--help") == 0) {
                         usage();
                         exit(EXIT_SUCCESS);
                 } else if (strcmp(argv[1], "--version") == 0) {
                         printf(""PACKAGE" "VERSION"\n%s\n", copyright);
                         exit(EXIT_SUCCESS);
@@ skipping 38 matching lines @@
         if (opt != 1) {
                 if (opt == 0)
                         usage();
                 exit(EXIT_FAILURE);
         }
         options = ifo->options;
         if (i != 0) {
                 options |= DHCPCD_TEST | DHCPCD_PERSISTENT;
                 options &= ~DHCPCD_DAEMONISE;
         }
-        
+
 #ifdef THERE_IS_NO_FORK
         options &= ~DHCPCD_DAEMONISE;
 #endif
 
         if (options & DHCPCD_DEBUG)
                 setlogmask(LOG_UPTO(LOG_DEBUG));
         else if (options & DHCPCD_QUIET)
                 close(STDERR_FILENO);
 
         if (!(options & DHCPCD_TEST)) {
@@ skipping 62 matching lines @@
                                 nanosleep(&ts, NULL);
                                 if (read_pid() == 0)
                                         exit(EXIT_SUCCESS);
                         }
                         syslog(LOG_ERR, "pid %d failed to exit", pid);
                         exit(EXIT_FAILURE);
                 }
         }
 
         if (!(options & DHCPCD_TEST)) {
-                if ((pid = read_pid()) > 0 &&
-                    kill(pid, 0) == 0)
-                {
+                if ((pid = read_pid()) > 0 && kill(pid, 0) == 0) {
                         syslog(LOG_ERR, ""PACKAGE
                             " already running on pid %d (%s)",
                             pid, pidfile);
                         exit(EXIT_FAILURE);
                 }
 
                 /* Ensure we have the needed directories */
                 if (mkdir(RUNDIR, 0755) == -1 && errno != EEXIST) {
                         syslog(LOG_ERR, "mkdir `%s': %m", RUNDIR);
                         exit(EXIT_FAILURE);
@@ skipping 31 matching lines @@
                 if (start_control() == -1) {
                         syslog(LOG_ERR, "start_control: %m");
                         exit(EXIT_FAILURE);
                 }
         }
 
         if (init_sockets() == -1) {
                 syslog(LOG_ERR, "init_socket: %m");
                 exit(EXIT_FAILURE);
         }
+        if (dhcpcd_dbus_init() == -1) {
+                /* NB: dhcpcd_dbus_init generates a syslog msg */
+                exit(EXIT_FAILURE);
+        }
         if (ifo->options & DHCPCD_LINK) {
                 linkfd = open_link_socket();
                 if (linkfd == -1)
                         syslog(LOG_ERR, "open_link_socket: %m");
                 else
                         add_event(linkfd, handle_link, NULL);
         }
 
         ifc = argc - optind;
         ifv = argv + optind;
@@ skipping 68 matching lines @@
         }
         free_options(ifo);
 
         sort_interfaces();
         for (iface = ifaces; iface; iface = iface->next)
                 add_timeout_sec(0, start_interface, iface);
 
         start_eloop();
         exit(EXIT_SUCCESS);
 }