X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Fdumpleases.c;h=a15e409cc22565237e0faaf7e0a6372a2db705b7;hb=e4dcba1c103dc28e927e004791e331aaf604383d;hp=a0e81bb1306038bed003dfc85f9c93acfe8ffad2;hpb=61126ab30a90b74e45a79ccb97074ab71afa6054;p=oweals%2Fbusybox.git

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index a0e81bb13..a15e409cc 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,74 +1,91 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-#include <getopt.h>
-
 #include "common.h"
 #include "dhcpd.h"
+#include "unicode.h"
 
-
-#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)
 {
-	int fp;
-	int i, c, mode = REMAINING;
-	unsigned long expires;
+	int fd;
+	int i;
+	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;
 
-	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_LONG_OPTS
+	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;
+	applet_long_options = dumpleases_longopts;
+#endif
+	init_unicode();
 
-		switch (c) {
-		case 'a': mode = ABSOLUTE; break;
-		case 'r': mode = REMAINING; break;
-		case 'f':
-			file = optarg;
-			break;
-		default:
-			bb_show_usage();
-		}
-	}
+	opt_complementary = "=0:a--r:r--a";
+	opt = getopt32(argv, "arf:", &file);
 
-	fp = xopen(file, O_RDONLY);
+	fd = xopen(file, O_RDONLY);
 
-	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 (full_read(fp, &lease, sizeof(lease)) == sizeof(lease)) {
-		printf(":%02x"+1, lease.chaddr[0]);
-		for (i = 1; i < 6; i++) {
-			printf(":%02x", lease.chaddr[i]);
+	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 */
+
+	xread(fd, &written_at, sizeof(written_at));
+	written_at = SWAP_BE64(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(fmt, lease.lease_mac[i]);
+			fmt = ":%02x";
+		}
+		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");
+			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);
 		}
-		addr.s_addr = lease.yiaddr;
-		printf(" %-15s ", inet_ntoa(addr));
-		expires = ntohl(lease.expires);
-		if (mode == REMAINING) {
-			if (!expires)
-				printf("expired\n");
-			else {
-				unsigned d, h, m;
-				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 fputs(ctime(&expires), stdout);
 	}
-	/* close(fp); */
+	/* close(fd); */
 
 	return 0;
 }