Changeset 74:9dcb1bd11a07 in freeDiameter for freeDiameter/p_psm.c

Timestamp:

Dec 1, 2009, 2:14:34 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some cleanups

File:

• freeDiameter/p_psm.c (modified) (4 diffs)

freeDiameter/p_psm.c

@@ -236 +236 @@
         peer->p_psm_timer.tv_sec += delay;
         
+        TRACE_DEBUG(FULL, "Peer timeout reset to %d seconds%s", delay, add_random ? " (+/- 2)", "" );
+        
 #ifdef SLOW_PSM
         /* temporary for debug */
@@ -246 +248 @@
 {
         /* Move to CLOSED state: failover messages, stop OUT thread, unlink peer from active list */
-        CHECK_FCT_DO( fd_psm_change_state(peer, STATE_CLOSED), /* continue */ );
+        if (peer->p_hdr.info.runtime.pir_state != STATE_ZOMBIE) {
+                CHECK_FCT_DO( fd_psm_change_state(peer, STATE_CLOSED), /* continue */ );
+        }
         
         fd_p_cnx_abort(peer, terminate);
@@ -514 +518 @@
                 switch (peer->p_hdr.info.runtime.pir_state) {
                         case STATE_WAITCNXACK_ELEC:
-                                TODO("Reply CEA on the receiver side and go to OPEN state");
-                                goto psm_loop;
+                                /* Abort the initiating side */
+                                fd_p_cnx_abort(peer, 0);
+                                /* Process the receiver side */
+                                CHECK_FCT_DO( fd_p_ce_process_receiver(peer), goto psm_end );
+                                break;
                         
                         case STATE_OPEN:
@@ -534 +541 @@
                                 
                         case STATE_CLOSED:
-                                /* Go to the next event */
-                                goto psm_loop;
-                }
+                                /* Just ignore */
+                                ;
+                }
+                goto psm_loop;
         }