wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-12 16:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1532 - improve ipv6 DNS lookup

Browse Source
This commit is contained in:
Sergey Lyubka committed 2022-04-22 20:44:53 +01:00
1 parent 93ff3e4d1f
commit a7cbc19755
4 files changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+4 -2
View File
@@ -279,7 +279,8 @@ static void dns_cb(struct mg_connection *c, int ev, void *ev_data,
mg_ntoa(&d->c->rem, buf, sizeof(buf)))); mg_ntoa(&d->c->rem, buf, sizeof(buf))));
mg_connect_resolved(d->c); mg_connect_resolved(d->c);
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
} else if (dm.addr.is_ip6 == false && dm.name[0] != '\0') { } else if (dm.addr.is_ip6 == false && dm.name[0] != '\0' &&
c->mgr->use_dns6 == false) {
struct mg_str x = mg_str(dm.name); struct mg_str x = mg_str(dm.name);
mg_sendnsreq(d->c, &x, c->mgr->dnstimeout, &c->mgr->dns6, true); mg_sendnsreq(d->c, &x, c->mgr->dnstimeout, &c->mgr->dns6, true);
#endif #endif
@@ -374,7 +375,8 @@ void mg_resolve(struct mg_connection *c, const char *url) {
mg_connect_resolved(c); mg_connect_resolved(c);
} else { } else {
// host is not an IP, send DNS resolution request // host is not an IP, send DNS resolution request
mg_sendnsreq(c, &host, c->mgr->dnstimeout, &c->mgr->dns4, false); struct mg_dns *dns = c->mgr->use_dns6 ? &c->mgr->dns6 : &c->mgr->dns4;
mg_sendnsreq(c, &host, c->mgr->dnstimeout, dns, c->mgr->use_dns6);
} }
} }
mongoose.h
+1
View File
@@ -898,6 +898,7 @@ struct mg_mgr {
struct mg_dns dns4; // DNS for IPv4 struct mg_dns dns4; // DNS for IPv4
struct mg_dns dns6; // DNS for IPv6 struct mg_dns dns6; // DNS for IPv6
int dnstimeout; // DNS resolve timeout in milliseconds int dnstimeout; // DNS resolve timeout in milliseconds
bool use_dns6; // Use DNS6 server by default, see #1532
unsigned long nextid; // Next connection ID unsigned long nextid; // Next connection ID
void *userdata; // Arbitrary user data pointer void *userdata; // Arbitrary user data pointer
uint16_t mqtt_id; // MQTT IDs for pub/sub uint16_t mqtt_id; // MQTT IDs for pub/sub
src/dns.c
+4 -2
View File
@@ -167,7 +167,8 @@ static void dns_cb(struct mg_connection *c, int ev, void *ev_data,
mg_ntoa(&d->c->rem, buf, sizeof(buf)))); mg_ntoa(&d->c->rem, buf, sizeof(buf))));
mg_connect_resolved(d->c); mg_connect_resolved(d->c);
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
} else if (dm.addr.is_ip6 == false && dm.name[0] != '\0') { } else if (dm.addr.is_ip6 == false && dm.name[0] != '\0' &&
c->mgr->use_dns6 == false) {
struct mg_str x = mg_str(dm.name); struct mg_str x = mg_str(dm.name);
mg_sendnsreq(d->c, &x, c->mgr->dnstimeout, &c->mgr->dns6, true); mg_sendnsreq(d->c, &x, c->mgr->dnstimeout, &c->mgr->dns6, true);
#endif #endif
@@ -262,6 +263,7 @@ void mg_resolve(struct mg_connection *c, const char *url) {
mg_connect_resolved(c); mg_connect_resolved(c);
} else { } else {
// host is not an IP, send DNS resolution request // host is not an IP, send DNS resolution request
mg_sendnsreq(c, &host, c->mgr->dnstimeout, &c->mgr->dns4, false); struct mg_dns *dns = c->mgr->use_dns6 ? &c->mgr->dns6 : &c->mgr->dns4;
mg_sendnsreq(c, &host, c->mgr->dnstimeout, dns, c->mgr->use_dns6);
} }
} }
src/net.h
+1
View File
@@ -23,6 +23,7 @@ struct mg_mgr {
struct mg_dns dns4; // DNS for IPv4 struct mg_dns dns4; // DNS for IPv4
struct mg_dns dns6; // DNS for IPv6 struct mg_dns dns6; // DNS for IPv6
int dnstimeout; // DNS resolve timeout in milliseconds int dnstimeout; // DNS resolve timeout in milliseconds
bool use_dns6; // Use DNS6 server by default, see #1532
unsigned long nextid; // Next connection ID unsigned long nextid; // Next connection ID
void *userdata; // Arbitrary user data pointer void *userdata; // Arbitrary user data pointer
uint16_t mqtt_id; // MQTT IDs for pub/sub uint16_t mqtt_id; // MQTT IDs for pub/sub