diff options
| -rw-r--r-- | apps/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | apps/netutils/dhcpd/Kconfig | 63 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/configs/ez80f910200zco/dhcpd/defconfig | 9 | ||||
| -rw-r--r-- | nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig | 9 | ||||
| -rw-r--r-- | nuttx/configs/stm3220g-eval/dhcpd/defconfig | 9 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/dhcpd/defconfig | 9 |
7 files changed, 104 insertions, 1 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 601e0a37d..80467ec10 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -853,4 +853,6 @@ at the end of the file (2014-2-27). * netutils/dhcpd/dhcpd.c: allocipaddr() should not call ntohl(), the returned IP address is already in host order. + * apps/netutils/dhcpd/Kconfig: Add missing DHCPD configuratino + settings(2014-3-3). diff --git a/apps/netutils/dhcpd/Kconfig b/apps/netutils/dhcpd/Kconfig index 0d3b89f24..3f586a74b 100644 --- a/apps/netutils/dhcpd/Kconfig +++ b/apps/netutils/dhcpd/Kconfig @@ -10,4 +10,67 @@ config NETUTILS_DHCPD Enable support for the DHCP server. if NETUTILS_DHCPD + +config NETUTILS_DHCPD_HOST + bool "Host-based DHCPD build" + default n + depends on EXPERIMENTAL + ---help--- + DHCPD supports a host based build for testing on a PC. It is + enabled by this configuration, however, ti cannot really be used + in the context to the NuttX build as it currently stands. + +config NETUTILS_DHCPD_IGNOREBROADCAST + bool "Ignore client broadcast" + default y + ---help--- + This is a hack. I've had problems with Windows machines responding + to unicast. I think this is associated with a Windows registry key in + HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DHCPServer\Parameters: + The IgnoreBroadcastFlag value controls this behavior: A value of 1 will + cause the server to ignore the client broadcast flag and always respond + with multicast; the value 0 to allows clients to request unicast. + +config NETUTILS_DHCPD_INTERFACE + string "DHCPD network interface" + default "eth0" + +config NETUTILS_DHCPD_LEASETIME + int "Lease time (seconds)" + default 864000 + ---help--- + Default: 10 days + +config NETUTILS_DHCPD_MINLEASETIME + int "Minimum lease time (seconds)" + default 86400 + ---help--- + Default: 1 days + +config NETUTILS_DHCPD_MAXLEASETIME + int "Maximum lease time (seconds)" + default 2592000 + ---help--- + Default: 30 days + +config NETUTILS_DHCPD_MAXLEASES + int "Maximum number of leases" + default 6 + +config NETUTILS_DHCPD_STARTIP + hex "First IP address" + default 0x0a000002 + +config NETUTILS_DHCPD_OFFERTIME + int "Offer time (seconds)" + default 3600 + ---help--- + Default: 1 hour + +config NETUTILS_DHCPD_DECLINETIME + int "Decline time (seconds)" + default 3600 + ---help--- + Default: 1 hour + endif diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index d955db49b..93990e4f2 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6793,4 +6793,6 @@ * configs/mcu123-lpc214x/usbmsc: Configuration converted to use the kconfig-frontends tools (2014-3-3) * configs/teensy/nettest: Configuration converted to use the kconfig-frontends - tools (2014-3-3).
\ No newline at end of file + tools (2014-3-3). + * configs/*/dhcpd: Add missing DHCPD configuratino settings (2014-3-3). + diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index 93e98792d..1a8d40b10 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig @@ -611,6 +611,15 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00 # CONFIG_NETUTILS_CODECS is not set # CONFIG_NETUTILS_DHCPC is not set CONFIG_NETUTILS_DHCPD=y +# CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set +CONFIG_NETUTILS_DHCPD_INTERFACE="eth0" +CONFIG_NETUTILS_DHCPD_LEASETIME=864000 +CONFIG_NETUTILS_DHCPD_MINLEASETIME=86400 +CONFIG_NETUTILS_DHCPD_MAXLEASETIME=2592000 +CONFIG_NETUTILS_DHCPD_MAXLEASES=6 +CONFIG_NETUTILS_DHCPD_STARTIP=0x0a000002 +CONFIG_NETUTILS_DHCPD_OFFERTIME=3600 +CONFIG_NETUTILS_DHCPD_DECLINETIME=3600 # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 4bf139e72..a0b2bcd3b 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -644,6 +644,15 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00 # CONFIG_NETUTILS_CODECS is not set # CONFIG_NETUTILS_DHCPC is not set CONFIG_NETUTILS_DHCPD=y +# CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set +CONFIG_NETUTILS_DHCPD_INTERFACE="eth0" +CONFIG_NETUTILS_DHCPD_LEASETIME=864000 +CONFIG_NETUTILS_DHCPD_MINLEASETIME=86400 +CONFIG_NETUTILS_DHCPD_MAXLEASETIME=2592000 +CONFIG_NETUTILS_DHCPD_MAXLEASES=6 +CONFIG_NETUTILS_DHCPD_STARTIP=0x0a000002 +CONFIG_NETUTILS_DHCPD_OFFERTIME=3600 +CONFIG_NETUTILS_DHCPD_DECLINETIME=3600 # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig index ab845968e..8a086ae67 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig @@ -773,6 +773,15 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00 # CONFIG_NETUTILS_CODECS is not set # CONFIG_NETUTILS_DHCPC is not set CONFIG_NETUTILS_DHCPD=y +# CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set +CONFIG_NETUTILS_DHCPD_INTERFACE="eth0" +CONFIG_NETUTILS_DHCPD_LEASETIME=864000 +CONFIG_NETUTILS_DHCPD_MINLEASETIME=86400 +CONFIG_NETUTILS_DHCPD_MAXLEASETIME=2592000 +CONFIG_NETUTILS_DHCPD_MAXLEASES=6 +CONFIG_NETUTILS_DHCPD_STARTIP=0x0a000002 +CONFIG_NETUTILS_DHCPD_OFFERTIME=3600 +CONFIG_NETUTILS_DHCPD_DECLINETIME=3600 # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig index be17b2545..cddc3cf10 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig @@ -775,6 +775,15 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00 # CONFIG_NETUTILS_CODECS is not set # CONFIG_NETUTILS_DHCPC is not set CONFIG_NETUTILS_DHCPD=y +# CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set +CONFIG_NETUTILS_DHCPD_INTERFACE="eth0" +CONFIG_NETUTILS_DHCPD_LEASETIME=864000 +CONFIG_NETUTILS_DHCPD_MINLEASETIME=86400 +CONFIG_NETUTILS_DHCPD_MAXLEASETIME=2592000 +CONFIG_NETUTILS_DHCPD_MAXLEASES=6 +CONFIG_NETUTILS_DHCPD_STARTIP=0x0a000002 +CONFIG_NETUTILS_DHCPD_OFFERTIME=3600 +CONFIG_NETUTILS_DHCPD_DECLINETIME=3600 # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set |