Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

udhcp: tweak udhcpd.conf example and comments. no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-03-21 02:22:07 +01:00
parent e5ce91b41b
commit 2e7aa92836
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
examples/udhcp/udhcpd.conf
View File

@ -45,9 +45,12 @@ interface eth0
#notify_file dumpleases # useful for debugging #notify_file dumpleases # useful for debugging
# The following are bootp specific options # The following are bootp specific options
#siaddr 192.168.0.22 #default: 0.0.0.0 # next server to use in bootstrap
#sname zorak #default: none #siaddr 192.168.0.22 # default: 0.0.0.0 (none)
#boot_file /var/nfs_root #default: none # tftp server name
#sname zorak # default: none
# tftp file to download (e.g. kernel image)
#boot_file /var/nfs_root # default: none
# Static leases map # Static leases map
#static_lease 00:60:08:11:CE:4E 192.168.0.54 #static_lease 00:60:08:11:CE:4E 192.168.0.54
@ -56,7 +59,7 @@ interface eth0
# The remainder of options are DHCP options and can be specified with the # The remainder of options are DHCP options and can be specified with the
# keyword 'opt' or 'option'. If an option can take multiple items, such # keyword 'opt' or 'option'. If an option can take multiple items, such
# as the dns option, they can be listed on the same line, or multiple # as the dns option, they can be listed on the same line, or multiple
# lines. The only option with a default is 'lease'. # lines.
# Examples: # Examples:
opt dns 192.168.10.2 192.168.10.10 opt dns 192.168.10.2 192.168.10.10
option subnet 255.255.255.0 option subnet 255.255.255.0
@ -64,7 +67,7 @@ opt router 192.168.10.2
opt wins 192.168.10.10 opt wins 192.168.10.10
option dns 129.219.13.81 # appended to above DNS servers for a total of 3 option dns 129.219.13.81 # appended to above DNS servers for a total of 3
option domain local option domain local
option lease 864000 # 10 days option lease 864000 # default: 10 days
# Currently supported options (for more info, see options.c): # Currently supported options (for more info, see options.c):
#opt lease NUM #opt lease NUM
@ -73,18 +76,18 @@ option lease 864000 # 10 days
#opt router IP_LIST #opt router IP_LIST
#opt ipttl NUM #opt ipttl NUM
#opt mtu NUM #opt mtu NUM
#opt hostname STRING - client's hostname #opt hostname STRING # client's hostname
#opt domain STRING - client's domain name #opt domain STRING # client's domain suffix
#opt search STRING_LIST - search domains #opt search STRING_LIST # search domains
#opt nisdomain STRING #opt nisdomain STRING
#opt timezone NUM - (localtime - UTC_time) in seconds. signed #opt timezone NUM # (localtime - UTC_time) in seconds. signed
#opt tftp STRING - TFTP server name #opt tftp STRING # tftp server name
#opt bootfile STRING - file (kernel image) to load for booting #opt bootfile STRING # tftp file to download (e.g. kernel image)
#opt bootsize NUM - size of that file #opt bootsize NUM # size of that file
#opt rootpath STRING - (NFS) path to mount as root fs #opt rootpath STRING # (NFS) path to mount as root fs
#opt wpad STRING #opt wpad STRING
#opt serverid IP - by default, server's IP #opt serverid IP # default: server's IP
#opt message STRING - error message (udhcpd sends it on success too) #opt message STRING # error message (udhcpd sends it on success too)
# Options specifying server(s) # Options specifying server(s)
#opt dns IP_LIST #opt dns IP_LIST
#opt wins IP_LIST #opt wins IP_LIST
@ -93,7 +96,7 @@ option lease 864000 # 10 days
#opt lprsrv IP_LIST #opt lprsrv IP_LIST
#opt swapsrv IP #opt swapsrv IP
# Obsolete options, no longer supported # Obsolete options, no longer supported
#opt logsrv IP_LIST - 704/UDP log server (not syslog!) #opt logsrv IP_LIST # 704/UDP log server (not syslog!)
#opt namesrv IP_LIST - IEN 116 name server, obsolete (August 1979!!!) #opt namesrv IP_LIST # IEN 116 name server, obsolete (August 1979!!!)
#opt cookiesrv IP_LIST - RFC 865 "quote of the day" server, rarely (never?) used #opt cookiesrv IP_LIST # RFC 865 "quote of the day" server, rarely (never?) used
#opt timesrv IP_LIST - RFC 868 time server, rarely (never?) used #opt timesrv IP_LIST # RFC 868 time server, rarely (never?) used

2
networking/udhcp/dhcpd.c
View File

@ -319,7 +319,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
bb_info_msg("%s (v"BB_VER") started", applet_name); bb_info_msg("%s (v"BB_VER") started", applet_name);
option = find_option(server_config.options, DHCP_LEASE_TIME); option = find_option(server_config.options, DHCP_LEASE_TIME);
server_config.max_lease_sec = LEASE_TIME; server_config.max_lease_sec = DEFAULT_LEASE_TIME;
if (option) { if (option) {
move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA); move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA);
server_config.max_lease_sec = ntohl(server_config.max_lease_sec); server_config.max_lease_sec = ntohl(server_config.max_lease_sec);

4
networking/udhcp/dhcpd.h
View File

@ -7,8 +7,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
/* Defaults you may want to tweak */ /* Defaults you may want to tweak */
/* Default max_lease_sec */ /* Default max_lease_sec */
#define LEASE_TIME (60*60*24 * 10) #define DEFAULT_LEASE_TIME (60*60*24 * 10)
#define LEASES_FILE CONFIG_DHCPD_LEASES_FILE #define LEASES_FILE CONFIG_DHCPD_LEASES_FILE
/* Where to find the DHCP server configuration file */ /* Where to find the DHCP server configuration file */
#define DHCPD_CONF_FILE "/etc/udhcpd.conf" #define DHCPD_CONF_FILE "/etc/udhcpd.conf"

3
networking/udhcp/options.h
View File

@ -35,7 +35,8 @@ enum {
/* DHCP protocol. See RFC 2131 */ /* DHCP protocol. See RFC 2131 */
#define DHCP_MAGIC 0x63825363 #define DHCP_MAGIC 0x63825363
/* DHCP option codes (partial list). See RFC 2132. /* DHCP option codes (partial list). See RFC 2132 and
* http://www.iana.org/assignments/bootp-dhcp-parameters/
* Commented out options are handled by common option machinery, * Commented out options are handled by common option machinery,
* uncommented ones have spacial cases (grep for them to see). * uncommented ones have spacial cases (grep for them to see).
*/ */