Changeset 706:4ffbc9f1e922 in freeDiameter for libfdcore/p_dw.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_dw.c (modified) (5 diffs)

libfdcore/p_dw.c

@@ -38 +38 @@
 /* This file contains code to handle Device Watchdog messages (DWR and DWA) */
 
-/* Check the value of Origin-State-Id is consistent in a DWR or  DWA -- we just log if it is not the case */
-static void check_state_id(struct msg * msg, struct fd_peer * peer)
+/* Check the value of Origin-State-Id is consistent in a DWR or DWA -- we return an error otherwise */
+static int check_state_id(struct msg * msg, struct fd_peer * peer)
 {
         struct avp * osi;
+        
         /* Check if the request contains the Origin-State-Id */
-        CHECK_FCT_DO( fd_msg_search_avp ( msg, fd_dict_avp_OSI, &osi ), return );
+        CHECK_FCT( fd_msg_search_avp ( msg, fd_dict_avp_OSI, &osi ) );
         if (osi) {
                 /* Check the value is consistent with the saved one */
                 struct avp_hdr * hdr;
-                CHECK_FCT_DO(  fd_msg_avp_hdr( osi, &hdr ), return  );
+                CHECK_FCT(  fd_msg_avp_hdr( osi, &hdr )  );
                 if (hdr->avp_value == NULL) {
                         /* This is a sanity check */
@@ -56 +57 @@
 
                 if (peer->p_hdr.info.runtime.pir_orstate != hdr->avp_value->u32) {
-                        fd_log_debug("Received a new Origin-State-Id from peer %s! (%x / %x)\n", 
+                        TRACE_DEBUG(INFO, "Received a new Origin-State-Id from peer '%s'! (%x -> %x); resetting the connection.\n", 
                                 peer->p_hdr.info.pi_diamid, 
-                                hdr->avp_value->u32,
-                                peer->p_hdr.info.runtime.pir_orstate );
+                                peer->p_hdr.info.runtime.pir_orstate,
+                                hdr->avp_value->u32 );
+                        return EINVAL;
                 }
         }
+        return 0;
 }
 
@@ -92 +95 @@
         
         /* Check the value of OSI for information */
-        check_state_id(*msg, peer);
+        CHECK_FCT( check_state_id(*msg, peer) );
         
         if (req) {
@@ -102 +105 @@
                 
         } else {
-                /* Just discard the DWA */
+                /* Discard the DWA */
                 CHECK_FCT_DO( fd_msg_free(*msg), /* continue */ );
                 *msg = NULL;
@@ -123 +126 @@
         
         /* If we are in REOPEN state, increment the counter */
-        fd_cpu_flush_cache();
-        if (peer->p_hdr.info.runtime.pir_state == STATE_REOPEN) {
+        if (fd_peer_getstate(peer) == STATE_REOPEN) {
                 peer->p_flags.pf_reopen_cnt += 1;