From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../router/busybox/networking/udhcp/dumpleases.c | 149 +++++++++++---------- 1 file changed, 77 insertions(+), 72 deletions(-) (limited to 'release/src/router/busybox/networking/udhcp/dumpleases.c') diff --git a/release/src/router/busybox/networking/udhcp/dumpleases.c b/release/src/router/busybox/networking/udhcp/dumpleases.c index 4c6107cf..1558f884 100644 --- a/release/src/router/busybox/networking/udhcp/dumpleases.c +++ b/release/src/router/busybox/networking/udhcp/dumpleases.c @@ -1,88 +1,93 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* vi: set sw=4 ts=4: */ +/* + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + */ -#include "leases.h" -#include "busybox.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) -#define REMAINING 0 -#define ABSOLUTE 1 -int dumpleases_main(int argc, char *argv[]) +int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int dumpleases_main(int argc UNUSED_PARAM, char **argv) { - FILE *fp; - int i, c, mode = REMAINING; - long expires; - const char *file = leases_file; + int fd; + int i; + unsigned opt; + int64_t written_at, curr, expires_abs; + const char *file = LEASES_FILE; struct dhcpOfferedAddr lease; struct in_addr addr; - - static const struct option options[] = { - {"absolute", 0, 0, 'a'}, - {"remaining", 0, 0, 'r'}, - {"file", 1, 0, 'f'}, - {0, 0, 0, 0} + + enum { + OPT_a = 0x1, // -a + OPT_r = 0x2, // -r + OPT_f = 0x4, // -f }; +#if ENABLE_GETOPT_LONG + static const char dumpleases_longopts[] ALIGN1 = + "absolute\0" No_argument "a" + "remaining\0" No_argument "r" + "file\0" Required_argument "f" + ; - while (1) { - int option_index = 0; - c = getopt_long(argc, argv, "arf:", options, &option_index); - if (c == -1) break; - - switch (c) { - case 'a': mode = ABSOLUTE; break; - case 'r': mode = REMAINING; break; - case 'f': - file = optarg; - break; - default: - bb_show_usage(); - } - } - - fp = bb_xfopen(file, "r"); + applet_long_options = dumpleases_longopts; +#endif + opt_complementary = "=0:a--r:r--a"; + opt = getopt32(argv, "arf:", &file); - printf("Mac Address IP-Address Expires %s\n", mode == REMAINING ? "in" : "at"); - /* "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */ - while (fread(&lease, sizeof(lease), 1, fp)) { + fd = xopen(file, O_RDONLY); + 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; + written_at = ntoh64(written_at); + curr = time(NULL); + if (curr < written_at) + written_at = curr; /* lease file from future! :) */ + + while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) { + const char *fmt = ":%02x" + 1; for (i = 0; i < 6; i++) { - printf("%02x", lease.chaddr[i]); - if (i != 5) printf(":"); + printf(fmt, lease.chaddr[i]); + fmt = ":%02x"; } addr.s_addr = lease.yiaddr; - printf(" %-15s", inet_ntoa(addr)); - expires = ntohl(lease.expires); - printf(" "); - if (mode == REMAINING) { - if (!expires) printf("expired\n"); - else { - if (expires > 60*60*24) { - printf("%ld days, ", expires / (60*60*24)); - expires %= 60*60*24; - } - if (expires > 60*60) { - printf("%ld hours, ", expires / (60*60)); - expires %= 60*60; - } - if (expires > 60) { - printf("%ld minutes, ", expires / 60); - expires %= 60; - } - printf("%ld seconds\n", expires); - } - } else printf("%s", ctime(&expires)); + /* 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); + expires_abs = ntohl(lease.expires) + written_at; + if (expires_abs <= curr) { + puts("expired"); + continue; + } + if (!(opt & OPT_a)) { /* no -a */ + unsigned d, h, m; + unsigned expires = expires_abs - curr; + d = expires / (24*60*60); expires %= (24*60*60); + h = expires / (60*60); expires %= (60*60); + m = expires / 60; expires %= 60; + if (d) + printf("%u days ", d); + printf("%02u:%02u:%02u\n", h, m, (unsigned)expires); + } else { /* -a */ + time_t t = expires_abs; + fputs(ctime(&t), stdout); + } } - fclose(fp); - + /* close(fd); */ + return 0; } -- cgit v1.2.3-54-g00ecf