Changeset 1085:7d7266115a34 in freeDiameter for libfdcore/endpoints.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/endpoints.c (modified) (12 diffs)

libfdcore/endpoints.c

@@ -58 +58 @@
         }
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                char buf[1024];
-                sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICHOST | NI_NUMERICSERV );
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Current list:");
-                fd_ep_dump( 4, list );
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Adding:");
-                fd_log_debug("    %s {%s%s%s%s%s}", buf,
-                                (flags & EP_FL_CONF)    ? "C" : "-",
-                                (flags & EP_FL_DISC)        ? "D" : "-",
-                                (flags & EP_FL_ADV)         ? "A" : "-",
-                                (flags & EP_FL_LL)          ? "L" : "-",
-                                (flags & EP_FL_PRIMARY)     ? "P" : "-");
-        }
         ptr.sa = sa;
         
@@ -82 +69 @@
                                  || ((ntohl(ptr.sin->sin_addr.s_addr) & 0xe0000000) == 0xe0000000)
                                  || (ptr.sin->sin_addr.s_addr == INADDR_BROADCAST)) {
-                                        if (TRACE_BOOL(ANNOYING + 1)) {
-                                                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Address was ignored, not added.");
-                                        }
+                                        LOG_A("  DEBUG:fd_ep_add_merge  Address was ignored, not added.");
                                         return 0;
                                 }
@@ -98 +83 @@
                                  || IN6_IS_ADDR_LINKLOCAL(&ptr.sin6->sin6_addr)
                                  || IN6_IS_ADDR_SITELOCAL(&ptr.sin6->sin6_addr)) {
-                                        if (TRACE_BOOL(ANNOYING + 1)) {
-                                                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Address was ignored, not added.");
-                                        }
+                                        LOG_A("  DEBUG:fd_ep_add_merge  Address was ignored, not added.");
                                         return 0;
                                 }
@@ -108 +91 @@
 
                 default:
-                        if (TRACE_BOOL(ANNOYING + 1)) {
-                                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Address family was unknown, not added.");
-                        }
+                        LOG_A("  DEBUG:fd_ep_add_merge  Address family was unknown, not added.");
                         return 0;
         }
@@ -175 +156 @@
         ep->flags |= flags;
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  New list:");
-                fd_ep_dump( 4, list );
-        }
         return 0;
 }
@@ -190 +167 @@
         CHECK_PARAMS(list);
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter  Filter this list for flags %x:", flags);
-                fd_ep_dump( 4, list );
-        }
         for (li = list->next; li != list; li = li->next) {
                 struct fd_endpoint * ep = (struct fd_endpoint *)li;
@@ -204 +177 @@
         }
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter  Resulting list:");
-                fd_ep_dump( 4, list );
-        }
         return 0;
 }
@@ -219 +188 @@
         CHECK_PARAMS(list);
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_family  Filter this list for family %d:", af);
-                fd_ep_dump( 4, list );
-        }
         for (li = list->next; li != list; li = li->next) {
                 struct fd_endpoint * ep = (struct fd_endpoint *)li;
@@ -233 +198 @@
         }
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_family  Resulting list:");
-                fd_ep_dump( 4, list );
-        }
         return 0;
 }
@@ -253 +214 @@
         li_ex = exclude_list->next;
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_list  Filter this list ");
-                fd_ep_dump( 4, list );
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_list  Removing from list");
-                fd_ep_dump( 6, exclude_list );
-        }
         /* Now browse both lists in parallel */
         while ((li_out != list) && (li_ex != exclude_list)) {
@@ -304 +259 @@
         }
         
-        if (TRACE_BOOL(ANNOYING + 1)) {
-                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_list  Resulting list:");
-                fd_ep_dump( 4, list );
-        }
         return 0;
 
@@ -334 +285 @@
 }
 
-void fd_ep_dump_one( char * prefix, struct fd_endpoint * ep )
-{
-        char buf[1024];
-        
-        sSA_DUMP_NODE_SERV( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV );
-        fd_log_debug("%s%s {%s%s%s%s}%s", prefix ?: "", buf,
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep )
+{
+        size_t o = 0;
+        if (!offset)
+                offset=&o;
+        
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL);
+        
+        if (!ep) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL\n"), return NULL);
+                return *buf;
+        }
+        
+        CHECK_MALLOC_DO( fd_sa_dump_node_serv( FD_DUMP_STD_PARAMS, &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ), return NULL);
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {%s%s%s%s%s}",
                         (ep->flags & EP_FL_CONF)        ? "C" : "-",
                         (ep->flags & EP_FL_DISC)        ? "D" : "-",
                         (ep->flags & EP_FL_ADV)         ? "A" : "-",
                         (ep->flags & EP_FL_LL)          ? "L" : "-",
-                        (ep->flags & EP_FL_PRIMARY)     ? "P" : "-");
-}
-
-void fd_ep_dump( int indent, struct fd_list * eps )
-{
-        struct fd_list * li;
-        for (li = eps->next; li != eps; li = li->next) {
-                struct fd_endpoint * ep = (struct fd_endpoint *)li;
-                fd_log_debug("%*s", indent, "");
-                fd_ep_dump_one( NULL, ep );
-        }
-}
-        
+                        (ep->flags & EP_FL_PRIMARY)     ? "P" : "-"), return NULL);
+        return *buf;
+}
+
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int indent, struct fd_list * eps  )
+{
+        struct fd_list * li;
+        size_t o = 0;
+        if (!offset)
+                offset=&o;
+        
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):\n", indent, "", eps), return NULL);
+        if (eps) {
+                for (li = eps->next; li != eps; li = li->next) {
+                        struct fd_endpoint * ep = (struct fd_endpoint *)li;
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s", indent+1, ""), return NULL);
+                        CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, ep ), return NULL);
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
+                }
+        }
+}
+