Changeset 1238:8f9684264fe0 in freeDiameter for libfdcore/p_ce.c

Timestamp:

Oct 10, 2013, 11:08:46 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Change management of the p_reqin_count counter to be updated only on routable messages. This should limit the errors in the counter value resulting from rejected or discarded link-local messages.

File:

• libfdcore/p_ce.c (modified) (5 diffs)

libfdcore/p_ce.c

@@ -635 +635 @@
         CHECK_FCT_DO( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, cer, MSGFL_ANSW_ERROR ), goto destroy );
         CHECK_FCT_DO( fd_msg_rescode_set(*cer, error->pei_errcode, error->pei_message, error->pei_avp, 1 ), goto destroy );
-        CHECK_FCT_DO( fd_out_send(cer, *recv_cnx, NULL), goto destroy );
+        CHECK_FCT_DO( fd_out_send(cer, *recv_cnx, NULL, 0), goto destroy );
         
         if (error->pei_avp_free) {
@@ -659 +659 @@
         /* Send CER on the new connection */
         CHECK_FCT( create_CER(peer, initiator, &cer) );
-        CHECK_FCT( fd_out_send(&cer, initiator, peer) );
+        CHECK_FCT( fd_out_send(&cer, initiator, peer, 0) );
         
         /* Are we doing an election ? */
@@ -714 +714 @@
 
                 /* msg now contains an answer message to send back */
-                CHECK_FCT_DO( fd_out_send(msg, NULL, peer), /* In case of error the message has already been dumped */ );
+                CHECK_FCT_DO( fd_out_send(msg, NULL, peer, 0), /* In case of error the message has already been dumped */ );
         }
         
@@ -943 +943 @@
         }
         
-        /* Update the counter to match with the answer being sent */
-        CHECK_POSIX( pthread_mutex_lock(&peer->p_state_mtx) );
-        peer->p_reqin_count++;
-        CHECK_POSIX( pthread_mutex_unlock(&peer->p_state_mtx) );
-
         /* Reply a CEA */
         CHECK_FCT( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, &msg, 0 ) );
@@ -956 +951 @@
         fd_hook_call(HOOK_PEER_CONNECT_SUCCESS, msg, peer, NULL, NULL);
         
-        CHECK_FCT( fd_out_send(&msg, peer->p_cnxctx, peer ) );
+        CHECK_FCT( fd_out_send(&msg, peer->p_cnxctx, peer, 0 ) );
         
         /* Handshake if needed */