DTLS: Correctly log sending plain data size when using DTLS

obgm · Jan 6, 2025 · bd2c2b0 · bd2c2b0
1 parent 75b4322
commit bd2c2b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/coap_gnutls.c b/src/coap_gnutls.c
@@ -2485,6 +2485,8 @@ coap_dtls_receive(coap_session_t *c_session, const uint8_t *data,
     }
     ret = gnutls_record_recv(g_env->g_session, pdu, (int)sizeof(pdu));
     if (ret > 0) {
+      coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
+                     coap_session_str(c_session), ret);
       return coap_handle_dgram(c_session->context, c_session, pdu, (size_t)ret);
     } else if (ret == 0) {
       c_session->dtls_event = COAP_EVENT_DTLS_CLOSED;
@@ -2542,10 +2544,6 @@ coap_dtls_receive(coap_session_t *c_session, const uint8_t *data,
     ssl_data->pdu_len = 0;
     ssl_data->pdu = NULL;
   }
-  if (ret > 0) {
-    coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
-                   coap_session_str(c_session), ret);
-  }
   return ret;
 }
 

diff --git a/src/coap_mbedtls.c b/src/coap_mbedtls.c
@@ -2396,6 +2396,8 @@ coap_dtls_receive(coap_session_t *c_session,
 
     ret = mbedtls_ssl_read(&m_env->ssl, pdu, sizeof(pdu));
     if (ret > 0) {
+      coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
+                     coap_session_str(c_session), ret);
       ret = coap_handle_dgram(c_session->context, c_session, pdu, (size_t)ret);
       goto finish;
     }
@@ -2449,10 +2451,6 @@ coap_dtls_receive(coap_session_t *c_session,
     ssl_data->pdu_len = 0;
     ssl_data->pdu = NULL;
   }
-  if (ret > 0) {
-    coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
-                   coap_session_str(c_session), ret);
-  }
   return ret;
 }
 

diff --git a/src/coap_openssl.c b/src/coap_openssl.c
@@ -3662,6 +3662,8 @@ coap_dtls_receive(coap_session_t *session, const uint8_t *data, size_t data_len)
   session->dtls_event = -1;
   r = SSL_read(ssl, pdu, (int)sizeof(pdu));
   if (r > 0) {
+    coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
+                   coap_session_str(session), r);
     r =  coap_handle_dgram(session->context, session, pdu, (size_t)r);
     goto finished;
   } else {
@@ -3701,10 +3703,6 @@ coap_dtls_receive(coap_session_t *session, const uint8_t *data, size_t data_len)
     ssl_data->pdu_len = 0;
     ssl_data->pdu = NULL;
   }
-  if (r > 0) {
-    coap_log_debug("*  %s: dtls:  recv %4d bytes\n",
-                   coap_session_str(session), r);
-  }
   return r;
 }