Changeset 961:d95cd3ca9e8d in freeDiameter for libfdcore/cnxctx.c

Timestamp:

Mar 7, 2013, 4:09:54 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

960:f39fa6cd86e0 (diff), 933:04f590da5821 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge latest 1.1 branch (one commit post 1.1.6)

Files:

• libfdcore/cnxctx.c (modified) (3 diffs)
• libfdcore/cnxctx.c (modified) (2 diffs)

libfdcore/cnxctx.c

@@ -229 +229 @@
         
         if (TRACE_BOOL(INFO)) {
-                fd_log_debug("%s : accepted new client [", fd_cnx_getid(serv));
-                sSA_DUMP_NODE( &ss, NI_NUMERICHOST );
-                fd_log_debug("].\n");
+                char buf[1024];
+                sSA_DUMP_NODE( buf, sizeof(buf), &ss, NI_NUMERICHOST );
+                fd_log_debug("%s : accepted new client [%s].\n", fd_cnx_getid(serv), buf);
         }
         
@@ -312 +312 @@
         
         if (TRACE_BOOL(INFO)) {
-                fd_log_debug("Connection established to server '");
-                sSA_DUMP_NODE_SERV( sa, NI_NUMERICSERV);
-                fd_log_debug("' (TCP:%d).\n", sock);
+                char buf[1024];
+                sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICSERV);
+                fd_log_debug("Connection established to server '%s' (TCP:%d).\n", buf, sock);
         }
         
@@ -404 +404 @@
         
         if (TRACE_BOOL(INFO)) {
-                fd_log_debug("Connection established to server '");
-                sSA_DUMP_NODE_SERV( &primary, NI_NUMERICSERV);
-                fd_log_debug("' (SCTP:%d, %d/%d streams).\n", sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
+                char buf[1024];
+                sSA_DUMP_NODE_SERV( buf, sizeof(buf), &primary, NI_NUMERICSERV);
+                fd_log_debug("Connection established to server '%s' (SCTP:%d, %d/%d streams).\n", buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
         }
         

libfdcore/cnxctx.c

@@ -3 +3 @@
 * Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
 *                                                                                                        *
-* Copyright (c) 2012, WIDE Project and NICT                                                              *
+* Copyright (c) 2013, WIDE Project and NICT                                                              *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -561 +561 @@
                         continue;
                 
+                if (cur->ifa_addr == NULL) /* may happen with ppp interfaces */
+                        continue;
+                
                 if (fd_g_config->cnf_flags.no_ip4 && (cur->ifa_addr->sa_family == AF_INET))
                         continue;