Skip to content

emulation on host: fix for latest changes in dnsserver #8559

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 2 commits into from
May 10, 2022
Merged

emulation on host: fix for latest changes in dnsserver #8559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a02453
emulation on host: fix for latest changes in dnsserver
d-a-v May 9, 2022
34c7879
declare rst_info in emulation world
d-a-v May 10, 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
7 changes: 6 additions & 1 deletion libraries/DNSServer/src/DNSServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "DNSServer.h"
#include <lwip/def.h>
#include <Arduino.h>
#include <memory>

extern struct rst_info resetInfo;

#ifdef DEBUG_ESP_PORT
Expand Down Expand Up @@ -60,10 +60,15 @@ DNSServer::DNSServer()
// They will then report connected.
_ttl = lwip_htonl(60);

#if !CORE_MOCK

if (REASON_DEFAULT_RST == resetInfo.reason ||
REASON_DEEP_SLEEP_AWAKE <= resetInfo.reason) {
_ids = random(0, BIT(16) - 1);
}

#endif // !CORE_MOCK

_ids += kDNSSQueSize; // for the case of restart, ignore any inflight responses

_errorReplyCode = DNSReplyCode::NonExistentDomain;
Expand Down
2 changes: 2 additions & 0 deletions libraries/DNSServer/src/DNSServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#ifndef DNSServer_h
#define DNSServer_h

#include <memory>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

future-proofing, I tried adding DNSServer/examples/DNSServer to host test script, but I see valgrind error in UDP code 🤷
something to note

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

future-proofing, I tried adding DNSServer/examples/DNSServer to host test script, but I see valgrind error in UDP code 🤷
something to note

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a line number to go with that?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also mocking. ~DNSServer -> ~WiFiUDP -> UdpContext.disconnect() tries to delete std::map entry, which may or may not be already destroyed (?).
Not related to the DNSServer, but to the way UDP is organized there.

#include <WiFiUdp.h>

// #define DEBUG_DNSSERVER
Expand Down