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

Merge branch 'dev' of github.com:robertfoss/nodemcu-firmware into dev 

Conflicts:
	app/lwip/app/dhcpserver.c
This commit is contained in:
Robert Foss 2015-08-03 01:12:17 +02:00
parent 579dc27ee0 8f05556ab9
commit 428d3b37e4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
ipadd.addr = *( (uint32_t *) &server_address); ipadd.addr = *( (uint32_t *) &server_address);
#ifdef USE_CLASS_B_NET #if USE_CLASS_B_NET
*optptr++ = DHCP_OPTION_SUBNET_MASK; *optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4; //length *optptr++ = 4; //length
*optptr++ = 255; *optptr++ = 255;
@ -154,7 +154,11 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*optptr++ = ip4_addr4( &ipadd); *optptr++ = ip4_addr4( &ipadd);
#endif #endif
<<<<<<< HEAD
#ifdef USE_CLASS_B_NET #ifdef USE_CLASS_B_NET
=======
#if USE_CLASS_B_NET
>>>>>>> 8f05556ab903e6db4977095d508204103beba95a
*optptr++ = DHCP_OPTION_BROADCAST_ADDRESS; *optptr++ = DHCP_OPTION_BROADCAST_ADDRESS;
*optptr++ = 4; *optptr++ = 4;
*optptr++ = ip4_addr1( &ipadd); *optptr++ = ip4_addr1( &ipadd);
@ -172,7 +176,11 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*optptr++ = DHCP_OPTION_INTERFACE_MTU; *optptr++ = DHCP_OPTION_INTERFACE_MTU;
*optptr++ = 2; *optptr++ = 2;
<<<<<<< HEAD
#ifdef USE_CLASS_B_NET #ifdef USE_CLASS_B_NET
=======
#if USE_CLASS_B_NET
>>>>>>> 8f05556ab903e6db4977095d508204103beba95a
*optptr++ = 0x05; *optptr++ = 0x05;
*optptr++ = 0xdc; *optptr++ = 0xdc;
#else #else