Changeset 688:8c3dc8584dab in freeDiameter for libfdproto/messages.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:

• libfdproto/messages.c (modified) (6 diffs)

libfdproto/messages.c

@@ -793 +793 @@
 
 /* Dump a message to a specified file stream */
-static void fd_msg_dump_fstr ( struct msg * msg, FILE * fstr )
+void fd_msg_dump_fstr ( struct msg * msg, FILE * fstr )
 {
         msg_or_avp * ref = msg;
@@ -2263 +2263 @@
                         *action = DISP_ACT_ERROR;
                 } else {
-                        TRACE_DEBUG(INFO, "Received an answer to a local query with an unsupported application %d, discarding...",  (*msg)->msg_public.msg_appl);
-                        fd_msg_dump_walk(INFO, *msg);
+                        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;
@@ -2337 +2336 @@
         pthread_mutex_t lock;
         int             init;
+        struct dictionary *dict;        
 } ml_conf = { .lock = PTHREAD_MUTEX_INITIALIZER, .init = 0 };
 
-static void ml_conf_init(void) 
+void ml_conf_init(struct dictionary *dict) 
 {
         memset(&ml_conf.causes, 0, sizeof(ml_conf.causes));
         ml_conf.init = 1;
+        ml_conf.dict = dict;
 }
 
@@ -2357 +2358 @@
         CHECK_POSIX( pthread_mutex_lock(&ml_conf.lock) );
         if (!ml_conf.init) {
-                ml_conf_init();
+                ASSERT(0);
         }
         
@@ -2406 +2407 @@
         CHECK_POSIX_DO( pthread_mutex_lock(&ml_conf.lock), );
         if (!ml_conf.init) {
-                ml_conf_init();
+                ASSERT(0);
         }
         meth    = ml_conf.causes[cause].meth;
@@ -2420 +2421 @@
                 case FD_MSG_LOGTO_FILE:
                         TODO("Log to arg file");
+                        TODO("Log a note to debug stream");
                         break;
                 case FD_MSG_LOGTO_DIR:
                         TODO("Log to arg directory in a new file");
-                        break;
-        }
-        
-        /* Then dump the prefix message to this stream */
+                        TODO("Log a note to debug stream");
+                        break;
+        }
+        
+        /* For file methods, let's parse the message so it looks better */
+        if ((meth != FD_MSG_LOGTO_DEBUGONLY) && ml_conf.dict) {
+                CHECK_FCT_DO( fd_msg_parse_dict( msg, ml_conf.dict, NULL ), );
+        }
+        
+        /* Then dump the prefix message to this stream, & to debug stream */
         (void)pthread_mutex_lock(&fd_log_lock);
         pthread_cleanup_push(fd_cleanup_mutex_silent, &fd_log_lock);