Changeset 131:50d1dc19b221 in freeDiameter

Timestamp:

Dec 10, 2009, 5:18:59 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Hopefully removed infinite loop

Files:

• freeDiameter/p_ce.c (modified) (6 diffs)
• freeDiameter/p_psm.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)

freeDiameter/p_ce.c

@@ -261 +261 @@
 
 /* Extract information sent by the remote peer and save it in our peer structure */
-static int save_remote_CE_info(struct msg * msg, struct fd_peer * peer, char ** error_code)
+static int save_remote_CE_info(struct msg * msg, struct fd_peer * peer, char ** error_code, uint32_t *rc)
 {
         struct avp * avp = NULL;
@@ -292 +292 @@
                                 }
                                 
-                                /* We check that the CEA Result-Code is Success, otherwise we disconnect */
-                                if (hdr->avp_value->u32 != ER_DIAMETER_SUCCESS) {
-                                        TRACE_DEBUG(INFO, "Received CEA with Result-Code %d (expected %d), disconnect", hdr->avp_value->u32, ER_DIAMETER_SUCCESS);
-                                        return EBADMSG;
-                                }
-
+                                if (rc)
+                                        *rc = hdr->avp_value->u32;
                                 break;
                 
@@ -640 +636 @@
 {
         char * ec;
+        uint32_t rc = 0;
         TRACE_ENTRY("%p %p", msg, peer);
         CHECK_PARAMS( msg && *msg && CHECK_PEER(peer) );
@@ -672 +669 @@
         
         /* Save info from the CEA into the peer */
-        CHECK_FCT_DO( save_remote_CE_info(*msg, peer, &ec), goto cleanup );
+        CHECK_FCT_DO( save_remote_CE_info(*msg, peer, &ec, &rc), goto cleanup );
         
         /* Dispose of the message, we don't need it anymore */
         CHECK_FCT_DO( fd_msg_free(*msg), /* continue */ );
         *msg = NULL;
+        
+        /* Check the Result-Code */
+        switch (rc) {
+                case ER_DIAMETER_SUCCESS:
+                        /* No problem, we can continue */
+                        break;
+                        
+                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_psm_cleanup(peer, 0);
+                        fd_psm_next_timeout(peer, 0, 300);
+                        return 0;
+                
+                case ER_ELECTION_LOST:
+                        /* Ok, just wait for a little while for the CER to be processed on the other connection. */
+                        TRACE_DEBUG(FULL, "Peer %s replied a CEA with Result-Code AVP ELECTION_LOST, waiting for events.", peer->p_hdr.info.pi_diamid);
+                        return 0;
+                
+                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 AVP %d, aborting connection attempts.", peer->p_hdr.info.pi_diamid, rc);
+                        return EINVAL;
+        }
         
         /* Handshake if needed, start clear otherwise */
@@ -713 +734 @@
         
 cleanup:
-        if (*msg) {
-                CHECK_FCT_DO( fd_msg_free(*msg), /* continue */ );
-                *msg = NULL;
-        }
-
         fd_p_ce_clear_cnx(peer, NULL);
 
@@ -741 +757 @@
         
         /* Parse the content of the received CER */
-        CHECK_FCT_DO( save_remote_CE_info(msg, peer, &ec), goto error_abort );
+        CHECK_FCT_DO( save_remote_CE_info(msg, peer, &ec, NULL), goto error_abort );
         
         /* Validate the peer if needed */

freeDiameter/p_psm.c

@@ -532 +532 @@
                                 break;
                         
+                        case STATE_WAITCEA:
                         case STATE_OPEN:
                         case STATE_REOPEN:
                         case STATE_WAITCNXACK:
-                        case STATE_WAITCEA:
                         case STATE_SUSPECT:
                         default:

include/freeDiameter/libfreeDiameter.h

@@ -1383 +1383 @@
 #define ER_DIAMETER_TOO_BUSY                    3004
 #define ER_DIAMETER_REDIRECT_INDICATION         3006
+#define ER_ELECTION_LOST                        4003