jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ESPmDNS compatible to ESP8266mDNS (#1085)

Browse Source 
The ESP8266 version of the mDNS library expected service name and protocol without leading '_' (underscore). The ESP32 version expected service name and protocol with leading '_' (underscore).
This small change makes the ESP32 version compatible with the ESP8266 version and keeps backward compatible with existing code by accepting service name and protocol either with or without leading '_' (underscore).
This commit is contained in:
Bernd Giesecke 2018-03-04 20:50:38 +01:00 committed by Me No Dev
parent 2718d69c19
commit 494ff217aa
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libraries/ESPmDNS/src/ESPmDNS.cpp
View File

@ -59,6 +59,7 @@ bool MDNSResponder::begin(const char* hostName){
} }
WiFi.onEvent(_on_sys_event); WiFi.onEvent(_on_sys_event);
_hostname = hostName; _hostname = hostName;
_hostname.toLowerCase();
if(mdns_hostname_set(hostName)) { if(mdns_hostname_set(hostName)) {
log_e("Failed setting MDNS hostname"); log_e("Failed setting MDNS hostname");
return false; return false;
@ -122,13 +123,39 @@ void MDNSResponder::disableWorkstation(){
} }
void MDNSResponder::addService(char *name, char *proto, uint16_t port){ void MDNSResponder::addService(char *name, char *proto, uint16_t port){
if(mdns_service_add(NULL, name, proto, port, NULL, 0)) { char _name[strlen(name)+2];
char _proto[strlen(proto)+2];
if (name[0] == '_') {
sprintf(_name, "%s", name);
} else {
sprintf(_name, "_%s", name);
}
if (proto[0] == '_') {
sprintf(_proto, "%s", proto);
} else {
sprintf(_proto, "_%s", proto);
}
if(mdns_service_add(NULL, _name, _proto, port, NULL, 0)) {
log_e("Failed adding service %s.%s.\n", name, proto); log_e("Failed adding service %s.%s.\n", name, proto);
} }
} }
bool MDNSResponder::addServiceTxt(char *name, char *proto, char *key, char *value){ bool MDNSResponder::addServiceTxt(char *name, char *proto, char *key, char *value){
if(mdns_service_txt_item_set(name, proto, key, value)) { char _name[strlen(name)+2];
char _proto[strlen(proto)+2];
if (name[0] == '_') {
sprintf(_name, "%s", name);
} else {
sprintf(_name, "_%s", name);
}
if (proto[0] == '_') {
sprintf(_proto, "%s", proto);
} else {
sprintf(_proto, "_%s", proto);
}
if(mdns_service_txt_item_set(_name, _proto, key, value)) {
log_e("Failed setting service TXT"); log_e("Failed setting service TXT");
return false; return false;
} }
@ -165,8 +192,16 @@ int MDNSResponder::queryService(char *service, char *proto) {
char srv[strlen(service)+2]; char srv[strlen(service)+2];
char prt[strlen(proto)+2]; char prt[strlen(proto)+2];
if (service[0] == '_') {
sprintf(srv, "%s", service);
} else {
sprintf(srv, "_%s", service); sprintf(srv, "_%s", service);
}
if (proto[0] == '_') {
sprintf(prt, "%s", proto);
} else {
sprintf(prt, "_%s", proto); sprintf(prt, "_%s", proto);
}
esp_err_t err = mdns_query_ptr(srv, prt, 3000, 20, &results); esp_err_t err = mdns_query_ptr(srv, prt, 3000, 20, &results);
if(err){ if(err){