8000 DHCP custom option by mcspr · Pull Request #8582 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

DHCP custom option #8582

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

Merged
merged 19 commits into from
Jun 8, 2022
Merged

DHCP custom option #8582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2ec527f
works
mcspr May 27, 2022
6ccb685
fixup! works
mcspr May 27, 2022
30b188e
back to callbacks
mcspr May 31, 2022
8c79b2b
names
mcspr May 31, 2022
729b732
daisy chain
mcspr May 31, 2022
cd91c14
Merge remote-tracking branch 'origin/master' into dhcps-opts
mcspr May 31, 2022
811bdf9
seconds
mcspr May 31, 2022
657c1e2
less inline
mcspr May 31, 2022
1010b86
fix dns setter
mcspr May 31, 2022
8000 76a0f7e
might as well keep using initlist
mcspr May 31, 2022
fe425cb
shift blame
mcspr Jun 1, 2022
135fd4a
naming
mcspr Jun 1, 2022
3be2c6e
fix impl
mcspr Jun 1, 2022
2312b46
revert to ip4 dns
mcspr Jun 1, 2022
38c30cf
Merge remote-tracking branch 'origin/master' into dhcps-opts
mcspr Jun 2, 2022
8919f00
merge fix
mcspr Jun 2, 2022
ad7faf7
restyle
mcspr Jun 7, 2022
86b5dd5
Merge remote-tracking branch 'origin/master' into dhcps-opts
mcspr Jun 7, 2022
f9de275
masking done wrong
mcspr Jun 8, 2022
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
8000
Prev Previous commit
Next Next commit
daisy chain
  • Loading branch information
@mcspr
mcspr committed May 31, 2022
commit 729b732c03885a4e7869aa6ff89394a9d61174cb
10 changes: 5 additions & 5 deletions cores/esp8266/LwipDhcpServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,9 @@ bool DhcpServer::add_dhcps_lease(uint8* macaddr)
///////////////////////////////////////////////////////////////////////////////////
void DhcpServer::add_offer_options(OptionsBuffer& options)
{
options.add(DHCP_OPTION_SUBNET_MASK, ip_2_ip4(&_netif->netmask));
options.add(DHCP_OPTION_LEASE_TIME, lease_time);
options.add(DHCP_OPTION_SERVER_ID, ip_2_ip4(&_netif->ip_addr));
options.add(DHCP_OPTION_SUBNET_MASK, ip_2_ip4(&_netif->netmask))
.add(DHCP_OPTION_LEASE_TIME, lease_time)
.add(DHCP_OPTION_SERVER_ID, ip_2_ip4(&_netif->ip_addr));

if (offer_router && !ip4_addr_isany_val(*ip_2_ip4(&_netif->gw)))
{
Expand All @@ -352,8 +352,8 @@ void DhcpServer::add_offer_options(OptionsBuffer& options)

#ifdef USE_DNS
options.add(DHCP_OPTION_DNS_SERVER, !ip4_addr_isany_val(*ip_2_ip4(&dns_address))
? ip_2_ip4(&dns_address)
: ip_2_ip4(&_netif->ip_addr));
? ip_2_ip4(&dns_address)
: ip_2_ip4(&_netif->ip_addr));
#endif

{
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/examples/CustomOffer/CustomOffer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

void setup() {
dhcpSoftAP.custom_offer_options = [](const DhcpServer&, auto& options) {
options.add(43, { 0xca, 0xfe, 0xca, 0xfe, 0xfe }); // VENDOR is... vendor specific
options.add(114, "https://192.168.4.1"); // Captive portal
options.add(43, { 0xca, 0xfe, 0xca, 0xfe, 0xfe }) // VENDOR is... vendor specific
.add(114, "https://192.168.4.1"); // Captive portal
};
WiFi.softAP("TEST", "testtesttest");
}
Expand Down
0