Changeset 1078:74bba7975864 in freeDiameter for libfdproto

Timestamp:

Apr 30, 2013, 4:37:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleanup the timing data and fd_msg_log feature that will be replaced by the new hooks mechanism. Kept the calls to fd_msg_log in comments to find the locations easily. WORK IN PROGRESS.

Location:

libfdproto

Files:

• CMakeLists.txt (modified) (1 diff)
• dispatch.c (modified) (1 diff)
• messages.c (modified) (5 diffs)
• msg_log.c (deleted)

libfdproto/CMakeLists.txt

@@ -13 +13 @@
         log.c
         messages.c
-        msg_log.c
         ostr.c
         portability.c

libfdproto/dispatch.c

@@ -97 +97 @@
                 CHECK_FCT_DO( (r = (*hdl->cb)(msg, avp, sess, hdl->opaque, action)),
                         {
-                                fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: a DISPATCH callback returned an error (%s)", strerror(r));
+                                //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: a DISPATCH callback returned an error (%s)", strerror(r));
                                 fd_msg_free(*msg);
                                 *msg = NULL;

libfdproto/messages.c

@@ -129 +129 @@
         DiamId_t                 msg_src_id;            /* Diameter Id of the peer this message was received from. This string is malloc'd and must be freed */
         size_t                   msg_src_id_len;        /* cached length of this string */
-        struct timespec          msg_ts_rcv;            /* Timestamp when this message was received from the network */
-        struct timespec          msg_ts_sent;           /* Timestamp when this message was sent to the network */
         
 };
@@ -734 +732 @@
         }
         
-        if ((msg->msg_ts_rcv.tv_sec != 0) || (msg->msg_ts_rcv.tv_nsec != 0)) {
-                tsoffset += strftime(buftime + tsoffset, sizeof(buftime) - tsoffset, "%D,%T", localtime_r( &msg->msg_ts_rcv.tv_sec , &tm ));
-                tsoffset += snprintf(buftime + tsoffset, sizeof(buftime) - tsoffset, ".%6.6ld", msg->msg_ts_rcv.tv_nsec / 1000);
-                CHECK_FCT( dump_add_str(outstr, offset, outlen, INOBJHDR "Received: %s|", INOBJHDRVAL, buftime) );
-        }
-        if ((msg->msg_ts_sent.tv_sec != 0) || (msg->msg_ts_sent.tv_nsec != 0)) {
-                tsoffset += strftime(buftime + tsoffset, sizeof(buftime) - tsoffset, "%D,%T", localtime_r( &msg->msg_ts_sent.tv_sec , &tm ));
-                tsoffset += snprintf(buftime + tsoffset, sizeof(buftime) - tsoffset, ".%6.6ld", msg->msg_ts_sent.tv_nsec / 1000);
-                CHECK_FCT( dump_add_str(outstr, offset, outlen, INOBJHDR "Sent    : %s|", INOBJHDRVAL, buftime) );
-        }
-        
         if (!msg->msg_model) {
                 
@@ -998 +985 @@
 
 /* Dump full message */
-void fd_msg_dump_full ( int level, struct dictionary *dict, const char *prefix, msg_or_avp *obj )
+// TODO: need align with new prototype & behavior
+void fd_msg_dump_full_TODO ( int level, struct dictionary *dict, const char *prefix, msg_or_avp *obj )
 {
         msg_or_avp * ref = obj;
@@ -1361 +1349 @@
         
         /* done */
-        return 0;
-}
-
-int fd_msg_ts_set_recv( struct msg * msg, struct timespec * ts )
-{
-        TRACE_ENTRY("%p %p", msg, ts);
-        
-        /* Check we received valid parameters */
-        CHECK_PARAMS( CHECK_MSG(msg) );
-        CHECK_PARAMS( ts );
-        
-        memcpy(&msg->msg_ts_rcv, ts, sizeof(struct timespec));
-        return 0;
-}
-
-int fd_msg_ts_get_recv( struct msg * msg, struct timespec * ts )
-{
-        TRACE_ENTRY("%p %p", msg, ts);
-        
-        /* Check we received valid parameters */
-        CHECK_PARAMS( CHECK_MSG(msg) );
-        CHECK_PARAMS( ts );
-        
-        memcpy(ts, &msg->msg_ts_rcv, sizeof(struct timespec));
-        return 0;
-}
-
-int fd_msg_ts_set_sent( struct msg * msg, struct timespec * ts )
-{
-        TRACE_ENTRY("%p %p", msg, ts);
-        
-        /* Check we received valid parameters */
-        CHECK_PARAMS( CHECK_MSG(msg) );
-        CHECK_PARAMS( ts );
-        
-        memcpy(&msg->msg_ts_sent, ts, sizeof(struct timespec));
-        return 0;
-}
-
-int fd_msg_ts_get_sent( struct msg * msg, struct timespec * ts )
-{
-        TRACE_ENTRY("%p %p", msg, ts);
-        
-        /* Check we received valid parameters */
-        CHECK_PARAMS( CHECK_MSG(msg) );
-        CHECK_PARAMS( ts );
-        
-        memcpy(ts, &msg->msg_ts_sent, sizeof(struct timespec));
         return 0;
 }
@@ -2639 +2579 @@
                         *action = DISP_ACT_ERROR;
                 } else {
-                        fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Received this answer to a local query with an unsupported application %d", (*msg)->msg_public.msg_appl);
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Received this answer to a local query with an unsupported application %d", (*msg)->msg_public.msg_appl);
                         fd_msg_free(*msg);
                         *msg = NULL;