3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 15:40:23 +08:00
Code Issues Projects Releases Wiki Activity

Fix win98 test

Browse Source
This commit is contained in:
cpq 2020-12-28 06:32:55 +00:00
parent a882aab30e
commit bdef3d6afd
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mongoose.c
View File

@ -204,8 +204,8 @@ size_t mg_dns_parse_rr(const uint8_t *buf, size_t len, size_t ofs,
if (len > 512) return 0; // Too large, we don't expect that if (len > 512) return 0; // Too large, we don't expect that
if (s >= e) return 0; // Overflow if (s >= e) return 0; // Overflow
if ((rr->nlen = mg_dns_parse_name(buf, len, ofs, NULL, 0)) == 0) return 0; if ((rr->nlen = (uint16_t) mg_dns_parse_name(buf, len, ofs, NULL, 0)) == 0)
// LOG(LL_INFO, ("%zu %zu %hu %d", ofs, len, rr->nlen, is_question)); return 0;
s += rr->nlen + 4; s += rr->nlen + 4;
if (s > e) return 0; if (s > e) return 0;
rr->atype = ((uint16_t) s[-4] << 8) | s[-3]; rr->atype = ((uint16_t) s[-4] << 8) | s[-3];
@ -239,7 +239,6 @@ bool mg_dns_parse(const uint8_t *buf, size_t len, struct mg_dns_message *dm) {
// LOG(LL_INFO, ("A -- %zu %zu %s", ofs, n, dm->name)); // LOG(LL_INFO, ("A -- %zu %zu %s", ofs, n, dm->name));
if ((n = mg_dns_parse_rr(buf, len, ofs, false, &rr)) == 0) return false; if ((n = mg_dns_parse_rr(buf, len, ofs, false, &rr)) == 0) return false;
mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name)); mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name));
LOG(LL_INFO, ("A %zu %zu %s", ofs, n, dm->name));
ofs += n; ofs += n;
if (rr.alen == 4 && rr.atype == 1 && rr.aclass == 1) { if (rr.alen == 4 && rr.atype == 1 && rr.aclass == 1) {
@ -2562,7 +2561,7 @@ static int ll_read(struct mg_connection *c, void *buf, int len, int *fail) {
MG_SOCK_ERRNO, *fail)); MG_SOCK_ERRNO, *fail));
if (n > 0 && c->is_hexdumping) { if (n > 0 && c->is_hexdumping) {
char *s = mg_hexdump(buf, n); char *s = mg_hexdump(buf, n);
LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "<-", n, s)); // LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "<-", n, s));
free(s); free(s);
} }
return n; return n;
@ -2578,7 +2577,7 @@ static int ll_write(struct mg_connection *c, const void *buf, int len,
MG_SOCK_ERRNO)); MG_SOCK_ERRNO));
if (n > 0 && c->is_hexdumping) { if (n > 0 && c->is_hexdumping) {
char *s = mg_hexdump(buf, len); char *s = mg_hexdump(buf, len);
LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "->", len, s)); // LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "->", len, s));
free(s); free(s);
} }
return n; return n;

5
src/dns.c
View File

@ -78,8 +78,8 @@ size_t mg_dns_parse_rr(const uint8_t *buf, size_t len, size_t ofs,
if (len > 512) return 0; // Too large, we don't expect that if (len > 512) return 0; // Too large, we don't expect that
if (s >= e) return 0; // Overflow if (s >= e) return 0; // Overflow
if ((rr->nlen = mg_dns_parse_name(buf, len, ofs, NULL, 0)) == 0) return 0; if ((rr->nlen = (uint16_t) mg_dns_parse_name(buf, len, ofs, NULL, 0)) == 0)
// LOG(LL_INFO, ("%zu %zu %hu %d", ofs, len, rr->nlen, is_question)); return 0;
s += rr->nlen + 4; s += rr->nlen + 4;
if (s > e) return 0; if (s > e) return 0;
rr->atype = ((uint16_t) s[-4] << 8) | s[-3]; rr->atype = ((uint16_t) s[-4] << 8) | s[-3];
@ -113,7 +113,6 @@ bool mg_dns_parse(const uint8_t *buf, size_t len, struct mg_dns_message *dm) {
// LOG(LL_INFO, ("A -- %zu %zu %s", ofs, n, dm->name)); // LOG(LL_INFO, ("A -- %zu %zu %s", ofs, n, dm->name));
if ((n = mg_dns_parse_rr(buf, len, ofs, false, &rr)) == 0) return false; if ((n = mg_dns_parse_rr(buf, len, ofs, false, &rr)) == 0) return false;
mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name)); mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name));
LOG(LL_INFO, ("A %zu %zu %s", ofs, n, dm->name));
ofs += n; ofs += n;
if (rr.alen == 4 && rr.atype == 1 && rr.aclass == 1) { if (rr.alen == 4 && rr.atype == 1 && rr.aclass == 1) {

4
src/sock.c
View File

@ -132,7 +132,7 @@ static int ll_read(struct mg_connection *c, void *buf, int len, int *fail) {
MG_SOCK_ERRNO, *fail)); MG_SOCK_ERRNO, *fail));
if (n > 0 && c->is_hexdumping) { if (n > 0 && c->is_hexdumping) {
char *s = mg_hexdump(buf, n); char *s = mg_hexdump(buf, n);
LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "<-", n, s)); // LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "<-", n, s));
free(s); free(s);
} }
return n; return n;
@ -148,7 +148,7 @@ static int ll_write(struct mg_connection *c, const void *buf, int len,
MG_SOCK_ERRNO)); MG_SOCK_ERRNO));
if (n > 0 && c->is_hexdumping) { if (n > 0 && c->is_hexdumping) {
char *s = mg_hexdump(buf, len); char *s = mg_hexdump(buf, len);
LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "->", len, s)); // LOG(LL_INFO, ("\n-- %lu %s %s %d\n%s--", c->id, c->label, "->", len, s));
free(s); free(s);
} }
return n; return n;