Changeset 688:8c3dc8584dab in freeDiameter for libfdcore/p_psm.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_psm.c (modified) (9 diffs)

libfdcore/p_psm.c

@@ -166 +166 @@
                         case FDEVP_CNX_INCOMING: {
                                 struct cnx_incoming * evd = ev->data;
+                                fd_msg_log( FD_MSG_LOG_DROPPED, evd->cer, "Message discarded while cleaning peer state machine queue." );
                                 CHECK_FCT_DO( fd_msg_free(evd->cer), /* continue */);
                                 fd_cnx_destroy(evd->cnx);
@@ -394 +395 @@
                         } );
                 
-                TRACE_DEBUG(FULL, "Received a message (%zdb) from '%s'", ev_sz, peer->p_hdr.info.pi_diamid);
-                if (TRACE_BOOL(FULL+1)) {
-                        CHECK_FCT_DO( fd_msg_parse_dict( msg, fd_g_config->cnf_dict, NULL ), );
-                        fd_msg_dump_walk(FULL, msg);
-                } else {
-                        fd_msg_dump_one(FULL, msg);
-                }
+                /* Log incoming message */
+                fd_msg_log( FD_MSG_LOG_RECEIVED, msg, "Received %zdb from '%s'", ev_sz, peer->p_hdr.info.pi_diamid );
         
                 /* Extract the header */
@@ -411 +407 @@
                         CHECK_FCT_DO( fd_p_sr_fetch(&peer->p_sr, hdr->msg_hbhid, &req), goto psm_end );
                         if (req == NULL) {
-                                fd_log_debug("Received a Diameter answer message with no corresponding sent request, discarding.\n");
-                                fd_msg_dump_walk(NONE, msg);
+                                fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Answer received with no corresponding sent request." );
                                 fd_msg_free(msg);
                                 goto psm_loop;
@@ -453 +448 @@
                                 default:
                                         /* In such case, just discard the message */
-                                        fd_log_debug("Received a routable message while not in OPEN state from peer '%s', discarded.\n", peer->p_hdr.info.pi_diamid);
-                                        fd_msg_dump_walk(NONE, msg);
+                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received from peer '%s' while connection was not in OPEN state.", peer->p_hdr.info.pi_diamid );
                                         fd_msg_free(msg);
                         }
@@ -468 +462 @@
                                 if (msg) {
                                         /* Send the error back to the peer */
-                                        CHECK_FCT_DO( fd_out_send(&msg, NULL, peer, FD_CNX_ORDERED), /* In case of error the message has already been dumped */ );
+                                        CHECK_FCT_DO( ret = fd_out_send(&msg, NULL, peer, FD_CNX_ORDERED),  );
                                         if (msg) {
+                                                /* Only if an error occurred & the message was not saved / dumped */
+                                                fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)\n", strerror(ret) );
                                                 CHECK_FCT_DO( fd_msg_free(msg), goto psm_end);
                                         }
@@ -498 +494 @@
                         default:
                                 /* Unknown / unexpected / invalid message */
-                                fd_log_debug("Received an unknown local message from peer '%s', discarded.\n", peer->p_hdr.info.pi_diamid);
-                                fd_msg_dump_walk(NONE, msg);
+                                TRACE_DEBUG(INFO, "Invalid non-routable command received: %u.", hdr->msg_code);
                                 if (hdr->msg_flags & CMD_FLAG_REQUEST) {
                                         do {
@@ -518 +513 @@
                                 /* Cleanup the message if not done */
                                 if (msg) {
+                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received un-handled non-routable command from peer '%s'.", peer->p_hdr.info.pi_diamid );
                                         CHECK_FCT_DO( fd_msg_free(msg), /* continue */);
                                         msg = NULL;
@@ -525 +521 @@
                 /* At this point the message must have been fully handled already */
                 if (msg) {
-                        fd_log_debug("Internal error: unhandled message (discarded)!\n");
-                        fd_msg_dump_walk(NONE, msg);
+                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: unhandled message.", peer->p_hdr.info.pi_diamid );
                         fd_msg_free(msg);
                 }
@@ -602 +597 @@
                 }
                 if (params->cer) {
+                        fd_msg_log( FD_MSG_LOG_DROPPED, params->cer, "Internal error: this CER was not handled as expected." );
                         CHECK_FCT_DO( fd_msg_free(params->cer), );
                         params->cer = NULL;