diff options
| author | aozima <[email protected]> | 2018-05-09 21:15:14 +0800 |
|---|---|---|
| committer | aozima <[email protected]> | 2018-05-09 21:15:14 +0800 |
| commit | 47a0e4647836206db14e03d78894f7684652a2ba (patch) | |
| tree | dac9d2861de8bb14be730e3d4e6f96a443e2955c /components | |
| parent | 6a36d0c5752be11b48d9e1e5d5d25a581349c445 (diff) | |
[DHCPD] update DHCPD_SERVER_IP config.
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/Kconfig | 4 | ||||
| -rw-r--r-- | components/net/lwip_dhcpd/dhcp_server.c | 22 |
2 files changed, 17 insertions, 9 deletions
diff --git a/components/net/Kconfig b/components/net/Kconfig index 002b4e62b8..58a327ee1e 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -202,6 +202,10 @@ config LWIP_USING_DHCPD default n if LWIP_USING_DHCPD + config DHCPD_SERVER_IP + string "DHCPD SERVER IP address" + default 192.168.169.1 + config DHCPD_USING_ROUTER bool "alloc gateway ip for router" default y diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c index ac33804e28..a71548e333 100644 --- a/components/net/lwip_dhcpd/dhcp_server.c +++ b/components/net/lwip_dhcpd/dhcp_server.c @@ -55,11 +55,8 @@ #endif /* the DHCP server address */ -#ifndef DHCPD_SERVER_IPADDR0 - #define DHCPD_SERVER_IPADDR0 192UL - #define DHCPD_SERVER_IPADDR1 168UL - #define DHCPD_SERVER_IPADDR2 169UL - #define DHCPD_SERVER_IPADDR3 1UL +#ifndef DHCPD_SERVER_IP + #define DHCPD_SERVER_IP "192.168.169.1" #endif //#define DHCP_DEBUG_PRINTF @@ -215,12 +212,22 @@ static void dhcpd_thread_entry(void *parameter) struct dhcp_msg *msg; int optval = 1; struct mac_addr_t mac_addr; + uint8_t DHCPD_SERVER_IPADDR0, DHCPD_SERVER_IPADDR1, DHCPD_SERVER_IPADDR2, DHCPD_SERVER_IPADDR3; /* get ethernet interface. */ netif = (struct netif *) parameter; RT_ASSERT(netif != RT_NULL); /* our DHCP server information */ + { + ip4_addr_t addr; + + ip4addr_aton(DHCPD_SERVER_IP, &addr); + DHCPD_SERVER_IPADDR0 = (ntohl(addr.addr) >> 24) & 0xFF; + DHCPD_SERVER_IPADDR1 = (ntohl(addr.addr) >> 16) & 0xFF; + DHCPD_SERVER_IPADDR2 = (ntohl(addr.addr) >> 8) & 0xFF; + DHCPD_SERVER_IPADDR3 = (ntohl(addr.addr) >> 0) & 0xFF; + } DEBUG_PRINTF("DHCP server IP: %d.%d.%d.%d client IP: %d.%d.%d.%d-%d\n", DHCPD_SERVER_IPADDR0, DHCPD_SERVER_IPADDR1, DHCPD_SERVER_IPADDR2, DHCPD_SERVER_IPADDR3, @@ -492,12 +499,9 @@ void dhcpd_start(const char *netif_name) { extern void set_if(const char *netif_name, const char *ip_addr, const char *gw_addr, const char *nm_addr); - char ip_str[4 * 4 + 1]; - dhcp_stop(netif); - sprintf(ip_str, "%d.%d.%d.%d", DHCPD_SERVER_IPADDR0, DHCPD_SERVER_IPADDR1, DHCPD_SERVER_IPADDR2, DHCPD_SERVER_IPADDR3); - set_if(netif_name, ip_str, "0.0.0.0", "255.255.255.0"); + set_if(netif_name, DHCPD_SERVER_IP, "0.0.0.0", "255.255.255.0"); netif_set_up(netif); } |