libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[DHCPD] update DHCPD_SERVER_IP config.

This commit is contained in:
aozima 2018-05-09 21:15:14 +08:00
parent 6a36d0c575
commit 47a0e46478
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/net/Kconfig
View File

@ -202,6 +202,10 @@ config LWIP_USING_DHCPD
default n default n
if LWIP_USING_DHCPD if LWIP_USING_DHCPD
config DHCPD_SERVER_IP
string "DHCPD SERVER IP address"
default 192.168.169.1
config DHCPD_USING_ROUTER config DHCPD_USING_ROUTER
bool "alloc gateway ip for router" bool "alloc gateway ip for router"
default y default y

22
components/net/lwip_dhcpd/dhcp_server.c
View File

@ -55,11 +55,8 @@
#endif #endif
/* the DHCP server address */ /* the DHCP server address */
#ifndef DHCPD_SERVER_IPADDR0 #ifndef DHCPD_SERVER_IP
#define DHCPD_SERVER_IPADDR0 192UL #define DHCPD_SERVER_IP "192.168.169.1"
#define DHCPD_SERVER_IPADDR1 168UL
#define DHCPD_SERVER_IPADDR2 169UL
#define DHCPD_SERVER_IPADDR3 1UL
#endif #endif
//#define DHCP_DEBUG_PRINTF //#define DHCP_DEBUG_PRINTF
@ -215,12 +212,22 @@ static void dhcpd_thread_entry(void *parameter)
struct dhcp_msg *msg; struct dhcp_msg *msg;
int optval = 1; int optval = 1;
struct mac_addr_t mac_addr; struct mac_addr_t mac_addr;
uint8_t DHCPD_SERVER_IPADDR0, DHCPD_SERVER_IPADDR1, DHCPD_SERVER_IPADDR2, DHCPD_SERVER_IPADDR3;
/* get ethernet interface. */ /* get ethernet interface. */
netif = (struct netif *) parameter; netif = (struct netif *) parameter;
RT_ASSERT(netif != RT_NULL); RT_ASSERT(netif != RT_NULL);
/* our DHCP server information */ /* 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", 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_IPADDR0, DHCPD_SERVER_IPADDR1,
DHCPD_SERVER_IPADDR2, DHCPD_SERVER_IPADDR3, 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); 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); 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, DHCPD_SERVER_IP, "0.0.0.0", "255.255.255.0");
set_if(netif_name, ip_str, "0.0.0.0", "255.255.255.0");
netif_set_up(netif); netif_set_up(netif);
} }