Skip to content

MDNS: fix random crash on startup #6261

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
earlephilhower merged 13 commits into from
Sep 5, 2019
Merged

MDNS: fix random crash on startup #6261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
155431b
mDNS debug option + AP address is used by default when STA is also pr…
d-a-v Jul 9, 2019
3c6b481
mDNS: store network interface, checking it is up
d-a-v Jul 24, 2019
7d8bb51
igmp: force on selected interface (avoid crash *sometimes*)
d-a-v Jul 24, 2019
dc31d7e
fix for all lwip2 ipv4 ipv6 & lwip1
d-a-v Jul 24, 2019
25e495d
mdns: IPAddress is not needed to reference associated interface
d-a-v Jul 24, 2019
775bd7d
mdns: debug: fix print warnings
d-a-v Jul 25, 2019
3378fa9
emulation: add ets_strncpy
d-a-v Jul 25, 2019
b6a7036
emulation: truly emulate AddrList (remove fake one)
d-a-v Jul 25, 2019
ab28629
Merge branch 'master' into udpmdnsfix
earlephilhower Jul 25, 2019
49d8f03
Merge branch 'master' into udpmdnsfix
d-a-v Aug 29, 2019
8433761
Merge branch 'master' into udpmdnsfix
d-a-v Sep 4, 2019
d9f6b79
Merge branch 'master' into udpmdnsfix
devyte Sep 5, 2019
7e7ca2c
Merge branch 'master' into udpmdnsfix
d-a-v Sep 5, 2019
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
Prev Previous commit
Next Next commit
mDNS: store network interface, checking it is up
  • Loading branch information
@d-a-v
d-a-v committed Jul 24, 2019
commit 3c6b4814520d118acf55d59bde75cbdd4701ce2d
1 change: 1 addition & 0 deletions cores/esp8266/AddrList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ struct netifWrapper
const char* ifmac () const { return (const char*)_netif->hwaddr; }
int ifnumber () const { return _netif->num; }
bool ifUp () const { return !!(_netif->flags & NETIF_FLAG_UP); }
const netif* interface () const { return _netif; }

const ip_addr_t* ipFromNetifNum () const
{
Expand Down
6 changes: 3 additions & 3 deletions libraries/ESP8266mDNS/src/LEAmDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ MDNSResponder::MDNSResponder(void)
m_pServiceQueries(0),
m_fnServiceTxtCallback(0),
#ifdef ENABLE_ESP_MDNS_RESPONDER_PASSIV_MODE
m_bPassivModeEnabled(true) {
m_bPassivModeEnabled(true),
#else
m_bPassivModeEnabled(false) {
m_bPassivModeEnabled(false),
#endif

m_netif(nullptr) {
}

/*
Expand Down
1 change: 1 addition & 0 deletions libraries/ESP8266mDNS/src/LEAmDNS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,7 @@ class MDNSResponder {
bool m_bPassivModeEnabled;
stcProbeInformation m_HostProbeInformation;
IPAddress m_IPAddress;
const netif* m_netif; // network interface associated to m_IPAddress

/** CONTROL **/
/* MAINTENANCE */
Expand Down
9 changes: 6 additions & 3 deletions libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
*
*/

#include <arch/cc.h>
#include <sys/time.h>
#include <IPAddress.h>
#include <AddrList.h>
Expand Down Expand Up @@ -79,8 +78,10 @@ bool MDNSResponder::_process(bool p_bUserContext) {
}
}
else {
bResult = _updateProbeStatus() && // Probing
_checkServiceQueryCache(); // Service query cache check
bResult = (m_netif != nullptr) &&
(m_netif->flags & NETIF_FLAG_UP) && // network interface is up and running
_updateProbeStatus() && // Probing
_checkServiceQueryCache(); // Service query cache check
}
return bResult;
}
Expand Down Expand Up @@ -122,10 +123,12 @@ bool MDNSResponder::_restart(void) {

// check existence of this IP address in the interface list
bool found = false;
m_netif = nullptr;
for (auto a: addrList)
if (m_IPAddress == a.addr()) {
if (a.ifUp()) {
found = true;
m_netif = a.interface();
break;
}
DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] found interface for IP '%s' but it is not UP\n"), m_IPAddress.toString().c_str()););
Expand Down