Changeset 706:4ffbc9f1e922 in freeDiameter for libfdcore/p_cnx.c

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

• libfdcore/p_cnx.c (modified) (7 diffs)

libfdcore/p_cnx.c

@@ -36 +36 @@
 #include "fdcore-internal.h"
 
+
+/* TODO: change the behavior to handle properly forced ordering at beginning & end of OPEN state */
+
 /* This file contains code used by a peer state machine to initiate a connection to remote peer */
 
@@ -87 +90 @@
                 ret = getaddrinfo(peer->p_hdr.info.pi_diamid, NULL, &hints, &ai);
                 if (ret) {
-                        fd_log_debug("Unable to resolve address for peer '%s' (%s), aborting\n", peer->p_hdr.info.pi_diamid, gai_strerror(ret));
+                        TRACE_DEBUG(INFO, "Unable to resolve address for peer '%s' (%s), aborting\n", peer->p_hdr.info.pi_diamid, gai_strerror(ret));
                         if (ret != EAI_AGAIN)
                                 fd_psm_terminate( peer, NULL );
@@ -123 +126 @@
         /* Now check we have at least one address to attempt */
         if (FD_IS_LIST_EMPTY(&peer->p_hdr.info.pi_endpoints)) {
-                fd_log_debug("No address %savailable to connect to peer '%s', aborting\n", peer->p_hdr.info.config.pic_flags.pro3 ? "in the configured family " : "", peer->p_hdr.info.pi_diamid);
+                TRACE_DEBUG(INFO, "No address %savailable to connect to peer '%s', aborting\n", 
+                                        peer->p_hdr.info.config.pic_flags.pro3 ? "in the configured family " : "", peer->p_hdr.info.pi_diamid);
                 fd_psm_terminate( peer, NULL );
                 return 0;
@@ -219 +223 @@
         {
                 char buf[48];
-                sprintf(buf, "ConnTo:%.*s", (int)(sizeof(buf)) - 8, peer->p_hdr.info.pi_diamid);
+                snprintf(buf, sizeof(buf), "ConnTo:%s", peer->p_hdr.info.pi_diamid);
                 fd_log_threadname ( buf );
         }
@@ -247 +251 @@
 #ifndef DISABLE_SCTP                    
                         case IPPROTO_SCTP:
-                                cnx = fd_cnx_cli_connect_sctp((peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP) ?: fd_g_config->cnf_flags.no_ip6, nc->port, &peer->p_hdr.info.pi_endpoints);
+                                cnx = fd_cnx_cli_connect_sctp((peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP) ?: fd_g_config->cnf_flags.no_ip6, 
+                                                        nc->port, &peer->p_hdr.info.pi_endpoints);
                                 break;
 #endif /* DISABLE_SCTP */
@@ -260 +265 @@
                 pthread_testcancel();
                 
-        } while (!cnx); /* and until cancellation */
+        } while (!cnx); /* and until cancellation or all addresses attempted without success */
         
         /* Now, we have an established connection in cnx */
@@ -274 +279 @@
                         {
                                 /* Handshake failed ...  */
-                                fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
+                                TRACE_DEBUG(INFO, "TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
                                 fd_cnx_destroy(cnx);
                                 empty_connection_list(peer);