Merge pull request #3161 from cesanta/fix

Unbreak MbedTLS (#3148), rollback debugging leftovers
This commit is contained in:
Sergio R. Caprile authored and GitHub committed 2025-06-04 09:08:32 -03:00
commit 3efe6641eb
4 files changed
+4 -2

No files matched your search

+1
View File
@@ -14194,6 +14194,7 @@ long mg_tls_send(struct mg_connection *c, const void *buf, size_t len) {
}
void mg_tls_flush(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls;
if (c->is_tls_throttled) {
long n = mbedtls_ssl_write(&tls->ssl, tls->throttled_buf, tls->throttled_len);
c->is_tls_throttled = (n == MBEDTLS_ERR_SSL_WANT_READ || n == MBEDTLS_ERR_SSL_WANT_WRITE);
+1
View File
@@ -210,6 +210,7 @@ long mg_tls_send(struct mg_connection *c, const void *buf, size_t len) {
}
void mg_tls_flush(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls;
if (c->is_tls_throttled) {
long n = mbedtls_ssl_write(&tls->ssl, tls->throttled_buf, tls->throttled_len);
c->is_tls_throttled = (n == MBEDTLS_ERR_SSL_WANT_READ || n == MBEDTLS_ERR_SSL_WANT_WRITE);
+1 -1
View File
@@ -254,6 +254,6 @@ void web_init(struct mg_mgr *mgr) {
s_settings.device_name = strdup("My Device");
mg_http_listen(mgr, HTTP_URL, fn, NULL);
mg_http_listen(mgr, HTTPS_URL, fn, NULL);
mg_timer_add(mgr, 10 * 1000, MG_TIMER_RUN_NOW | MG_TIMER_REPEAT,
mg_timer_add(mgr, 3600 * 1000, MG_TIMER_RUN_NOW | MG_TIMER_REPEAT,
timer_sntp_fn, mgr);
}
+1 -1
View File
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
struct mg_tcpip_driver driver = {.tx = tap_tx, .poll = tap_poll, .rx = tap_rx};
struct mg_tcpip_if mif = {.driver = &driver,
.driver_data = &fd,
.enable_req_dns = false,
.enable_req_dns = true,
.enable_req_sntp = true,
.fn = mif_fn};
sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &mif.mac[0], &mif.mac[1],