Changeset 382:7f042dc6c6e9 in freeDiameter

Timestamp:

Jul 5, 2010, 5:42:12 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added debug information for endpoints

File:

• freeDiameter/endpoints.c (modified) (12 diffs)

freeDiameter/endpoints.c

@@ -53 +53 @@
         CHECK_PARAMS( list && sa && (sl <= sizeof(sSS)) );
         
+        if (TRACE_BOOL(ANNOYING + 1)) {
+                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("    ");
+                sSA_DUMP_NODE_SERV( sa, NI_NUMERICHOST | NI_NUMERICSERV );
+                fd_log_debug(" {%s%s%s%s}\n", 
+                                (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;
         
@@ -64 +77 @@
                                  || IN_EXPERIMENTAL(ptr.sin->sin_addr.s_addr)
                                  || IN_BADCLASS(ptr.sin->sin_addr.s_addr)
-                                 || (ptr.sin->sin_addr.s_addr == INADDR_BROADCAST))
+                                 || (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.");
+                                        }
                                         return 0;
+                                }
                         }
                         port = &ptr.sin->sin_port;
@@ -76 +93 @@
                                  || IN6_IS_ADDR_MULTICAST(&ptr.sin6->sin6_addr)
                                  || IN6_IS_ADDR_LINKLOCAL(&ptr.sin6->sin6_addr)
-                                 || IN6_IS_ADDR_SITELOCAL(&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.");
+                                        }
                                         return 0;
+                                }
                         }
                         port = &ptr.sin6->sin6_port;
@@ -83 +104 @@
 
                 default:
+                        if (TRACE_BOOL(ANNOYING + 1)) {
+                                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Address family was unknown, not added.");
+                        }
                         return 0;
         }
@@ -111 +135 @@
                                 break;
                         default:
-                                /* Filter this out */
-                                return 0;
+                                ASSERT( 0 ); /* we got a different value previously in this same function */
                 }
                 if (cmp < 0)
@@ -148 +171 @@
         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;
 }
@@ -159 +186 @@
         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;
@@ -169 +200 @@
         }
         
+        if (TRACE_BOOL(ANNOYING + 1)) {
+                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter  Resulting list:");
+                fd_ep_dump( 4, list );
+        }
         return 0;
 }
@@ -180 +215 @@
         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;
@@ -190 +229 @@
         }
         
+        if (TRACE_BOOL(ANNOYING + 1)) {
+                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_family  Resulting list:");
+                fd_ep_dump( 4, list );
+        }
         return 0;
 }
@@ -206 +249 @@
         li_ex = exclude_list;
         
+        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)) {
@@ -250 +299 @@
                 free(li);
         }
+        
+        if (TRACE_BOOL(ANNOYING + 1)) {
+                TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_filter_list  Resulting list:");
+                fd_ep_dump( 4, list );
+        }
         return 0;