Changeset 894:43fb27a9037f in freeDiameter for libfdcore/cnxctx.c

Timestamp:

Nov 30, 2012, 6:51:49 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Intrumented socket reception to store the timestamp along the received buffer

File:

• libfdcore/cnxctx.c (modified) (9 diffs)

libfdcore/cnxctx.c

@@ -641 +641 @@
         }
         
+        CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &conn->cc_tls_para.recvon), /* continue */ );
+        
         return ret;
 }
@@ -696 +698 @@
                 ssize_t ret = 0;
                 size_t  received = 0;
+                struct timespec recv_on;
 
                 do {
@@ -718 +721 @@
 
                 /* Ok, now we can really receive the data */
-                CHECK_MALLOC_DO(  newmsg = malloc( length ), goto fatal );
+                CHECK_MALLOC_DO(  newmsg = malloc( length + sizeof(struct timespec) ), goto fatal );
                 memcpy(newmsg, header, sizeof(header));
 
@@ -732 +735 @@
                         received += ret;
                 }
+                
+                /* Piggy-tail the timestamp of reception */
+                CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &recv_on), /* continue */ );
+                memcpy(newmsg + length, &recv_on, sizeof(struct timespec));
                 
                 /* We have received a complete message, pass it to the daemon */
@@ -782 +789 @@
                         continue;
                 }
-                
+                /* Note: the real size of buf is bufsz + struct timespec */
                 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), event, bufsz, buf), goto fatal );
                 
@@ -920 +927 @@
 int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session)
 {
+        struct timespec * rcv_on;
+        
+        void * ptr = gnutls_transport_get_ptr(session);
+        if (ptr == conn) {
+                rcv_on = &conn->cc_tls_para.recvon;
+        } else {
+                struct sctps_ctx * ctx = (struct sctps_ctx *) ptr;
+                rcv_on = &ctx->recvon;
+        }
+        
+        
         /* No guarantee that GnuTLS preserves the message boundaries, so we re-build it as in TCP */
         do {
@@ -927 +945 @@
                 ssize_t ret = 0;
                 size_t  received = 0;
+                struct timespec recv_on;
 
                 do {
@@ -949 +968 @@
 
                 /* Ok, now we can really receive the data */
-                CHECK_MALLOC(  newmsg = malloc( length ) );
+                CHECK_MALLOC(  newmsg = malloc( length + sizeof(struct timespec)) );
                 memcpy(newmsg, header, sizeof(header));
 
@@ -963 +982 @@
                         received += ret;
                 }
+                
+                /* The timestamp of the last TLS chunk received for this rebuilt message lives close to the session pointer, we piggyback it */
+                memcpy(newmsg + length, rcv_on, sizeof(struct timespec));
                 
                 /* We have received a complete message, pass it to the daemon */