Skip to content
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.

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

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

Merged
merged 2 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion libraries/DNSServer/src/DNSServer.cpp
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
2 changes: 2 additions & 0 deletions libraries/DNSServer/src/DNSServer.h
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
3 changes: 3 additions & 0 deletions tests/host/common/MockEsp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@

#include <stdlib.h>

#include <user_interface.h>
struct rst_info resetInfo;

unsigned long long operator"" _kHz(unsigned long long x)
{
return x * 1000;
Expand Down