Skip to content

Set DHCP subnet correctly for softAP #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Set DHCP subnet correctly for softAP #2619

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63c5c30
Set Subnet correctly in add_offer_options
mtongnz Oct 19, 2016
61924b1
Merge pull request #1 from mtongnz/softAP-dhcp-subnet
mtongnz Oct 19, 2016
ef659ac
Fix mistake
mtongnz Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions tools/sdk/lwip/src/app/dhcpserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,16 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)

ipadd.addr = *( (uint32_t *) &server_address);

#ifdef USE_CLASS_B_NET
*optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4; //length
*optptr++ = 255;
*optptr++ = 240;
*optptr++ = 0;
*optptr++ = 0;
#else
struct ip_info if_ip;
os_bzero(&if_ip, sizeof(struct ip_info));
wifi_get_ip_info(SOFTAP_IF, &if_ip);

*optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4;
*optptr++ = 255;
*optptr++ = 255;
*optptr++ = 255;
*optptr++ = 0;
#endif
*optptr++ = 4;
*optptr++ = ip4_addr1( &if_ip.netmask);
*optptr++ = ip4_addr2( &if_ip.netmask);
*optptr++ = ip4_addr3( &if_ip.netmask);
*optptr++ = ip4_addr4( &if_ip.netmask);

*optptr++ = DHCP_OPTION_LEASE_TIME;
*optptr++ = 4;
Expand All @@ -166,10 +161,6 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*optptr++ = ip4_addr4( &ipadd);

if (dhcps_router_enabled(offer)){
struct ip_info if_ip;
os_bzero(&if_ip, sizeof(struct ip_info));
wifi_get_ip_info(SOFTAP_IF, &if_ip);

*optptr++ = DHCP_OPTION_ROUTER;
*optptr++ = 4;
*optptr++ = ip4_addr1( &if_ip.gw);
Expand Down