Skip to content

ESP8266mDNS: Fix flushing answers when there is no query response. #3878

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

Closed
wants to merge 2 commits into from
Closed

ESP8266mDNS: Fix flushing answers when there is no query response. #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb1ef35
ESP8266mDNS: Fix flushing answers when there is no query resopense.
joernweissenborn Nov 24, 2017
775022c
ESP8266MDNS: Removed `_newQuery` from header
joernweissenborn Nov 24, 2017
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
26 changes: 11 additions & 15 deletions libraries/ESP8266mDNS/ESP8266mDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ MDNSResponder::MDNSResponder() : _conn(0) {
_instanceName = "";
_answers = 0;
_query = 0;
_newQuery = false;
_waitingForAnswers = false;
}
MDNSResponder::~MDNSResponder() {
Expand Down Expand Up @@ -285,6 +284,17 @@ int MDNSResponder::queryService(char *service, char *proto) {
#ifdef DEBUG_ESP_MDNS_TX
DEBUG_ESP_PORT.printf("queryService %s %s\n", service, proto);
#endif

// Clear answer list
MDNSAnswer *answer;
int numAnswers = _getNumAnswers();
for (int n = numAnswers - 1; n >= 0; n--) {
answer = _getAnswerFromIdx(n);
os_free(answer->hostname);
os_free(answer);
answer = 0;
}
_answers = 0;

if (_query != 0) {
os_free(_query);
Expand All @@ -293,7 +303,6 @@ int MDNSResponder::queryService(char *service, char *proto) {
_query = (struct MDNSQuery*)(os_malloc(sizeof(struct MDNSQuery)));
os_strcpy(_query->_service, service);
os_strcpy(_query->_proto, proto);
_newQuery = true;

char underscore[] = "_";

Expand Down Expand Up @@ -523,19 +532,6 @@ void MDNSResponder::_parsePacket(){

answerHostName[0] = '\0';

// Clear answer list
if (_newQuery) {
int oldAnswers = _getNumAnswers();
for (int n = oldAnswers - 1; n >= 0; n--) {
answer = _getAnswerFromIdx(n);
os_free(answer->hostname);
os_free(answer);
answer = 0;
}
_answers = 0;
_newQuery = false;
}

while (numAnswers--) {
// Read name
stringsRead = 0;
Expand Down
1 change: 0 additions & 1 deletion libraries/ESP8266mDNS/ESP8266mDNS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ class MDNSResponder {
String _instanceName;
struct MDNSAnswer * _answers;
struct MDNSQuery * _query;
bool _newQuery;
bool _waitingForAnswers;
WiFiEventHandler _disconnectedHandler;
WiFiEventHandler _gotIPHandler;
Expand Down