Changeset 1238:8f9684264fe0 in freeDiameter for libfdcore/p_psm.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_psm.c (modified) (4 diffs)

libfdcore/p_psm.c

@@ -527 +527 @@
                         CHECK_FCT_DO( fd_msg_answ_associate( msg, req ), goto psm_end );
                         
-                } else {
-                        /* Mark the incoming request so that we know we have pending answers for this peer */
-                        CHECK_POSIX_DO( pthread_mutex_lock(&peer->p_state_mtx), goto psm_end  );
-                        peer->p_reqin_count++;
-                        CHECK_POSIX_DO( pthread_mutex_unlock(&peer->p_state_mtx), goto psm_end  );
                 }
                 
@@ -560 +555 @@
                                         CHECK_FCT_DO( fd_msg_source_setrr( msg, peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen, fd_g_config->cnf_dict ), goto psm_end);
 
+                                        if ((hdr->msg_flags & CMD_FLAG_REQUEST)) {
+                                                /* Mark the incoming request so that we know we have pending answers for this peer */
+                                                CHECK_POSIX_DO( pthread_mutex_lock(&peer->p_state_mtx), goto psm_end  );
+                                                peer->p_reqin_count++;
+                                                CHECK_POSIX_DO( pthread_mutex_unlock(&peer->p_state_mtx), goto psm_end  );
+                                        }
+                                                
                                         /* Requeue to the global incoming queue */
                                         CHECK_FCT_DO(fd_fifo_post(fd_g_incoming, &msg), goto psm_end );
@@ -601 +603 @@
                                 if (msg == NULL) {
                                         /* Send the error back to the peer */
-                                        CHECK_FCT_DO( ret = fd_out_send(&error, NULL, peer),  );
+                                        CHECK_FCT_DO( ret = fd_out_send(&error, NULL, peer, 0),  );
                                         if (error) {
                                                 char buf[256];
@@ -655 +657 @@
 
                                                 /* Send the answer */
-                                                CHECK_FCT_DO( fd_out_send(&msg, peer->p_cnxctx, peer), break );
+                                                CHECK_FCT_DO( fd_out_send(&msg, peer->p_cnxctx, peer, 0), break );
                                         } while (0);
                                 } else {