3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-14 09:48:01 +08:00
Code Issues Projects Releases Wiki Activity

Remove unneeded defines that break vc2015 build

Browse Source
This commit is contained in:
cpq 2020-12-18 09:48:28 +00:00
parent 0abb8322d9
commit d3ebcaf5d2
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mongoose.c
View File

@ -197,30 +197,29 @@ static size_t mg_dns_parse_name(const uint8_t *s, const uint8_t *e, size_t off,
int mg_dns_parse(const uint8_t *buf, size_t len, struct mg_dns_message *dm) {
struct mg_dns_header *h = (struct mg_dns_header *) buf;
const uint8_t *s = buf + sizeof(*h), *e = &buf[len];
size_t i, j = 0, n, ok = 0;
if (len < sizeof(*h)) return ok; // Too small, headers dont fit
if (len > 512) return ok; // Too large, we don't expect that
size_t i, j = 0, n;
if (len < sizeof(*h)) return 0; // Too small, headers dont fit
if (len > 512) return 0; // Too large, we don't expect that
if (mg_ntohs(h->num_questions) > 2) return 0; // Sanity
if (mg_ntohs(h->num_answers) > 5) return 0; // Sanity
for (i = 0; i < mg_ntohs(h->num_questions); i++) {
j += mg_dns_parse_name(s, e, j, dm->name, sizeof(dm->name), 0) + 5;
LOG(LL_INFO, ("QUE %zu %zu [%s]", i, j, dm->name));
// LOG(LL_INFO, ("QUE %zu %zu [%s]", i, j, dm->name));
}
for (i = 0; i < mg_ntohs(h->num_answers); i++) {
j += mg_dns_parse_name(s, e, j, dm->name, sizeof(dm->name), 0) + 9;
LOG(LL_DEBUG, ("NAME %s", dm->name));
// LOG(LL_DEBUG, ("NAME %s", dm->name));
if (&s[j] + 2 > e) break;
n = ((int) s[j] << 8) | s[j + 1];
if (&s[j] + 2 + n > e) break;
if (n == 4) {
dm->txnid = mg_ntohs(h->transaction_id);
memcpy(&dm->ipaddr, &s[j + 2], 4);
ok = 1;
break;
return 1; // Return success
}
j += 2 + n;
}
return ok;
return 0;
}
static void dns_cb(struct mg_connection *c, int ev, void *ev_data,

2
mongoose.h
View File

@ -256,11 +256,9 @@ enum { false = 0, true = 1 };
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strdup(x) _strdup(x)
#define sleep(x) Sleep((x) *1000)
typedef int socklen_t;
#define PATH_MAX MAX_PATH
#define MG_DIRSEP '\\'
#define inline __inline
#ifndef EINPROGRESS
#define EINPROGRESS WSAEINPROGRESS
#endif

2
src/arch_win32.h
View File

@ -20,11 +20,9 @@ enum { false = 0, true = 1 };
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strdup(x) _strdup(x)
#define sleep(x) Sleep((x) *1000)
typedef int socklen_t;
#define PATH_MAX MAX_PATH
#define MG_DIRSEP '\\'
#define inline __inline
#ifndef EINPROGRESS
#define EINPROGRESS WSAEINPROGRESS
#endif