Changeset 1103:d8591b1c56cd in freeDiameter for libfdcore/p_ce.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/p_ce.c (modified) (15 diffs)

libfdcore/p_ce.c

@@ -671 +671 @@
                         fd_cnx_destroy(initiator);
 
+                        LOG_D("%s: Election lost on outgoing connection, closing and answering CEA on incoming connection.", peer->p_hdr.info.pi_diamid);
+                        
                         /* Process with the receiver side */
                         CHECK_FCT( fd_p_ce_process_receiver(peer) );
@@ -678 +680 @@
                         memset(&pei, 0, sizeof(pei));
                         pei.pei_errcode = "ELECTION_LOST";
+                        pei.pei_message = "Please answer my CER instead, you won the election.";
+                        LOG_D("%s: Election lost on incoming connection, closing and waiting for CEA on outgoing connection.", peer->p_hdr.info.pi_diamid);
 
                         /* Answer an ELECTION LOST to the receiver side */
@@ -720 +724 @@
         if (req || ((st = fd_peer_getstate(peer)) != STATE_WAITCEA)) {
                 if (*msg) {
-                        //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Received CER/CEA while in '%s' state.", STATE_STR(st));
+                        /* In such case, just discard the message */
+                        char buf[128];
+                        snprintf(buf, sizeof(buf), "Received while peer state machine was in state %s.", STATE_STR(st));
+                        fd_hook_call(HOOK_MESSAGE_DROPPED, *msg, peer, buf, fd_msg_pmdl_get(*msg));
+
                         CHECK_FCT_DO( fd_msg_free(*msg), /* continue */);
                         *msg = NULL;
@@ -731 +739 @@
         
         /* Save info from the CEA into the peer */
-        CHECK_FCT_DO( save_remote_CE_info(*msg, peer, &pei, &rc), goto cleanup );
-        
-        /* Dispose of the message, we don't need it anymore */
-        CHECK_FCT_DO( fd_msg_free(*msg), /* continue */ );
-        *msg = NULL;
+        CHECK_FCT_DO( save_remote_CE_info(*msg, peer, &pei, &rc), 
+                {
+                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, *msg, peer, "An error occurred while processing incoming CEA.", NULL);
+                        goto cleanup;
+                } );
         
         /* Check the Result-Code */
         switch (rc) {
                 case ER_DIAMETER_SUCCESS:
+                        /* Log success */
+                        fd_hook_call(HOOK_PEER_CONNECT_SUCCESS, *msg, peer, NULL, NULL);
+                        
+                        /* Dispose of the message, we don't need it anymore */
+                        CHECK_FCT_DO( fd_msg_free(*msg), /* continue */ );
+                        *msg = NULL;
+                        
                         /* No problem, we can continue */
                         break;
@@ -745 +760 @@
                 case ER_DIAMETER_TOO_BUSY:
                         /* Retry later */
-                        TRACE_DEBUG(INFO, "Peer %s replied a CEA with Result-Code AVP DIAMETER_TOO_BUSY, will retry later.", peer->p_hdr.info.pi_diamid);
+                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, *msg, peer, "Remote peer is too busy", NULL);
                         fd_psm_cleanup(peer, 0);
                         fd_psm_next_timeout(peer, 0, 300);
@@ -757 +772 @@
                 default:
                         /* In any other case, we abort all attempts to connect to this peer */
-                        TRACE_DEBUG(INFO, "Peer %s replied a CEA with Result-Code %d, aborting connection attempts.", peer->p_hdr.info.pi_diamid, rc);
+                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, *msg, peer, "CEA with unexpected error code", NULL);
                         return EINVAL;
         }
+        
         
         /* Handshake if needed, start clear otherwise */
@@ -778 +794 @@
                                 {
                                         /* Handshake failed ...  */
-                                        fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection", peer->p_hdr.info.pi_diamid);
+                                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, NULL, peer, "TLS handshake failed after CER/CEA exchange", NULL);
                                         goto cleanup;
                                 } );
@@ -818 +834 @@
         TRACE_ENTRY("%p", peer);
         
-        CHECK_FCT( set_peer_cnx(peer, &peer->p_receiver) );
+        CHECK_FCT_DO( set_peer_cnx(peer, &peer->p_receiver),
+                {
+                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, NULL, peer, "Error saving the incoming connection in the peer structure", NULL);
+                        return __ret__;
+                } );
         msg = peer->p_cer;
         peer->p_cer = NULL;
