diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-21 02:22:07 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-21 02:22:07 +0100 |
commit | 2e7aa928360eb9b1c90fa2356734cee794b66516 (patch) | |
tree | 58d8cb605c2a339076dc1e097c8137a8a2e176b7 /networking | |
parent | e5ce91b41b657a0dbd1db442ebc47f4c935e7d1f (diff) | |
download | busybox-w32-2e7aa928360eb9b1c90fa2356734cee794b66516.tar.gz busybox-w32-2e7aa928360eb9b1c90fa2356734cee794b66516.tar.bz2 busybox-w32-2e7aa928360eb9b1c90fa2356734cee794b66516.zip |
udhcp: tweak udhcpd.conf example and comments. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/udhcp/dhcpd.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.h | 4 | ||||
-rw-r--r-- | networking/udhcp/options.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index cc4cb9280..f594bad66 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -319,7 +319,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
319 | bb_info_msg("%s (v"BB_VER") started", applet_name); | 319 | bb_info_msg("%s (v"BB_VER") started", applet_name); |
320 | 320 | ||
321 | option = find_option(server_config.options, DHCP_LEASE_TIME); | 321 | option = find_option(server_config.options, DHCP_LEASE_TIME); |
322 | server_config.max_lease_sec = LEASE_TIME; | 322 | server_config.max_lease_sec = DEFAULT_LEASE_TIME; |
323 | if (option) { | 323 | if (option) { |
324 | move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA); | 324 | move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA); |
325 | server_config.max_lease_sec = ntohl(server_config.max_lease_sec); | 325 | server_config.max_lease_sec = ntohl(server_config.max_lease_sec); |
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h index b55fd6c06..2f2f5b33a 100644 --- a/networking/udhcp/dhcpd.h +++ b/networking/udhcp/dhcpd.h | |||
@@ -7,8 +7,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
7 | 7 | ||
8 | /* Defaults you may want to tweak */ | 8 | /* Defaults you may want to tweak */ |
9 | /* Default max_lease_sec */ | 9 | /* Default max_lease_sec */ |
10 | #define LEASE_TIME (60*60*24 * 10) | 10 | #define DEFAULT_LEASE_TIME (60*60*24 * 10) |
11 | #define LEASES_FILE CONFIG_DHCPD_LEASES_FILE | 11 | #define LEASES_FILE CONFIG_DHCPD_LEASES_FILE |
12 | /* Where to find the DHCP server configuration file */ | 12 | /* Where to find the DHCP server configuration file */ |
13 | #define DHCPD_CONF_FILE "/etc/udhcpd.conf" | 13 | #define DHCPD_CONF_FILE "/etc/udhcpd.conf" |
14 | 14 | ||
diff --git a/networking/udhcp/options.h b/networking/udhcp/options.h index b7c9d8f8d..05090f12e 100644 --- a/networking/udhcp/options.h +++ b/networking/udhcp/options.h | |||
@@ -35,7 +35,8 @@ enum { | |||
35 | /* DHCP protocol. See RFC 2131 */ | 35 | /* DHCP protocol. See RFC 2131 */ |
36 | #define DHCP_MAGIC 0x63825363 | 36 | #define DHCP_MAGIC 0x63825363 |
37 | 37 | ||
38 | /* DHCP option codes (partial list). See RFC 2132. | 38 | /* DHCP option codes (partial list). See RFC 2132 and |
39 | * http://www.iana.org/assignments/bootp-dhcp-parameters/ | ||
39 | * Commented out options are handled by common option machinery, | 40 | * Commented out options are handled by common option machinery, |
40 | * uncommented ones have spacial cases (grep for them to see). | 41 | * uncommented ones have spacial cases (grep for them to see). |
41 | */ | 42 | */ |