Changeset 1103:d8591b1c56cd in freeDiameter for libfdcore/cnxctx.c

Timestamp:

May 10, 2013, 7:48:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implemented a few hooks

File:

• libfdcore/cnxctx.c (modified) (15 diffs)

libfdcore/cnxctx.c

@@ -228 +228 @@
         CHECK_SYS_DO( cli_sock = accept(serv->cc_socket, (sSA *)&ss, &ss_len), return NULL );
         
-        if (TRACE_BOOL(INFO)) {
-                char buf[1024];
-                sSA_DUMP_NODE( buf, sizeof(buf), &ss, NI_NUMERICHOST );
-                fd_log_debug("%s : accepted new client [%s].", fd_cnx_getid(serv), buf);
-        }
-        
         CHECK_MALLOC_DO( cli = fd_cnx_init(1), { shutdown(cli_sock, SHUT_RDWR); close(cli_sock); return NULL; } );
         cli->cc_socket = cli_sock;
@@ -264 +258 @@
                         snprintf(cli->cc_remid, sizeof(cli->cc_remid), "[err:%s]", gai_strerror(rc));
         }
+        
+        LOG_D("Incoming connection: '%s' <- '%s'   {%s}", fd_cnx_getid(serv), cli->cc_remid, cli->cc_id);
 
 #ifndef DISABLE_SCTP
@@ -275 +271 @@
                         cli->cc_sctp_para.pairs = cli->cc_sctp_para.str_in;
                 
-                TRACE_DEBUG(FULL,"%s : client '%s' (SCTP:%d, %d/%d streams)", fd_cnx_getid(serv), fd_cnx_getid(cli), cli->cc_socket, cli->cc_sctp_para.str_in, cli->cc_sctp_para.str_out);
+                LOG_A( "%s : client '%s' (SCTP:%d, %d/%d streams)", fd_cnx_getid(serv), fd_cnx_getid(cli), cli->cc_socket, cli->cc_sctp_para.str_in, cli->cc_sctp_para.str_out);
         }
 #endif /* DISABLE_SCTP */
@@ -287 +283 @@
         int sock = 0;
         struct cnxctx * cnx = NULL;
+        char sa_buf[sSA_DUMP_STRLEN];
         
         TRACE_ENTRY("%p %d", sa, addrlen);
         CHECK_PARAMS_DO( sa && addrlen, return NULL );
+        
+        fd_sa_sdump_numeric(sa_buf, sa);
         
         /* Create the socket and connect, which can take some time and/or fail */
@@ -295 +294 @@
                 int ret = fd_tcp_client( &sock, sa, addrlen );
                 if (ret != 0) {
-                        int lvl;
-                        switch (ret) {
-                                case ECONNREFUSED:
-
-                                        /* "Normal" errors */
-                                        lvl = FULL;
-                                        break;
-                                default:
-                                        lvl = INFO;
-                        }
-                        /* Some errors are expected, we log at different level */
-                        TRACE_DEBUG( lvl, "fd_tcp_client returned an error: %s", strerror(ret));
+                        LOG_A("TCP connection to %s failed: %s", sa_buf, strerror(ret));
                         return NULL;
                 }
-        }
-        
-        if (TRACE_BOOL(INFO)) {
-                char buf[1024];
-                sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICSERV);
-                fd_log_debug("Connection established to server '%s' (TCP:%d).", buf, sock);
         }
         