@@ -928 +948 @@
         CHECK_FCT( fd_msg_rescode_set(msg, "DIAMETER_SUCCESS", NULL, NULL, 0 ) );
         CHECK_FCT( add_CE_info(msg, peer->p_cnxctx, isi & PI_SEC_TLS_OLD, isi & PI_SEC_NONE) );
+        
+        /* The connection is complete, but we may still need TLS handshake */
+        fd_hook_call(HOOK_PEER_CONNECT_SUCCESS, msg, peer, NULL, NULL);
+        
         CHECK_FCT( fd_out_send(&msg, peer->p_cnxctx, peer, FD_CNX_ORDERED ) );
         
@@ -936 +960 @@
                         {
                                 /* Handshake failed ...  */
-                                fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection", peer->p_hdr.info.pi_diamid);
+                                fd_hook_call(HOOK_PEER_CONNECT_FAILED, NULL, peer, "TLS handshake failed after CER/CEA exchange", NULL);
                                 goto cleanup;
                         } );
                 
                 /* Retrieve the credentials */
-                CHECK_FCT( fd_cnx_getcred(peer->p_cnxctx, &peer->p_hdr.info.runtime.pir_cert_list, &peer->p_hdr.info.runtime.pir_cert_list_size) );
+                CHECK_FCT_DO( fd_cnx_getcred(peer->p_cnxctx, &peer->p_hdr.info.runtime.pir_cert_list, &peer->p_hdr.info.runtime.pir_cert_list_size),
+                        {
+                                /* Error ...  */
+                                fd_hook_call(HOOK_PEER_CONNECT_FAILED, NULL, peer, "Unable to retrieve remote credentials after TLS handshake", NULL);
+                                goto cleanup;
+                        } );
+                
                 
                 /* Call second validation callback if needed */
@@ -948 +978 @@
                         CHECK_FCT_DO( (*peer->p_cb2)( &peer->p_hdr.info ),
                                 {
-                                        TRACE_DEBUG(INFO, "Validation callback rejected the peer %s after handshake", peer->p_hdr.info.pi_diamid);
+                                        fd_hook_call(HOOK_PEER_CONNECT_FAILED, NULL, peer, "Validation callback rejected the peer after handshake", NULL);
                                         CHECK_FCT( fd_psm_terminate( peer, "DO_NOT_WANT_TO_TALK_TO_YOU" ) );
                                         return 0;
@@ -982 +1012 @@
         if (pei.pei_errcode) {
                 /* Send the error */
+                fd_hook_call(HOOK_PEER_CONNECT_FAILED, msg, peer, pei.pei_message ?: pei.pei_errcode, NULL);
                 receiver_reject(&peer->p_cnxctx, &msg, &pei);
+        } else {
+                char buf[1024];
+                snprintf(buf, sizeof(buf), "Unexpected error occurred while processing incoming connection from '%s'.", peer->p_hdr.info.pi_diamid);
+                fd_hook_call(HOOK_PEER_CONNECT_FAILED, msg, peer, buf, NULL);
         }
         
 cleanup:
         if (msg) {
-                //fd_msg_log(FD_MSG_LOG_DROPPED, msg, "An error occurred while processing a CER.");
                 fd_msg_free(msg);
         }
@@ -1027 +1061 @@
                                 
                                 /* Close initiator connection (was already set as principal) */
+                                LOG_D("%s: Election lost on outgoing connection, closing and answering CEA on incoming connection.", peer->p_hdr.info.pi_diamid);
                                 fd_p_ce_clear_cnx(peer, NULL);
                                 
@@ -1041 +1076 @@
                                 pei.pei_errcode = "ELECTION_LOST";
                                 pei.pei_message = "Please answer my CER instead, you won the election.";
+                                LOG_D("%s: Election lost on incoming connection, closing and waiting for CEA on outgoing connection.", peer->p_hdr.info.pi_diamid);
                                 receiver_reject(cnx, msg, &pei);
                         }
@@ -1048 +1084 @@
                         pei.pei_errcode = "DIAMETER_UNABLE_TO_COMPLY"; /* INVALID COMMAND? in case of Capabilities-Updates? */
                         pei.pei_message = "Invalid state to receive a new connection attempt.";
+                        LOG_E("%s: Rejecting new connection attempt while our state machine is in state '%s'", peer->p_hdr.info.pi_diamid, STATE_STR(cur_state));
                         receiver_reject(cnx, msg, &pei);
         }