diff options
-rw-r--r-- | include/usage.h | 16 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/usage.h b/include/usage.h index a343b41da..f3d89d341 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1003,14 +1003,14 @@ | |||
1003 | "Display DHCP leases granted by udhcpd\n" \ | 1003 | "Display DHCP leases granted by udhcpd\n" \ |
1004 | "\nOptions:" \ | 1004 | "\nOptions:" \ |
1005 | IF_LONG_OPTS( \ | 1005 | IF_LONG_OPTS( \ |
1006 | "\n -f,--file=FILE Leases file to load" \ | 1006 | "\n -f,--file=FILE Lease file" \ |
1007 | "\n -r,--remaining Interpret lease times as time remaining" \ | 1007 | "\n -r,--remaining Show remaining time" \ |
1008 | "\n -a,--absolute Interpret lease times as expire time" \ | 1008 | "\n -a,--absolute Show expiration time" \ |
1009 | ) \ | 1009 | ) \ |
1010 | IF_NOT_LONG_OPTS( \ | 1010 | IF_NOT_LONG_OPTS( \ |
1011 | "\n -f FILE Leases file to load" \ | 1011 | "\n -f FILE Lease file" \ |
1012 | "\n -r Interpret lease times as time remaining" \ | 1012 | "\n -r Show remaining time" \ |
1013 | "\n -a Interpret lease times as expire time" \ | 1013 | "\n -a Show expiration time" \ |
1014 | ) | 1014 | ) |
1015 | 1015 | ||
1016 | /* | 1016 | /* |
@@ -1042,8 +1042,8 @@ | |||
1042 | IF_FEATURE_FANCY_ECHO( "\n" \ | 1042 | IF_FEATURE_FANCY_ECHO( "\n" \ |
1043 | "\nOptions:" \ | 1043 | "\nOptions:" \ |
1044 | "\n -n Suppress trailing newline" \ | 1044 | "\n -n Suppress trailing newline" \ |
1045 | "\n -e Interpret backslash-escaped characters (i.e., \\t=tab)" \ | 1045 | "\n -e Interpret backslash escapes (i.e., \\t=tab)" \ |
1046 | "\n -E Disable interpretation of backslash-escaped characters" \ | 1046 | "\n -E Don't interpret backslash escapes (default)" \ |
1047 | ) | 1047 | ) |
1048 | #define echo_example_usage \ | 1048 | #define echo_example_usage \ |
1049 | "$ echo \"Erik is cool\"\n" \ | 1049 | "$ echo \"Erik is cool\"\n" \ |
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h index 149300b87..eea90177f 100644 --- a/networking/udhcp/dhcpd.h +++ b/networking/udhcp/dhcpd.h | |||
@@ -71,11 +71,11 @@ typedef uint32_t leasetime_t; | |||
71 | typedef int32_t signed_leasetime_t; | 71 | typedef int32_t signed_leasetime_t; |
72 | 72 | ||
73 | struct dyn_lease { | 73 | struct dyn_lease { |
74 | /* "nip": IP in network order */ | ||
75 | /* Unix time when lease expires. Kept in memory in host order. | 74 | /* Unix time when lease expires. Kept in memory in host order. |
76 | * When written to file, converted to network order | 75 | * When written to file, converted to network order |
77 | * and adjusted (current time subtracted) */ | 76 | * and adjusted (current time subtracted) */ |
78 | leasetime_t expires; | 77 | leasetime_t expires; |
78 | /* "nip": IP in network order */ | ||
79 | uint32_t lease_nip; | 79 | uint32_t lease_nip; |
80 | /* We use lease_mac[6], since e.g. ARP probing uses | 80 | /* We use lease_mac[6], since e.g. ARP probing uses |
81 | * only 6 first bytes anyway. We check received dhcp packets | 81 | * only 6 first bytes anyway. We check received dhcp packets |