arp: fix -H/-t handling.

[oweals/busybox.git] / networking / udhcp / files.c

diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 1f25bb105dc21bd9f7631cfe9de571495b5132c1..6840f3c259a93fa8de318acf76b9a74bc554dbbc 100644 (file)
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -1,26 +1,16 @@
 /* vi: set sw=4 ts=4: */
 /*
- * files.c -- DHCP server file manipulation *
+ * DHCP server config and lease file manipulation
+ *
  * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include <netinet/ether.h>
 
 #include "common.h"
 #include "dhcpd.h"
 
-#if BB_LITTLE_ENDIAN
-static inline uint64_t hton64(uint64_t v)
-{
-        return (((uint64_t)htonl(v)) << 32) | htonl(v >> 32);
-}
-#else
-#define hton64(v) (v)
-#endif
-#define ntoh64(v) hton64(v)
-
 /* on these functions, make sure your datatype matches */
 static int FAST_FUNC read_str(const char *line, void *arg)
 {
@@ -72,28 +62,28 @@ struct config_keyword {
 };
 
 static const struct config_keyword keywords[] = {
-       /* keyword       handler   variable address               default */
-       {"start",        udhcp_str2nip, &(server_config.start_ip),     "192.168.0.20"},
-       {"end",          udhcp_str2nip, &(server_config.end_ip),       "192.168.0.254"},
-       {"interface",    read_str, &(server_config.interface),    "eth0"},
+       /* keyword        handler           variable address               default */
+       {"start"        , udhcp_str2nip   , &server_config.start_ip     , "192.168.0.20"},
+       {"end"          , udhcp_str2nip   , &server_config.end_ip       , "192.168.0.254"},
+       {"interface"    , read_str        , &server_config.interface    , "eth0"},
        /* Avoid "max_leases value not sane" warning by setting default
         * to default_end_ip - default_start_ip + 1: */
-       {"max_leases",   read_u32, &(server_config.max_leases),   "235"},
-       {"auto_time",    read_u32, &(server_config.auto_time),    "7200"},
-       {"decline_time", read_u32, &(server_config.decline_time), "3600"},
-       {"conflict_time",read_u32, &(server_config.conflict_time),"3600"},
-       {"offer_time",   read_u32, &(server_config.offer_time),   "60"},
-       {"min_lease",    read_u32, &(server_config.min_lease_sec),"60"},
-       {"lease_file",   read_str, &(server_config.lease_file),   LEASES_FILE},
-       {"pidfile",      read_str, &(server_config.pidfile),      "/var/run/udhcpd.pid"},
-       {"siaddr",       udhcp_str2nip, &(server_config.siaddr_nip),   "0.0.0.0"},
+       {"max_leases"   , read_u32        , &server_config.max_leases   , "235"},
+       {"auto_time"    , read_u32        , &server_config.auto_time    , "7200"},
+       {"decline_time" , read_u32        , &server_config.decline_time , "3600"},
+       {"conflict_time", read_u32        , &server_config.conflict_time, "3600"},
+       {"offer_time"   , read_u32        , &server_config.offer_time   , "60"},
+       {"min_lease"    , read_u32        , &server_config.min_lease_sec, "60"},
+       {"lease_file"   , read_str        , &server_config.lease_file   , LEASES_FILE},
+       {"pidfile"      , read_str        , &server_config.pidfile      , "/var/run/udhcpd.pid"},
+       {"siaddr"       , udhcp_str2nip   , &server_config.siaddr_nip   , "0.0.0.0"},
        /* keywords with no defaults must be last! */
-       {"option",       udhcp_str2optset, &(server_config.options), ""},
-       {"opt",          udhcp_str2optset, &(server_config.options), ""},
-       {"notify_file",  read_str, &(server_config.notify_file),  ""},
-       {"sname",        read_str, &(server_config.sname),        ""},
-       {"boot_file",    read_str, &(server_config.boot_file),    ""},
-       {"static_lease", read_staticlease, &(server_config.static_leases), ""},
+       {"option"       , udhcp_str2optset, &server_config.options      , ""},
+       {"opt"          , udhcp_str2optset, &server_config.options      , ""},
+       {"notify_file"  , read_str        , &server_config.notify_file  , NULL},
+       {"sname"        , read_str        , &server_config.sname        , NULL},
+       {"boot_file"    , read_str        , &server_config.boot_file    , NULL},
+       {"static_lease" , read_staticlease, &server_config.static_leases, ""},
 };
 enum { KWS_WITH_DEFAULTS = ARRAY_SIZE(keywords) - 6 };
 
@@ -140,7 +130,7 @@ void FAST_FUNC write_leases(void)
 
        curr = written_at = time(NULL);
 
-       written_at = hton64(written_at);
+       written_at = SWAP_BE64(written_at);
        full_write(fd, &written_at, sizeof(written_at));
 
        for (i = 0; i < server_config.max_leases; i++) {
@@ -167,10 +157,11 @@ void FAST_FUNC write_leases(void)
        close(fd);
 
        if (server_config.notify_file) {
-// TODO: vfork-based child creation
-               char *cmd = xasprintf("%s %s", server_config.notify_file, server_config.lease_file);
-               system(cmd);
-               free(cmd);
+               char *argv[3];
+               argv[0] = server_config.notify_file;
+               argv[1] = server_config.lease_file;
+               argv[2] = NULL;
+               spawn_and_wait(argv);
        }
 }
 
@@ -189,7 +180,7 @@ void FAST_FUNC read_leases(const char *file)
 
        if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at))
                goto ret;
-       written_at = ntoh64(written_at);
+       written_at = SWAP_BE64(written_at);
 
        time_passed = time(NULL) - written_at;
        /* Strange written_at, or lease file from old version of udhcpd