Changeset 688:8c3dc8584dab in freeDiameter for libfdcore/p_out.c

Timestamp:

Jan 19, 2011, 7:05:30 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Prepared capability for messages logging to separate files / folders

File:

• libfdcore/p_out.c (modified) (6 diffs)

libfdcore/p_out.c

@@ -60 +60 @@
         }
         
-        /* Log the message */
-        if (TRACE_BOOL(FULL)) {
-                CHECK_FCT_DO(  fd_msg_update_length(*msg), /* continue */  );
-                TRACE_DEBUG(FULL, "Sending the following message on connection '%s':", fd_cnx_getid(cnx));
-                fd_msg_dump_walk(FULL, *msg);
-        }
-        
         /* Create the message buffer */
         CHECK_FCT(fd_msg_bufferize( *msg, &buf, &sz ));
         pthread_cleanup_push( free, buf );
+        
+        /* Log the message */
+        fd_msg_log( FD_MSG_LOG_SENT, *msg, "Sent to '%s'", fd_cnx_getid(cnx));
         
         /* Save a request before sending so that there is no race condition with the answer */
@@ -93 +89 @@
         struct msg *msg = arg;
         CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &msg),
-                        CHECK_FCT_DO(fd_msg_free(msg), /* What can we do more? */));
+                {
+                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "An error occurred while attempting to requeue this message during cancellation of the sending function");
+                        CHECK_FCT_DO(fd_msg_free(msg), /* What can we do more? */);
+                } );
 }
 
@@ -112 +111 @@
         while (1) {
                 struct msg * msg;
+                int ret;
                 
                 /* Retrieve next message to send */
@@ -120 +120 @@
                 
                 /* Send the message, log any error */
-                CHECK_FCT_DO( do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, &peer->p_sr),
+                CHECK_FCT_DO( ret = do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, &peer->p_sr),
                         {
                                 if (msg) {
-                                        fd_log_debug("An error occurred while sending this message, it was lost:\n");
-                                        fd_msg_dump_walk(NONE, msg);
+                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)\n", strerror(ret) );
                                         fd_msg_free(msg);
                                 }
@@ -151 +150 @@
                 
         } else {
+                int ret;
                 uint32_t *hbh = NULL;
                 
@@ -161 +161 @@
 
                 /* Do send the message */
-                CHECK_FCT_DO( do_send(msg, flags, cnx, hbh, peer ? &peer->p_sr : NULL),
+                CHECK_FCT_DO( ret = do_send(msg, flags, cnx, hbh, peer ? &peer->p_sr : NULL),
                         {
                                 if (msg) {
-                                        fd_log_debug("An error occurred while sending this message, it was lost:\n");
-                                        fd_msg_dump_walk(NONE, *msg);
+                                        fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Problem while sending (%s)\n", strerror(ret) );
                                         fd_msg_free(*msg);
                                         *msg = NULL;