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

TLS nits, more DNS logging

Browse Source
This commit is contained in:
cpq committed 2021-04-22 15:21:16 +01:00
1 parent 1b8624f135
commit 35a8b8e8e8
3 files changed
+32 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+16 -10
View File
@@ -366,14 +366,18 @@ static void mg_sendnsreq(struct mg_connection *c, struct mg_str *name, int ms,
} else if ((d = (struct dns_data *) calloc(1, sizeof(*d))) == NULL) { } else if ((d = (struct dns_data *) calloc(1, sizeof(*d))) == NULL) {
mg_error(c, "resolve OOM"); mg_error(c, "resolve OOM");
} else { } else {
#if MG_ENABLE_LOG
char buf[100];
#endif
d->txnid = s_reqs ? s_reqs->txnid + 1 : 1; d->txnid = s_reqs ? s_reqs->txnid + 1 : 1;
d->next = s_reqs; d->next = s_reqs;
s_reqs = d; s_reqs = d;
d->expire = mg_millis() + ms; d->expire = mg_millis() + ms;
d->c = c; d->c = c;
c->is_resolving = 1; c->is_resolving = 1;
LOG(LL_VERBOSE_DEBUG, ("%lu resolving %.*s, txnid %hu", c->id, LOG(LL_VERBOSE_DEBUG,
(int) name->len, name->ptr, d->txnid)); ("%lu resolving %.*s @ %s, txnid %hu", c->id, (int) name->len,
name->ptr, mg_ntoa(&dnsc->c->peer, buf, sizeof(buf)), d->txnid));
mg_dns_send(dnsc->c, name, d->txnid, ipv6); mg_dns_send(dnsc->c, name, d->txnid, ipv6);
} }
} }
@@ -3557,10 +3561,13 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
cert, certkey)); cert, certkey));
mbedtls_ssl_init(&tls->ssl); mbedtls_ssl_init(&tls->ssl);
mbedtls_ssl_config_init(&tls->conf); mbedtls_ssl_config_init(&tls->conf);
mbedtls_x509_crt_init(&tls->ca);
mbedtls_x509_crt_init(&tls->cert);
mbedtls_pk_init(&tls->pk);
mbedtls_ssl_conf_dbg(&tls->conf, debug_cb, c); mbedtls_ssl_conf_dbg(&tls->conf, debug_cb, c);
#if !defined(ESP_PLATFORM) //#if !defined(ESP_PLATFORM)
mbedtls_debug_set_threshold(5); // mbedtls_debug_set_threshold(5);
#endif //#endif
if ((rc = mbedtls_ssl_config_defaults( if ((rc = mbedtls_ssl_config_defaults(
&tls->conf, &tls->conf,
c->is_client ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER, c->is_client ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER,
@@ -3581,7 +3588,6 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
goto fail; goto fail;
} }
#else #else
mbedtls_x509_crt_init(&tls->ca);
rc = opts->ca[0] == '-' rc = opts->ca[0] == '-'
? mbedtls_x509_crt_parse(&tls->ca, (uint8_t *) opts->ca, ? mbedtls_x509_crt_parse(&tls->ca, (uint8_t *) opts->ca,
strlen(opts->ca) + 1) strlen(opts->ca) + 1)
@@ -3606,8 +3612,6 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
key = opts->cert; key = opts->cert;
certkey = cert; certkey = cert;
} }
mbedtls_x509_crt_init(&tls->cert);
mbedtls_pk_init(&tls->pk);
rc = opts->cert[0] == '-' rc = opts->cert[0] == '-'
? mbedtls_x509_crt_parse(&tls->cert, (uint8_t *) opts->cert, ? mbedtls_x509_crt_parse(&tls->cert, (uint8_t *) opts->cert,
strlen(opts->cert) + 1) strlen(opts->cert) + 1)
@@ -3666,12 +3670,13 @@ int mg_tls_free(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls; struct mg_tls *tls = (struct mg_tls *) c->tls;
if (tls == NULL) return 0; if (tls == NULL) return 0;
free(tls->cafile); free(tls->cafile);
mbedtls_x509_crt_free(&tls->ca);
mbedtls_x509_crt_free(&tls->cert);
mbedtls_ssl_free(&tls->ssl); mbedtls_ssl_free(&tls->ssl);
mbedtls_pk_free(&tls->pk); mbedtls_pk_free(&tls->pk);
mbedtls_x509_crt_free(&tls->ca);
mbedtls_x509_crt_free(&tls->cert);
mbedtls_ssl_config_free(&tls->conf); mbedtls_ssl_config_free(&tls->conf);
free(tls); free(tls);
c->tls = NULL;
return 1; return 1;
} }
#elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL #elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL
@@ -3813,6 +3818,7 @@ int mg_tls_free(struct mg_connection *c) {
SSL_free(tls->ssl); SSL_free(tls->ssl);
SSL_CTX_free(tls->ctx); SSL_CTX_free(tls->ctx);
free(tls); free(tls);
c->tls = NULL;
return 1; return 1;
} }
src/dns.c
+6 -2
View File
@@ -241,14 +241,18 @@ static void mg_sendnsreq(struct mg_connection *c, struct mg_str *name, int ms,
} else if ((d = (struct dns_data *) calloc(1, sizeof(*d))) == NULL) { } else if ((d = (struct dns_data *) calloc(1, sizeof(*d))) == NULL) {
mg_error(c, "resolve OOM"); mg_error(c, "resolve OOM");
} else { } else {
#if MG_ENABLE_LOG
char buf[100];
#endif
d->txnid = s_reqs ? s_reqs->txnid + 1 : 1; d->txnid = s_reqs ? s_reqs->txnid + 1 : 1;
d->next = s_reqs; d->next = s_reqs;
s_reqs = d; s_reqs = d;
d->expire = mg_millis() + ms; d->expire = mg_millis() + ms;
d->c = c; d->c = c;
c->is_resolving = 1; c->is_resolving = 1;
LOG(LL_VERBOSE_DEBUG, ("%lu resolving %.*s, txnid %hu", c->id, LOG(LL_VERBOSE_DEBUG,
(int) name->len, name->ptr, d->txnid)); ("%lu resolving %.*s @ %s, txnid %hu", c->id, (int) name->len,
name->ptr, mg_ntoa(&dnsc->c->peer, buf, sizeof(buf)), d->txnid));
mg_dns_send(dnsc->c, name, d->txnid, ipv6); mg_dns_send(dnsc->c, name, d->txnid, ipv6);
} }
} }
src/tls.c
+10 -8
View File
@@ -81,10 +81,13 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
cert, certkey)); cert, certkey));
mbedtls_ssl_init(&tls->ssl); mbedtls_ssl_init(&tls->ssl);
mbedtls_ssl_config_init(&tls->conf); mbedtls_ssl_config_init(&tls->conf);
mbedtls_x509_crt_init(&tls->ca);
mbedtls_x509_crt_init(&tls->cert);
mbedtls_pk_init(&tls->pk);
mbedtls_ssl_conf_dbg(&tls->conf, debug_cb, c); mbedtls_ssl_conf_dbg(&tls->conf, debug_cb, c);
#if !defined(ESP_PLATFORM) //#if !defined(ESP_PLATFORM)
mbedtls_debug_set_threshold(5); // mbedtls_debug_set_threshold(5);
#endif //#endif
if ((rc = mbedtls_ssl_config_defaults( if ((rc = mbedtls_ssl_config_defaults(
&tls->conf, &tls->conf,
c->is_client ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER, c->is_client ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER,
@@ -105,7 +108,6 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
goto fail; goto fail;
} }
#else #else
mbedtls_x509_crt_init(&tls->ca);
rc = opts->ca[0] == '-' rc = opts->ca[0] == '-'
? mbedtls_x509_crt_parse(&tls->ca, (uint8_t *) opts->ca, ? mbedtls_x509_crt_parse(&tls->ca, (uint8_t *) opts->ca,
strlen(opts->ca) + 1) strlen(opts->ca) + 1)
@@ -130,8 +132,6 @@ int mg_tls_init(struct mg_connection *c, struct mg_tls_opts *opts) {
key = opts->cert; key = opts->cert;
certkey = cert; certkey = cert;
} }
mbedtls_x509_crt_init(&tls->cert);
mbedtls_pk_init(&tls->pk);
rc = opts->cert[0] == '-' rc = opts->cert[0] == '-'
? mbedtls_x509_crt_parse(&tls->cert, (uint8_t *) opts->cert, ? mbedtls_x509_crt_parse(&tls->cert, (uint8_t *) opts->cert,
strlen(opts->cert) + 1) strlen(opts->cert) + 1)
@@ -190,12 +190,13 @@ int mg_tls_free(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls; struct mg_tls *tls = (struct mg_tls *) c->tls;
if (tls == NULL) return 0; if (tls == NULL) return 0;
free(tls->cafile); free(tls->cafile);
mbedtls_x509_crt_free(&tls->ca);
mbedtls_x509_crt_free(&tls->cert);
mbedtls_ssl_free(&tls->ssl); mbedtls_ssl_free(&tls->ssl);
mbedtls_pk_free(&tls->pk); mbedtls_pk_free(&tls->pk);
mbedtls_x509_crt_free(&tls->ca);
mbedtls_x509_crt_free(&tls->cert);
mbedtls_ssl_config_free(&tls->conf); mbedtls_ssl_config_free(&tls->conf);
free(tls); free(tls);
c->tls = NULL;
return 1; return 1;
} }
#elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL #elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL
@@ -337,6 +338,7 @@ int mg_tls_free(struct mg_connection *c) {
SSL_free(tls->ssl); SSL_free(tls->ssl);
SSL_CTX_free(tls->ctx); SSL_CTX_free(tls->ctx);
free(tls); free(tls);
c->tls = NULL;
return 1; return 1;
} }