diff --git a/examples/arduino_restful_client/arduino_restful_client.ino b/examples/arduino_restful_client/arduino_restful_client.ino
index 3f964e58e1d616c96b312bb26c4a9e3200689510..3169eee5e9b3649540ae0a2284e9f35f0c553c44 100644
--- a/examples/arduino_restful_client/arduino_restful_client.ino
+++ b/examples/arduino_restful_client/arduino_restful_client.ino
@@ -61,7 +61,7 @@ static uint8_t board_ip[] = {192, 168, 10, 177};
#ifdef WIFI_CC3000
static uint8_t subnet_mask[] = {255, 255, 255, 0};
static uint8_t gateway[] = {192, 168, 10, 254};
-static uint8_t dmg_ip[] = {192, 168, 10, 254};
+static uint8_t dns_ip[] = {192, 168, 10, 254};
static const char *wlan_ssid = "mynetwork";
static const char *wlan_pwd = "mypassword";
@@ -117,7 +117,7 @@ void setup()
avr_netinit(board_mac, board_ip);
#elif defined(WIFI_CC3000)
if (avr_netinit(wlan_ssid, wlan_pwd, wlan_security, IP2U32(board_ip),
- IP2U32(subnet_mask), IP2U32(gateway), IP2U32(dmg_ip)) != 0) {
+ IP2U32(subnet_mask), IP2U32(gateway), IP2U32(dns_ip)) != 0) {
Serial.println("Initialization error, check network settings");
return;
};
diff --git a/examples/arduino_restful_server/arduino_restful_server.ino b/examples/arduino_restful_server/arduino_restful_server.ino
index f45ed18ead81fd415b8e749650e6d7d2aed8f3d5..05301352bc2b5220fa8675a25c15d7112a860b32 100644
--- a/examples/arduino_restful_server/arduino_restful_server.ino
+++ b/examples/arduino_restful_server/arduino_restful_server.ino
@@ -59,7 +59,7 @@ static uint8_t board_ip[] = {192, 168, 10, 8};
#ifdef WIFI_CC3000
static uint8_t subnet_mask[] = {255, 255, 255, 0};
static uint8_t gateway[] = {192, 168, 10, 254};
-static uint8_t dmg_ip[] = {192, 168, 10, 254};
+static uint8_t dns_ip[] = {192, 168, 10, 254};
static const char *wlan_ssid = "mynetwork";
static const char *wlan_pwd = "mypassword";
@@ -116,7 +116,7 @@ void setup() {
avr_netinit(board_mac, board_ip);
#elif defined(WIFI_CC3000)
if (avr_netinit(wlan_ssid, wlan_pwd, wlan_security, IP2U32(board_ip),
- IP2U32(subnet_mask), IP2U32(gateway), IP2U32(dmg_ip)) != 0) {
+ IP2U32(subnet_mask), IP2U32(gateway), IP2U32(dns_ip)) != 0) {
Serial.println("Initialization error, check network settings");
return;
};
diff --git a/examples/captive_dns_server/captive_dns_server.c b/examples/captive_dns_server/captive_dns_server.c
index 0fda50a8866b343805fe95da81bcf5304b69e6e6..fa698417fab37857ece3358b283b3134664fc49e 100644
--- a/examples/captive_dns_server/captive_dns_server.c
+++ b/examples/captive_dns_server/captive_dns_server.c
@@ -17,20 +17,20 @@ static in_addr_t s_our_ip_addr;
static const char *s_listening_addr = "udp://:5533";
static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
- struct mg_dmg_message *msg;
- struct mg_dmg_resource_record *rr;
- struct mg_dmg_reply reply;
+ struct mg_dns_message *msg;
+ struct mg_dns_resource_record *rr;
+ struct mg_dns_reply reply;
int i;
switch (ev) {
case MG_DNS_MESSAGE:
- msg = (struct mg_dmg_message *) ev_data;
- reply = mg_dmg_create_reply(&nc->send_mbuf, msg);
+ msg = (struct mg_dns_message *) ev_data;
+ reply = mg_dns_create_reply(&nc->send_mbuf, msg);
for (i = 0; i < msg->num_questions; i++) {
rr = &msg->questions[i];
if (rr->rtype == MG_DNS_A_RECORD) {
- mg_dmg_reply_record(&reply, rr, NULL, rr->rtype, 3600,
+ mg_dns_reply_record(&reply, rr, NULL, rr->rtype, 3600,
&s_our_ip_addr, 4);
}
}
@@ -42,7 +42,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
* See http://goo.gl/QWvufr for a distinction between NXDOMAIN and NODATA.
*/
- mg_dmg_send_reply(nc, &reply);
+ mg_dns_send_reply(nc, &reply);
break;
}
}
diff --git a/mongoose.c b/mongoose.c
index 1bada6c92629b241ad55d9ec97998cde330c4eb1..b9c391e311433b5501cd0bdffc898f7f9bb7e19d 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3018,7 +3018,7 @@ MG_INTERNAL struct mg_connection *mg_finish_connect(struct mg_connection *nc,
* either failure (and dealloc the connection)
* or success (and proceed with connect()
*/
-static void resolve_cb(struct mg_dmg_message *msg, void *data) {
+static void resolve_cb(struct mg_dns_message *msg, void *data) {
struct mg_connection *nc = (struct mg_connection *) data;
int i;
int failure = -1;
@@ -3034,7 +3034,7 @@ static void resolve_cb(struct mg_dmg_message *msg, void *data) {
* Async resolver guarantees that there is at least one answer.
* TODO(lsm): handle IPv6 answers too
*/
- mg_dmg_parse_record_data(msg, &msg->answers[i], &nc->sa.sin.sin_addr,
+ mg_dns_parse_record_data(msg, &msg->answers[i], &nc->sa.sin.sin_addr,
4);
/* Make mg_finish_connect() trigger MG_EV_CONNECT on failure */
nc->flags |= MG_F_CONNECTING;
@@ -6911,9 +6911,9 @@ struct mg_mqtt_session *mg_mqtt_next(struct mg_mqtt_broker *brk,
#define MAX_DNS_PACKET_LEN 2048
-static int mg_dmg_tid = 0xa0;
+static int mg_dns_tid = 0xa0;
-struct mg_dmg_header {
+struct mg_dns_header {
uint16_t transaction_id;
uint16_t flags;
uint16_t num_questions;
@@ -6922,10 +6922,10 @@ struct mg_dmg_header {
uint16_t num_other_prs;
};
-struct mg_dmg_resource_record *mg_dmg_next_record(
- struct mg_dmg_message *msg, int query,
- struct mg_dmg_resource_record *prev) {
- struct mg_dmg_resource_record *rr;
+struct mg_dns_resource_record *mg_dns_next_record(
+ struct mg_dns_message *msg, int query,
+ struct mg_dns_resource_record *prev) {
+ struct mg_dns_resource_record *rr;
for (rr = (prev == NULL ? msg->answers : prev + 1);
rr - msg->answers < msg->num_answers; rr++) {
@@ -6936,8 +6936,8 @@ struct mg_dmg_resource_record *mg_dmg_next_record(
return NULL;
}
-int mg_dmg_parse_record_data(struct mg_dmg_message *msg,
- struct mg_dmg_resource_record *rr, void *data,
+int mg_dns_parse_record_data(struct mg_dns_message *msg,
+ struct mg_dns_resource_record *rr, void *data,
size_t data_len) {
switch (rr->rtype) {
case MG_DNS_A_RECORD:
@@ -6958,16 +6958,16 @@ int mg_dmg_parse_record_data(struct mg_dmg_message *msg,
return 0;
#endif
case MG_DNS_CNAME_RECORD:
- mg_dmg_uncompress_name(msg, &rr->rdata, (char *) data, data_len);
+ mg_dns_uncompress_name(msg, &rr->rdata, (char *) data, data_len);
return 0;
}
return -1;
}
-int mg_dmg_insert_header(struct mbuf *io, size_t pos,
- struct mg_dmg_message *msg) {
- struct mg_dmg_header header;
+int mg_dns_insert_header(struct mbuf *io, size_t pos,
+ struct mg_dns_message *msg) {
+ struct mg_dns_header header;
memset(&header, 0, sizeof(header));
header.transaction_id = msg->transaction_id;
@@ -6978,12 +6978,12 @@ int mg_dmg_insert_header(struct mbuf *io, size_t pos,
return mbuf_insert(io, pos, &header, sizeof(header));
}
-int mg_dmg_copy_body(struct mbuf *io, struct mg_dmg_message *msg) {
- return mbuf_append(io, msg->pkt.p + sizeof(struct mg_dmg_header),
- msg->pkt.len - sizeof(struct mg_dmg_header));
+int mg_dns_copy_body(struct mbuf *io, struct mg_dns_message *msg) {
+ return mbuf_append(io, msg->pkt.p + sizeof(struct mg_dns_header),
+ msg->pkt.len - sizeof(struct mg_dns_header));
}
-static int mg_dmg_encode_name(struct mbuf *io, const char *name, size_t len) {
+static int mg_dns_encode_name(struct mbuf *io, const char *name, size_t len) {
const char *s;
unsigned char n;
size_t pos = io->len;
@@ -7012,7 +7012,7 @@ static int mg_dmg_encode_name(struct mbuf *io, const char *name, size_t len) {
return io->len - pos;
}
-int mg_dmg_encode_record(struct mbuf *io, struct mg_dmg_resource_record *rr,
+int mg_dns_encode_record(struct mbuf *io, struct mg_dns_resource_record *rr,
const char *name, size_t nlen, const void *rdata,
size_t rlen) {
size_t pos = io->len;
@@ -7023,7 +7023,7 @@ int mg_dmg_encode_record(struct mbuf *io, struct mg_dmg_resource_record *rr,
return -1; /* LCOV_EXCL_LINE */
}
- if (mg_dmg_encode_name(io, name, nlen) == -1) {
+ if (mg_dns_encode_name(io, name, nlen) == -1) {
return -1;
}
@@ -7041,7 +7041,7 @@ int mg_dmg_encode_record(struct mbuf *io, struct mg_dmg_resource_record *rr,
/* fill size after encoding */
size_t off = io->len;
mbuf_append(io, &u16, 2);
- if ((clen = mg_dmg_encode_name(io, (const char *) rdata, rlen)) == -1) {
+ if ((clen = mg_dns_encode_name(io, (const char *) rdata, rlen)) == -1) {
return -1;
}
u16 = clen;
@@ -7057,28 +7057,28 @@ int mg_dmg_encode_record(struct mbuf *io, struct mg_dmg_resource_record *rr,
return io->len - pos;
}
-void mg_send_dmg_query(struct mg_connection *nc, const char *name,
+void mg_send_dns_query(struct mg_connection *nc, const char *name,
int query_type) {
- struct mg_dmg_message *msg =
- (struct mg_dmg_message *) MG_CALLOC(1, sizeof(*msg));
+ struct mg_dns_message *msg =
+ (struct mg_dns_message *) MG_CALLOC(1, sizeof(*msg));
struct mbuf pkt;
- struct mg_dmg_resource_record *rr = &msg->questions[0];
+ struct mg_dns_resource_record *rr = &msg->questions[0];
DBG(("%s %d", name, query_type));
mbuf_init(&pkt, MAX_DNS_PACKET_LEN);
- msg->transaction_id = ++mg_dmg_tid;
+ msg->transaction_id = ++mg_dns_tid;
msg->flags = 0x100;
msg->num_questions = 1;
- mg_dmg_insert_header(&pkt, 0, msg);
+ mg_dns_insert_header(&pkt, 0, msg);
rr->rtype = query_type;
rr->rclass = 1; /* Class: inet */
rr->kind = MG_DNS_QUESTION;
- if (mg_dmg_encode_record(&pkt, rr, name, strlen(name), NULL, 0) == -1) {
+ if (mg_dns_encode_record(&pkt, rr, name, strlen(name), NULL, 0) == -1) {
/* TODO(mkm): return an error code */
goto cleanup; /* LCOV_EXCL_LINE */
}
@@ -7096,8 +7096,8 @@ cleanup:
MG_FREE(msg);
}
-static unsigned char *mg_parse_dmg_resource_record(
- unsigned char *data, unsigned char *end, struct mg_dmg_resource_record *rr,
+static unsigned char *mg_parse_dns_resource_record(
+ unsigned char *data, unsigned char *end, struct mg_dns_resource_record *rr,
int reply) {
unsigned char *name = data;
int chunk_len, data_len;
@@ -7144,8 +7144,8 @@ static unsigned char *mg_parse_dmg_resource_record(
return data;
}
-int mg_parse_dns(const char *buf, int len, struct mg_dmg_message *msg) {
- struct mg_dmg_header *header = (struct mg_dmg_header *) buf;
+int mg_parse_dns(const char *buf, int len, struct mg_dns_message *msg) {
+ struct mg_dns_header *header = (struct mg_dns_header *) buf;
unsigned char *data = (unsigned char *) buf + sizeof(*header);
unsigned char *end = (unsigned char *) buf + len;
int i;
@@ -7163,17 +7163,17 @@ int mg_parse_dns(const char *buf, int len, struct mg_dmg_message *msg) {
for (i = 0; i < msg->num_questions && i < (int) ARRAY_SIZE(msg->questions);
i++) {
- data = mg_parse_dmg_resource_record(data, end, &msg->questions[i], 0);
+ data = mg_parse_dns_resource_record(data, end, &msg->questions[i], 0);
}
for (i = 0; i < msg->num_answers && i < (int) ARRAY_SIZE(msg->answers); i++) {
- data = mg_parse_dmg_resource_record(data, end, &msg->answers[i], 1);
+ data = mg_parse_dns_resource_record(data, end, &msg->answers[i], 1);
}
return 0;
}
-size_t mg_dmg_uncompress_name(struct mg_dmg_message *msg, struct mg_str *name,
+size_t mg_dns_uncompress_name(struct mg_dns_message *msg, struct mg_str *name,
char *dst, int dst_len) {
int chunk_len;
char *old_dst = dst;
@@ -7222,9 +7222,9 @@ size_t mg_dmg_uncompress_name(struct mg_dmg_message *msg, struct mg_str *name,
return dst - old_dst;
}
-static void dmg_handler(struct mg_connection *nc, int ev, void *ev_data) {
+static void dns_handler(struct mg_connection *nc, int ev, void *ev_data) {
struct mbuf *io = &nc->recv_mbuf;
- struct mg_dmg_message msg;
+ struct mg_dns_message msg;
/* Pass low-level events to the user handler */
nc->handler(nc, ev, ev_data);
@@ -7238,7 +7238,7 @@ static void dmg_handler(struct mg_connection *nc, int ev, void *ev_data) {
/* reply + recursion allowed + format error */
memset(&msg, 0, sizeof(msg));
msg.flags = 0x8081;
- mg_dmg_insert_header(io, 0, &msg);
+ mg_dns_insert_header(io, 0, &msg);
if (!(nc->flags & MG_F_UDP)) {
uint16_t len = htons(io->len);
mbuf_insert(io, 0, &len, 2);
@@ -7254,7 +7254,7 @@ static void dmg_handler(struct mg_connection *nc, int ev, void *ev_data) {
}
void mg_set_protocol_dns(struct mg_connection *nc) {
- nc->proto_handler = dmg_handler;
+ nc->proto_handler = dns_handler;
}
#endif /* MG_DISABLE_DNS */
@@ -7271,24 +7271,24 @@ void mg_set_protocol_dns(struct mg_connection *nc) {
/* Amalgamated: #include "internal.h" */
-struct mg_dmg_reply mg_dmg_create_reply(struct mbuf *io,
- struct mg_dmg_message *msg) {
- struct mg_dmg_reply rep;
+struct mg_dns_reply mg_dns_create_reply(struct mbuf *io,
+ struct mg_dns_message *msg) {
+ struct mg_dns_reply rep;
rep.msg = msg;
rep.io = io;
rep.start = io->len;
/* reply + recursion allowed */
msg->flags |= 0x8080;
- mg_dmg_copy_body(io, msg);
+ mg_dns_copy_body(io, msg);
msg->num_answers = 0;
return rep;
}
-int mg_dmg_send_reply(struct mg_connection *nc, struct mg_dmg_reply *r) {
+int mg_dns_send_reply(struct mg_connection *nc, struct mg_dns_reply *r) {
size_t sent = r->io->len - r->start;
- mg_dmg_insert_header(r->io, r->start, r->msg);
+ mg_dns_insert_header(r->io, r->start, r->msg);
if (!(nc->flags & MG_F_UDP)) {
uint16_t len = htons(sent);
mbuf_insert(r->io, r->start, &len, 2);
@@ -7301,13 +7301,13 @@ int mg_dmg_send_reply(struct mg_connection *nc, struct mg_dmg_reply *r) {
return sent;
}
-int mg_dmg_reply_record(struct mg_dmg_reply *reply,
- struct mg_dmg_resource_record *question,
+int mg_dns_reply_record(struct mg_dns_reply *reply,
+ struct mg_dns_resource_record *question,
const char *name, int rtype, int ttl, const void *rdata,
size_t rdata_len) {
- struct mg_dmg_message *msg = (struct mg_dmg_message *) reply->msg;
+ struct mg_dns_message *msg = (struct mg_dns_message *) reply->msg;
char rname[512];
- struct mg_dmg_resource_record *ans = &msg->answers[msg->num_answers];
+ struct mg_dns_resource_record *ans = &msg->answers[msg->num_answers];
if (msg->num_answers >= MG_MAX_DNS_ANSWERS) {
return -1; /* LCOV_EXCL_LINE */
}
@@ -7315,7 +7315,7 @@ int mg_dmg_reply_record(struct mg_dmg_reply *reply,
if (name == NULL) {
name = rname;
rname[511] = 0;
- mg_dmg_uncompress_name(msg, &question->name, rname, sizeof(rname) - 1);
+ mg_dns_uncompress_name(msg, &question->name, rname, sizeof(rname) - 1);
}
*ans = *question;
@@ -7323,7 +7323,7 @@ int mg_dmg_reply_record(struct mg_dmg_reply *reply,
ans->rtype = rtype;
ans->ttl = ttl;
- if (mg_dmg_encode_record(reply->io, ans, name, strlen(name), rdata,
+ if (mg_dns_encode_record(reply->io, ans, name, strlen(name), rdata,
rdata_len) == -1) {
return -1; /* LCOV_EXCL_LINE */
};
@@ -7350,9 +7350,9 @@ int mg_dmg_reply_record(struct mg_dmg_reply *reply,
#define MG_DEFAULT_NAMESERVER "8.8.8.8"
#endif
-static const char *mg_default_dmg_server = "udp://" MG_DEFAULT_NAMESERVER ":53";
+static const char *mg_default_dns_server = "udp://" MG_DEFAULT_NAMESERVER ":53";
-MG_INTERNAL char mg_dmg_server[256];
+MG_INTERNAL char mg_dns_server[256];
struct mg_resolve_async_request {
char name[1024];
@@ -7435,7 +7435,7 @@ static int mg_get_ip_address_of_nameserver(char *name, size_t name_len) {
(void) fclose(fp);
}
#else
- snprintf(name, name_len, "%s", mg_default_dmg_server);
+ snprintf(name, name_len, "%s", mg_default_dns_server);
#endif /* _WIN32 */
return ret;
@@ -7480,7 +7480,7 @@ int mg_resolve_from_hosts_file(const char *name, union socket_address *usa) {
static void mg_resolve_async_eh(struct mg_connection *nc, int ev, void *data) {
time_t now = time(NULL);
struct mg_resolve_async_request *req;
- struct mg_dmg_message *msg;
+ struct mg_dns_message *msg;
DBG(("ev=%d", ev));
@@ -7496,13 +7496,13 @@ static void mg_resolve_async_eh(struct mg_connection *nc, int ev, void *data) {
break;
}
if (now - req->last_time > req->timeout) {
- mg_send_dmg_query(nc, req->name, req->query);
+ mg_send_dns_query(nc, req->name, req->query);
req->last_time = now;
req->retries++;
}
break;
case MG_EV_RECV:
- msg = (struct mg_dmg_message *) MG_MALLOC(sizeof(*msg));
+ msg = (struct mg_dns_message *) MG_MALLOC(sizeof(*msg));
if (mg_parse_dns(nc->recv_mbuf.buf, *(int *) data, msg) == 0 &&
msg->num_answers > 0) {
req->callback(msg, req->data);
@@ -7526,7 +7526,7 @@ int mg_resolve_async_opt(struct mg_mgr *mgr, const char *name, int query,
mg_resolve_callback_t cb, void *data,
struct mg_resolve_async_opts opts) {
struct mg_resolve_async_request *req;
- struct mg_connection *dmg_nc;
+ struct mg_connection *dns_nc;
const char *nameserver = opts.nameserver_url;
DBG(("%s %d", name, query));
@@ -7546,22 +7546,22 @@ int mg_resolve_async_opt(struct mg_mgr *mgr, const char *name, int query,
req->timeout = opts.timeout ? opts.timeout : 5;
/* Lazily initialize dns server */
- if (nameserver == NULL && mg_dmg_server[0] == '\0' &&
- mg_get_ip_address_of_nameserver(mg_dmg_server, sizeof(mg_dmg_server)) ==
+ if (nameserver == NULL && mg_dns_server[0] == '\0' &&
+ mg_get_ip_address_of_nameserver(mg_dns_server, sizeof(mg_dns_server)) ==
-1) {
- strncpy(mg_dmg_server, mg_default_dmg_server, sizeof(mg_dmg_server));
+ strncpy(mg_dns_server, mg_default_dns_server, sizeof(mg_dns_server));
}
if (nameserver == NULL) {
- nameserver = mg_dmg_server;
+ nameserver = mg_dns_server;
}
- dmg_nc = mg_connect(mgr, nameserver, mg_resolve_async_eh);
- if (dmg_nc == NULL) {
+ dns_nc = mg_connect(mgr, nameserver, mg_resolve_async_eh);
+ if (dns_nc == NULL) {
free(req);
return -1;
}
- dmg_nc->user_data = req;
+ dns_nc->user_data = req;
return 0;
}
diff --git a/mongoose.h b/mongoose.h
index 43d6079672250aacc0780f97b3de40d3a78fc88a..c47eabc5cea41566398700f28c9bbd0b87f1e7c0 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -2139,35 +2139,35 @@ extern "C" {
#define MG_DNS_MESSAGE 100 /* High-level DNS message event */
-enum mg_dmg_resource_record_kind {
+enum mg_dns_resource_record_kind {
MG_DNS_INVALID_RECORD = 0,
MG_DNS_QUESTION,
MG_DNS_ANSWER
};
/* DNS resource record. */
-struct mg_dmg_resource_record {
+struct mg_dns_resource_record {
struct mg_str name; /* buffer with compressed name */
int rtype;
int rclass;
int ttl;
- enum mg_dmg_resource_record_kind kind;
+ enum mg_dns_resource_record_kind kind;
struct mg_str rdata; /* protocol data (can be a compressed name) */
};
/* DNS message (request and response). */
-struct mg_dmg_message {
+struct mg_dns_message {
struct mg_str pkt; /* packet body */
uint16_t flags;
uint16_t transaction_id;
int num_questions;
int num_answers;
- struct mg_dmg_resource_record questions[MG_MAX_DNS_QUESTIONS];
- struct mg_dmg_resource_record answers[MG_MAX_DNS_ANSWERS];
+ struct mg_dns_resource_record questions[MG_MAX_DNS_QUESTIONS];
+ struct mg_dns_resource_record answers[MG_MAX_DNS_ANSWERS];
};
-struct mg_dmg_resource_record *mg_dmg_next_record(
- struct mg_dmg_message *, int, struct mg_dmg_resource_record *);
+struct mg_dns_resource_record *mg_dns_next_record(
+ struct mg_dns_message *, int, struct mg_dns_resource_record *);
/*
* Parse the record data from a DNS resource record.
@@ -2180,20 +2180,20 @@ struct mg_dmg_resource_record *mg_dmg_next_record(
*
* TODO(mkm): MX
*/
-int mg_dmg_parse_record_data(struct mg_dmg_message *,
- struct mg_dmg_resource_record *, void *, size_t);
+int mg_dns_parse_record_data(struct mg_dns_message *,
+ struct mg_dns_resource_record *, void *, size_t);
/*
* Send a DNS query to the remote end.
*/
-void mg_send_dmg_query(struct mg_connection *, const char *, int);
+void mg_send_dns_query(struct mg_connection *, const char *, int);
/*
* Insert a DNS header to an IO buffer.
*
* Return number of bytes inserted.
*/
-int mg_dmg_insert_header(struct mbuf *, size_t, struct mg_dmg_message *);
+int mg_dns_insert_header(struct mbuf *, size_t, struct mg_dns_message *);
/*
* Append already encoded body from an existing message.
@@ -2203,7 +2203,7 @@ int mg_dmg_insert_header(struct mbuf *, size_t, struct mg_dmg_message *);
*
* Return number of appened bytes.
*/
-int mg_dmg_copy_body(struct mbuf *, struct mg_dmg_message *);
+int mg_dns_copy_body(struct mbuf *, struct mg_dns_message *);
/*
* Encode and append a DNS resource record to an IO buffer.
@@ -2221,11 +2221,11 @@ int mg_dmg_copy_body(struct mbuf *, struct mg_dmg_message *);
*
* Return the number of bytes appened or -1 in case of error.
*/
-int mg_dmg_encode_record(struct mbuf *, struct mg_dmg_resource_record *,
+int mg_dns_encode_record(struct mbuf *, struct mg_dns_resource_record *,
const char *, size_t, const void *, size_t);
/* Low-level: parses a DNS response. */
-int mg_parse_dns(const char *, int, struct mg_dmg_message *);
+int mg_parse_dns(const char *, int, struct mg_dns_message *);
/*
* Uncompress a DNS compressed name.
@@ -2240,7 +2240,7 @@ int mg_parse_dns(const char *, int, struct mg_dmg_message *);
* If `dst_len` is 0 `dst` can be NULL.
* Return the uncompressed name length.
*/
-size_t mg_dmg_uncompress_name(struct mg_dmg_message *, struct mg_str *, char *,
+size_t mg_dns_uncompress_name(struct mg_dns_message *, struct mg_str *, char *,
int);
/*
@@ -2249,10 +2249,10 @@ size_t mg_dmg_uncompress_name(struct mg_dmg_message *, struct mg_str *, char *,
* DNS event handler parses incoming UDP packets, treating them as DNS
* requests. If incoming packet gets successfully parsed by the DNS event
* handler, a user event handler will receive `MG_DNS_REQUEST` event, with
- * `ev_data` pointing to the parsed `struct mg_dmg_message`.
+ * `ev_data` pointing to the parsed `struct mg_dns_message`.
*
* See
- * https://github.com/cesanta/mongoose/tree/master/examples/captive_dmg_server[captive_dmg_server]
+ * https://github.com/cesanta/mongoose/tree/master/examples/captive_dns_server[captive_dns_server]
* example on how to handle DNS request and send DNS reply.
*/
void mg_set_protocol_dns(struct mg_connection *);
@@ -2284,8 +2284,8 @@ extern "C" {
#define MG_DNS_SERVER_DEFAULT_TTL 3600
-struct mg_dmg_reply {
- struct mg_dmg_message *msg;
+struct mg_dns_reply {
+ struct mg_dns_message *msg;
struct mbuf *io;
size_t start;
};
@@ -2298,10 +2298,10 @@ struct mg_dmg_reply {
* "reply + recursion allowed" will be added to the message flags and
* message's num_answers will be set to 0.
*
- * Answer records can be appended with `mg_dmg_send_reply` or by lower
+ * Answer records can be appended with `mg_dns_send_reply` or by lower
* level function defined in the DNS API.
*
- * In order to send the reply use `mg_dmg_send_reply`.
+ * In order to send the reply use `mg_dns_send_reply`.
* It's possible to use a connection's send buffer as reply buffers,
* and it will work for both UDP and TCP connections.
*
@@ -2309,17 +2309,17 @@ struct mg_dmg_reply {
*
* [source,c]
* -----
- * reply = mg_dmg_create_reply(&nc->send_mbuf, msg);
+ * reply = mg_dns_create_reply(&nc->send_mbuf, msg);
* for (i = 0; i < msg->num_questions; i++) {
* rr = &msg->questions[i];
* if (rr->rtype == MG_DNS_A_RECORD) {
- * mg_dmg_reply_record(&reply, rr, 3600, &dummy_ip_addr, 4);
+ * mg_dns_reply_record(&reply, rr, 3600, &dummy_ip_addr, 4);
* }
* }
- * mg_dmg_send_reply(nc, &reply);
+ * mg_dns_send_reply(nc, &reply);
* -----
*/
-struct mg_dmg_reply mg_dmg_create_reply(struct mbuf *, struct mg_dmg_message *);
+struct mg_dns_reply mg_dns_create_reply(struct mbuf *, struct mg_dns_message *);
/*
* Append a DNS reply record to the IO buffer and to the DNS message.
@@ -2329,7 +2329,7 @@ struct mg_dmg_reply mg_dmg_create_reply(struct mbuf *, struct mg_dmg_message *);
*
* Returns -1 on error.
*/
-int mg_dmg_reply_record(struct mg_dmg_reply *, struct mg_dmg_resource_record *,
+int mg_dns_reply_record(struct mg_dns_reply *, struct mg_dns_resource_record *,
const char *, int, int, const void *, size_t);
/*
@@ -2338,13 +2338,13 @@ int mg_dmg_reply_record(struct mg_dmg_reply *, struct mg_dmg_resource_record *,
* The DNS data is stored in an IO buffer pointed by reply structure in `r`.
* This function mutates the content of that buffer in order to ensure that
* the DNS header reflects size and flags of the mssage, that might have been
- * updated either with `mg_dmg_reply_record` or by direct manipulation of
+ * updated either with `mg_dns_reply_record` or by direct manipulation of
* `r->message`.
*
* Once sent, the IO buffer will be trimmed unless the reply IO buffer
* is the connection's send buffer and the connection is not in UDP mode.
*/
-int mg_dmg_send_reply(struct mg_connection *, struct mg_dmg_reply *);
+int mg_dns_send_reply(struct mg_connection *, struct mg_dns_reply *);
#ifdef __cplusplus
}
@@ -2369,7 +2369,7 @@ int mg_dmg_send_reply(struct mg_connection *, struct mg_dmg_reply *);
extern "C" {
#endif /* __cplusplus */
-typedef void (*mg_resolve_callback_t)(struct mg_dmg_message *, void *);
+typedef void (*mg_resolve_callback_t)(struct mg_dns_message *, void *);
/* Options for `mg_resolve_async_opt`. */
struct mg_resolve_async_opts {
@@ -2395,14 +2395,14 @@ int mg_resolve_async(struct mg_mgr *, const char *, int, mg_resolve_callback_t,
* will receive a NULL `msg`.
*
* The DNS answers can be extracted with `mg_next_record` and
- * `mg_dmg_parse_record_data`:
+ * `mg_dns_parse_record_data`:
*
* [source,c]
* ----
* struct in_addr ina;
- * struct mg_dmg_resource_record *rr = mg_next_record(msg, MG_DNS_A_RECORD,
+ * struct mg_dns_resource_record *rr = mg_next_record(msg, MG_DNS_A_RECORD,
* NULL);
- * mg_dmg_parse_record_data(msg, rr, &ina, sizeof(ina));
+ * mg_dns_parse_record_data(msg, rr, &ina, sizeof(ina));
* ----
*/
int mg_resolve_async_opt(struct mg_mgr *, const char *, int,