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

Conversation

d-a-v
Copy link
Collaborator

@d-a-v d-a-v commented May 9, 2022

No description provided.

libraries/DNSServer/src/DNSServer.cpp Outdated Show resolved Hide resolved
@@ -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

@@ -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
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.

@d-a-v
Copy link
Collaborator Author

d-a-v commented May 10, 2022

With this change:

--- a/libraries/DNSServer/examples/DNSServer/DNSServer.ino
+++ b/libraries/DNSServer/examples/DNSServer/DNSServer.ino
@@ -1,5 +1,5 @@
-#include <ESP8266WiFi.h>
 #include <DNSServer.h>
+#include <ESP8266WiFi.h>
 #include <ESP8266WebServer.h>

This happens:

C++ ...libraries/DNSServer/examples/DNSServer/DNSServer.ino.cpp.o
In file included from ./../../libraries/DNSServer/examples/DNSServer//DNSServer.ino:1,
                 from ...libraries/DNSServer/examples/DNSServer/DNSServer.ino.cpp:1:
../../libraries/DNSServer/src/DNSServer.h:113:10: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
  113 |     std::unique_ptr<DNSS_REQUESTER[]> _que;
      |          ^~~~~~~~~~
../../libraries/DNSServer/src/DNSServer.h:4:1: note: ‘std::unique_ptr’ is defined in header ‘<memory>’; did you forget to ‘#include <memory>’?
    3 | #include <WiFiUdp.h>
  +++ |+#include <memory>
    4 | 

@mcspr mcspr merged commit 8d5dda0 into esp8266:master May 10, 2022
@d-a-v d-a-v deleted the dnserveronhost branch May 10, 2022 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants