MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #581 from robertfoss/dev 

Added USE_DNS define.
This commit is contained in:
zeroday 2015-08-02 23:40:37 +08:00
parent 53a035411e 1b8e015f33
commit c19596cae8
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/include/lwip/app/dhcpserver.h
View File

@ -51,6 +51,11 @@ typedef struct _list_node{
#define DHCPS_SERVER_PORT 67 #define DHCPS_SERVER_PORT 67
#define DHCPS_CLIENT_PORT 68 #define DHCPS_CLIENT_PORT 68
/*
* Advertise DNS capability in DHCP OFFER
*/
#define USE_DNS 0
#define DHCPDISCOVER 1 #define DHCPDISCOVER 1
#define DHCPOFFER 2 #define DHCPOFFER 2
#define DHCPREQUEST 3 #define DHCPREQUEST 3

60
app/lwip/app/dhcpserver.c
View File

@ -112,58 +112,58 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*optptr++ = DHCP_OPTION_SUBNET_MASK; *optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4; //length *optptr++ = 4; //length
*optptr++ = 255; *optptr++ = 255;
*optptr++ = 240; *optptr++ = 240;
*optptr++ = 0; *optptr++ = 0;
*optptr++ = 0; *optptr++ = 0;
#else #else
*optptr++ = DHCP_OPTION_SUBNET_MASK; *optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = 255;
*optptr++ = 255; *optptr++ = 255;
*optptr++ = 255;
*optptr++ = 255; *optptr++ = 255;
*optptr++ = 0; *optptr++ = 0;
#endif #endif
*optptr++ = DHCP_OPTION_LEASE_TIME; *optptr++ = DHCP_OPTION_LEASE_TIME;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = 0x00; *optptr++ = 0x00;
*optptr++ = 0x01; *optptr++ = 0x01;
*optptr++ = 0x51; *optptr++ = 0x51;
*optptr++ = 0x80; *optptr++ = 0x80;
*optptr++ = DHCP_OPTION_SERVER_ID; *optptr++ = DHCP_OPTION_SERVER_ID;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
*optptr++ = ip4_addr2( &ipadd); *optptr++ = ip4_addr2( &ipadd);
*optptr++ = ip4_addr3( &ipadd); *optptr++ = ip4_addr3( &ipadd);
*optptr++ = ip4_addr4( &ipadd); *optptr++ = ip4_addr4( &ipadd);
*optptr++ = DHCP_OPTION_ROUTER; *optptr++ = DHCP_OPTION_ROUTER;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
*optptr++ = ip4_addr2( &ipadd); *optptr++ = ip4_addr2( &ipadd);
*optptr++ = ip4_addr3( &ipadd); *optptr++ = ip4_addr3( &ipadd);
*optptr++ = ip4_addr4( &ipadd); *optptr++ = ip4_addr4( &ipadd);
#ifdef USE_DNS #ifdef USE_DNS
*optptr++ = DHCP_OPTION_DNS_SERVER; *optptr++ = DHCP_OPTION_DNS_SERVER;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
*optptr++ = ip4_addr2( &ipadd); *optptr++ = ip4_addr2( &ipadd);
*optptr++ = ip4_addr3( &ipadd); *optptr++ = ip4_addr3( &ipadd);
*optptr++ = ip4_addr4( &ipadd); *optptr++ = ip4_addr4( &ipadd);
#endif #endif
#ifdef CLASS_B_NET #ifdef CLASS_B_NET
*optptr++ = DHCP_OPTION_BROADCAST_ADDRESS; *optptr++ = DHCP_OPTION_BROADCAST_ADDRESS;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
*optptr++ = 255; *optptr++ = 255;
*optptr++ = 255; *optptr++ = 255;
*optptr++ = 255; *optptr++ = 255;
#else #else
*optptr++ = DHCP_OPTION_BROADCAST_ADDRESS; *optptr++ = DHCP_OPTION_BROADCAST_ADDRESS;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
*optptr++ = ip4_addr2( &ipadd); *optptr++ = ip4_addr2( &ipadd);
*optptr++ = ip4_addr3( &ipadd); *optptr++ = ip4_addr3( &ipadd);
@ -171,28 +171,28 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
#endif #endif
*optptr++ = DHCP_OPTION_INTERFACE_MTU; *optptr++ = DHCP_OPTION_INTERFACE_MTU;
*optptr++ = 2; *optptr++ = 2;
#ifdef CLASS_B_NET #ifdef CLASS_B_NET
*optptr++ = 0x05; *optptr++ = 0x05;
*optptr++ = 0xdc; *optptr++ = 0xdc;
#else #else
*optptr++ = 0x02; *optptr++ = 0x02;
*optptr++ = 0x40; *optptr++ = 0x40;
#endif #endif
*optptr++ = DHCP_OPTION_PERFORM_ROUTER_DISCOVERY; *optptr++ = DHCP_OPTION_PERFORM_ROUTER_DISCOVERY;
*optptr++ = 1; *optptr++ = 1;
*optptr++ = 0x00; *optptr++ = 0x00;
*optptr++ = 43; *optptr++ = 43;
*optptr++ = 6; *optptr++ = 6;
*optptr++ = 0x01; *optptr++ = 0x01;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = 0x00; *optptr++ = 0x00;
*optptr++ = 0x00; *optptr++ = 0x00;
*optptr++ = 0x00; *optptr++ = 0x00;
*optptr++ = 0x02; *optptr++ = 0x02;
return optptr; return optptr;
} }