Changeset 23:db6c40b8b307 in freeDiameter for include

Timestamp:

Oct 20, 2009, 5:30:20 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added some code in cnxctx.c mainly

Location:

include/freeDiameter

Files:

• CMakeLists.txt (modified) (1 diff)
• freeDiameter-host.h.in (modified) (1 diff)
• freeDiameter.h (modified) (2 diffs)
• libfreeDiameter.h (modified) (1 diff)

include/freeDiameter/CMakeLists.txt

@@ -10 +10 @@
 
 # Disable SCTP support completly ?
-OPTION(DISABLE_SCTP "Disable SCTP support?")
+OPTION(DISABLE_SCTP "Disable SCTP support?" OFF)
+IF (NOT DISABLE_SCTP)
+        OPTION(DEBUG_SCTP "Verbose SCTP (for debug)?" OFF)
+ENDIF (NOT DISABLE_SCTP)
 
 # Find TODO items in the code easily ?

include/freeDiameter/freeDiameter-host.h.in

@@ -45 +45 @@
 
 #cmakedefine DISABLE_SCTP
+#cmakedefine DEBUG_SCTP
 #cmakedefine ERRORS_ON_TODO
 #cmakedefine DEBUG

include/freeDiameter/freeDiameter.h

@@ -118 +118 @@
 struct fd_endpoint {
         struct fd_list  chain;  /* link in cnf_endpoints list */
-        sSS             ss;     /* the socket information. List is always ordered by ss value (memcmp) */
+        union {
+                sSS             ss;     /* the socket information. List is always ordered by ss value (memcmp) */
+                sSA4            sin;
+                sSA6            sin6;
+                sSA             sa;
+        };
         struct {
                 unsigned conf : 1; /* This endpoint is statically configured in a configuration file */
@@ -129 +134 @@
         }               meta;   /* Additional information about the endpoint */
 };
+
+/* Add a new entry in a list of endpoints -- merge if the sockaddr was already there */
+int fd_ep_add_merge( struct fd_list * list, sSA * sa, socklen_t sl, int conf, int disc, int adv, int ll );
 
 /* Applications */

include/freeDiameter/libfreeDiameter.h

@@ -329 +329 @@
                         flag);                                  \
           if (__rc)                                             \
-                fd_log_debug((char *)gai_strerror(__rc));       \
+                fd_log_debug("%s", (char *)gai_strerror(__rc)); \
           else                                                  \
-                fd_log_debug(&__addrbuf[0]);                    \
+                fd_log_debug("%s", &__addrbuf[0]);              \
         } else {                                                \
                 fd_log_debug("(NULL / ANY)");                   \
         }                                                       \
 }
-/* if needed, add sSA_DUMP_SERVICE */
+/* Same, for a service */
+#define sSA_DUMP_SERV( sa, flag ) {                             \
+        sSA * __sa = (sSA *)(sa);                               \
+        char __servbuf[32];                                     \
+        if (__sa) {                                             \
+          int __rc = getnameinfo(__sa,                          \
+                        sizeof(sSS),                            \
+                        NULL,                                   \
+                        0,                                      \
+                        __servbuf,                              \
+                        sizeof(__servbuf),                      \
+                        flag);                                  \
+          if (__rc)                                             \
+                fd_log_debug("%s", (char *)gai_strerror(__rc)); \
+          else                                                  \
+                fd_log_debug("%s", &__servbuf[0]);              \
+        } else {                                                \
+                fd_log_debug("(unknown)");                      \
+        }                                                       \
+}
+/* Combine both */
+#define sSA_DUMP_NODE_SERV( sa, flag ) {                                \
+        sSA * __sa = (sSA *)(sa);                                       \
+        char __addrbuf[INET6_ADDRSTRLEN];                               \
+        char __servbuf[32];                                             \
+        if (__sa) {                                                     \
+          int __rc = getnameinfo(__sa,                                  \
+                        sizeof(sSS),                                    \
+                        __addrbuf,                                      \
+                        sizeof(__addrbuf),                              \
+                        __servbuf,                                      \
+                        sizeof(__servbuf),                              \
+                        flag);                                          \
+          if (__rc)                                                     \
+                fd_log_debug("%s", (char *)gai_strerror(__rc));         \
+          else                                                          \
+                fd_log_debug("[%s]:%s", &__addrbuf[0],&__servbuf[0]);   \
+        } else {                                                        \
+                fd_log_debug("(NULL / ANY)");                           \
+        }                                                               \
+}
+
 
 /* A l4 protocol name (TCP / SCTP) */