dhcp: indicate IP network order in prototypes too

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

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index c0d515d283d7cff0259cf6533fd36cac4a002ff5..fb6219fba2b772a431c8c5f786ec8b83cdc7e2cc 100644 (file)
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -2,9 +2,9 @@
 /*
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
-
 #include "common.h"
 #include "dhcpd.h"
+#include "unicode.h"
 
 #if BB_LITTLE_ENDIAN
 static inline uint64_t hton64(uint64_t v)
@@ -25,7 +25,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
        unsigned opt;
        int64_t written_at, curr, expires_abs;
        const char *file = LEASES_FILE;
-       struct dhcpOfferedAddr lease;
+       struct dyn_lease lease;
        struct in_addr addr;
 
        enum {
@@ -33,7 +33,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                OPT_r   = 0x2,  // -r
                OPT_f   = 0x4,  // -f
        };
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
        static const char dumpleases_longopts[] ALIGN1 =
                "absolute\0"  No_argument       "a"
                "remaining\0" No_argument       "r"
@@ -42,16 +42,18 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
 
        applet_long_options = dumpleases_longopts;
 #endif
+       init_unicode();
+
        opt_complementary = "=0:a--r:r--a";
        opt = getopt32(argv, "arf:", &file);
 
        fd = xopen(file, O_RDONLY);
 
-       printf("Mac Address       IP-Address      Expires %s\n", (opt & OPT_a) ? "at" : "in");
-       /*     "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */
+       printf("Mac Address       IP Address      Host Name           Expires %s\n", (opt & OPT_a) ? "at" : "in");
+       /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
+       /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
 
-       if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at))
-               return 0;
+       xread(fd, &written_at, sizeof(written_at));
        written_at = ntoh64(written_at);
        curr = time(NULL);
        if (curr < written_at)
@@ -60,11 +62,21 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
        while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
                const char *fmt = ":%02x" + 1;
                for (i = 0; i < 6; i++) {
-                       printf(fmt, lease.chaddr[i]);
+                       printf(fmt, lease.lease_mac[i]);
                        fmt = ":%02x";
                }
-               addr.s_addr = lease.yiaddr;
-               printf(" %-15s ", inet_ntoa(addr));
+               addr.s_addr = lease.lease_nip;
+#if ENABLE_UNICODE_SUPPORT
+               {
+                       char *uni_name = unicode_conv_to_printable_fixedwidth(NULL, lease.hostname, 19);
+                       printf(" %-16s%s ", inet_ntoa(addr), uni_name);
+                       free(uni_name);
+               }
+#else
+               /* actually, 15+1 and 19+1, +1 is a space between columns */
+               /* lease.hostname is char[20] and is always NUL terminated */
+               printf(" %-16s%-20s", inet_ntoa(addr), lease.hostname);
+#endif
                expires_abs = ntohl(lease.expires) + written_at;
                if (expires_abs <= curr) {
                        puts("expired");