Changeset 1085:7d7266115a34 in freeDiameter for include/freeDiameter/libfdcore.h

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:

• include/freeDiameter/libfdcore.h (modified) (4 diffs)

include/freeDiameter/libfdcore.h

@@ -58 +58 @@
 
 /* Check the return value of a GNUTLS function, log and propagate */
-#define CHECK_GNUTLS_DO( __call__, __fallback__ ) {                                             \
-        int __ret__;                                                                            \
-        TRACE_DEBUG(GNUTLS_DBG_LEVEL, "GNUTLS call: %s", #__call__ );                           \
-        __ret__ = (__call__);                                                                   \
-        if (__ret__ < 0) {                                                                      \
-                TRACE_DEBUG(INFO, "Error in '%s':\t%s", #__call__ , gnutls_strerror(__ret__));  \
-                __fallback__;                                                                   \
-        }                                                                                       \
+#define CHECK_GNUTLS_GEN( faillevel, __call__, __fallback__  ) {                                        \
+                CHECK_PRELUDE(__call__);                                                                \
+                if (__ret__ < 0) {                                                                      \
+                        __ret__ = errno;                                                                \
+                        LOG(faillevel, "ERROR: in '%s' :\t%s",  #__call__ ,  gnutls_strerror(__ret__)); \
+                        __fallback__;                                                                   \
+                }                                                                                       \
 }
 
-/* For GNUTLS routines that do not return a value */
+/* we use this macro to help debugging gnutls usage issues -- just change the content to display what you need */
 #define GNUTLS_TRACE( __call__) {                                       \
-        TRACE_DEBUG(GNUTLS_DBG_LEVEL, "GNUTLS call: " #__call__ );      \
+        TRACE_CALL("Check: %s", #__call__ );                            \
         (__call__);                                                     \
 }
+
+
+#ifndef EXCLUDE_DEPRECATED
+/* Macro for transition, replace with CHECK_GNUTLS_GEN */
+#define CHECK_GNUTLS_DO( __call__, __fallback__ ) {                                                     \
+                CHECK_PRELUDE(__call__);                                                                \
+                if (__ret__ < 0) {                                                                      \
+                        __ret__ = errno;                                                                \
+                        TRACE_ERROR("ERROR: in '%s' :\t%s",  #__call__ ,  gnutls_strerror(__ret__));    \
+                        __fallback__;                                                                   \
+                }                                                                                       \
+}
+
+#endif /* EXCLUDE_DEPRECATED */
 
 
@@ -778 +791 @@
 enum {
          FDEV_TERMINATE = 1000  /* request to terminate */
-        ,FDEV_DUMP_DICT         /* Dump the content of the dictionary */
-        ,FDEV_DUMP_EXT          /* Dump state of extensions */
-        ,FDEV_DUMP_SERV         /* Dump the server socket status */
-        ,FDEV_DUMP_QUEUES       /* Dump the message queues */
-        ,FDEV_DUMP_CONFIG       /* Dump the configuration */
-        ,FDEV_DUMP_PEERS        /* Dump the list of peers */
         ,FDEV_TRIGGER           /* Trigger available for extensions. size is sizeof(int), data is int * */
 };
@@ -795 +802 @@
 /* for extensions */
 int fd_event_trig_regcb(int trigger_val, const char * module, void (*cb)(void));
-void fd_event_trig_dump();
-
+
+DECLARE_FD_DUMP_PROTOTYPE(fd_event_trig_dump);
+
+/* The "old" FD_EV_DUMP_* events are replaced with direct calls to the following dump functions */
+DECLARE_FD_DUMP_PROTOTYPE(fd_conf_dump);
+DECLARE_FD_DUMP_PROTOTYPE(fd_ext_dump);
+DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump_list, int details);
+DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump, struct peer_hdr * p, int details);
+DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump);
 
 /*============================================================*/
@@ -832 +846 @@
 int fd_ep_filter_list( struct fd_list * list, struct fd_list * exclude_list );
 int fd_ep_clearflags( struct fd_list * list, uint32_t flags );
-void fd_ep_dump_one( char * prefix, struct fd_endpoint * ep );
-void fd_ep_dump( int indent, struct fd_list * eps );
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep );
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int indent, struct fd_list * eps  );