Changeset 1113:eb4ce68b6e5c in freeDiameter for libfdcore/endpoints.c

Timestamp:

May 13, 2013, 8:17:13 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Added calls to remaining hooks

File:

• libfdcore/endpoints.c (modified) (3 diffs)

libfdcore/endpoints.c

@@ -285 +285 @@
 }
 
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep )
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, int preamble, struct fd_endpoint * ep )
 {
         FD_DUMP_HANDLE_OFFSET();
         
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL);
+        if (preamble) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL);
+        }
         
         if (!ep) {
@@ -297 +299 @@
         
         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" : "-"), 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" : "-"), return NULL);
         return *buf;
 }
 
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int indent, struct fd_list * eps  )
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int preamble, int indent, struct fd_list * eps  )
 {
         struct fd_list * li;
@@ -312 +314 @@
         FD_DUMP_HANDLE_OFFSET();
         
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):", indent, "", eps), return NULL);
+        if (preamble) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):", 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, "\n%*s", indent+1, ""), return NULL);
-                        CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, ep ), return NULL);
-                }
-        }
-}
-        
+                        if (preamble) {
+                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*s", indent+1, ""), return NULL);
+                        } else if (li->prev != eps) {
+                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\t"), return NULL);
+                        }
+                        CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, preamble, ep ), return NULL);
+                }
+        }
+}
+