Changeset 1085:7d7266115a34 in freeDiameter for libfdcore/core.c

Timestamp:

May 3, 2013, 8:20:56 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleaning of the traces in progress

File:

• libfdcore/core.c (modified) (4 diffs)

libfdcore/core.c

@@ -85 +85 @@
                 CHECK_FCT_DO(  fd_event_get(fd_g_config->cnf_main_ev, &code, &sz, &data),  break  );
                 switch (code) {
-                        case FDEV_DUMP_DICT:
-                                fd_dict_dump(fd_g_config->cnf_dict);
-                                break;
-                        
-                        case FDEV_DUMP_EXT:
-                                fd_ext_dump();
-                                break;
-                        
-                        case FDEV_DUMP_SERV:
-                                fd_servers_dump();
-                                break;
-                        
-                        case FDEV_DUMP_QUEUES:
-                                fd_fifo_dump(0, "Incoming messages", fd_g_incoming, fd_msg_dump_walk);
-                                fd_fifo_dump(0, "Outgoing messages", fd_g_outgoing, fd_msg_dump_walk);
-                                fd_fifo_dump(0, "Local messages",    fd_g_local,    fd_msg_dump_walk);
-                                break;
-                        
-                        case FDEV_DUMP_CONFIG:
-                                fd_conf_dump();
-                                break;
-                        
-                        case FDEV_DUMP_PEERS:
-                                fd_peer_dump_list(FULL);
-                                break;
-                        
                         case FDEV_TRIGGER:
                                 {
@@ -182 +156 @@
         }
         
-        TRACE_DEBUG(INFO, "libfdproto initialized.");
+        LOG_D("libfdproto initialized.");
         
         /* Name this thread */
@@ -225 +199 @@
 int fd_core_parseconf(const char * conffile)
 {
+        char * buf = NULL, *b;
+        size_t len = 0, offset=0;
+        
+        
         TRACE_ENTRY("%p", conffile);
         
@@ -240 +218 @@
         
         /* Display configuration */
-        fd_conf_dump();
+        b = fd_conf_dump(&buf, &len, NULL);
+        LOG_N("%s\n", b ?: "Error during configuration dump...");
         
         /* Display registered triggers for FDEV_TRIGGER */
-        fd_event_trig_dump();
-        
+        b = fd_event_trig_dump(&buf, &len, &offset);
+        if (!b || offset) {
+                LOG_N("%s\n", b ?: "Error during triggers dump...");
+        }
+        
+        free(buf);      
+                
         return 0;
 }