@@ -329 +311 @@
         /* Generate the names for the object */
         {
-                char addrbuf[INET6_ADDRSTRLEN];
-                char portbuf[10];
                 int  rc;
                 
-                /* Numeric values for debug... */
-                rc = getnameinfo(sa, addrlen, addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-                if (rc) {
-                        snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-                        portbuf[0] = '\0';
-                }
-                
-                snprintf(cnx->cc_id, sizeof(cnx->cc_id), "TCP to [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
+                snprintf(cnx->cc_id, sizeof(cnx->cc_id), "TCP,#%d->%s", cnx->cc_socket, sa_buf);
                 
                 /* ...Name for log messages */
@@ -347 +320 @@
                         snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
         }
+        
+        LOG_A("TCP connection to %s succeed (socket:%d).", sa_buf, sock);
         
         return cnx;
@@ -362 +337 @@
         int sock = 0;
         struct cnxctx * cnx = NULL;
+        char sa_buf[sSA_DUMP_STRLEN];
         sSS primary;
         
         TRACE_ENTRY("%p", list);
         CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
+        
+        fd_sa_sdump_numeric(sa_buf, &((struct fd_endpoint *)(list->next))->sa);
         
         {
                 int ret = fd_sctp_client( &sock, no_ip6, port, list );
                 if (ret != 0) {
-                        int lvl;
-                        switch (ret) {
-                                case ECONNREFUSED:
-
-                                        /* "Normal" errors */
-                                        lvl = FULL;
-                                        break;
-                                default:
-                                        lvl = INFO;
-                        }
-                        /* Some errors are expected, we log at different level */
-                        TRACE_DEBUG( lvl, "fd_sctp_client returned an error: %s", strerror(ret));
+                        LOG_A("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
                         return NULL;
                 }
@@ -403 +370 @@
                 cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_in;
         
-        if (TRACE_BOOL(INFO)) {
-                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).", buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
-        }
+        fd_sa_sdump_numeric(sa_buf, (sSA *)&primary);
         
         /* Generate the names for the object */
         {
-                char addrbuf[INET6_ADDRSTRLEN];
-                char portbuf[10];
                 int  rc;
                 
-                /* Numeric values for debug... */
-                rc = getnameinfo((sSA *)&primary, sSAlen(&primary), addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-                if (rc) {
-                        snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-                        portbuf[0] = '\0';
-                }
-                
-                snprintf(cnx->cc_id, sizeof(cnx->cc_id), "SCTP to [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
+                snprintf(cnx->cc_id, sizeof(cnx->cc_id), "SCTP,#%d->%s", cnx->cc_socket, sa_buf);
                 
                 /* ...Name for log messages */
@@ -429 +383 @@
                         snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
         }
+        
+        LOG_A("SCTP connection to %s succeed (socket:%d, %d/%d streams).", sa_buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
         
         return cnx;
@@ -678 +634 @@
 size_t fd_msg_pmdl_sizewithoverhead(size_t datalen)
 {
-        return PMDL_PADDED(datalen);
+        return PMDL_PADDED(datalen) + sizeof(struct fd_msg_pmdl);
 }
 
@@ -698 +654 @@
         uint8_t * ret = NULL;
         
-        CHECK_MALLOC_DO(  ret = malloc( PMDL_PADDED(expected_len) ), return NULL );
+        CHECK_MALLOC_DO(  ret = malloc( fd_msg_pmdl_sizewithoverhead(expected_len) ), return NULL );
         CHECK_FCT_DO( fd_cnx_init_msg_buffer(ret, expected_len, pmdl), {free(ret); return NULL;} );
         return ret;
@@ -707 +663 @@
         uint8_t * ret = NULL;
         
-        CHECK_MALLOC_DO(  ret = realloc( buffer, PMDL_PADDED(expected_len) ), return NULL );
+        CHECK_MALLOC_DO(  ret = realloc( buffer, fd_msg_pmdl_sizewithoverhead(expected_len) ), return NULL );
         CHECK_FCT_DO( fd_cnx_init_msg_buffer(ret, expected_len, pmdl), {free(ret); return NULL;} );
         return ret;
@@ -762 +718 @@
                    || (rcv_data.length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        LOG_E( "Received suspect header [ver: %d, size: %zd], assuming disconnection", (int)header[0], rcv_data.length);
+                        LOG_E( "Received suspect header [ver: %d, size: %zd] from '%s', assuming disconnection", (int)header[0], rcv_data.length, conn->cc_remid);
                         fd_cnx_markerror(conn);
                         goto out; /* Stop the thread, the recipient of the event will cleanup */
@@ -1004 +960 @@
                    || (rcv_data.length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        LOG_E( "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], rcv_data.length);
+                        LOG_E( "Received suspect header [ver: %d, size: %zd] from '%s', assume disconnection", (int)header[0], rcv_data.length, conn->cc_remid);
                         fd_cnx_markerror(conn);
                         goto out;