Changeset 16:013ce9851131 in freeDiameter for freeDiameter/p_psm.c

Timestamp:

Oct 2, 2009, 6:57:06 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Started including TLS code

File:

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

freeDiameter/p_psm.c

@@ -37 +37 @@
 
 const char *peer_state_str[] = { 
-          "STATE_ZOMBIE"
+          "STATE_NEW"
         , "STATE_OPEN"
         , "STATE_CLOSED"
@@ -46 +46 @@
         , "STATE_SUSPECT"
         , "STATE_REOPEN"
+        , "STATE_ZOMBIE"
         };
 
@@ -123 +124 @@
 }
 
+/* Wait for the next event in the PSM, or timeout */
 static int psm_ev_timedget(struct fd_peer * peer, int *code, void ** data)
 {
@@ -142 +144 @@
         
         return 0;
-}       
-
-/* The state machine thread */
+}
+
+/* The state machine thread (controler) */
 static void * p_psm_th( void * arg )
 {
         struct fd_peer * peer = (struct fd_peer *)arg;
         int created_started = started;
+        int event;
+        void * ev_data;
         
         CHECK_PARAMS_DO( CHECK_PEER(peer), ASSERT(0) );
@@ -161 +165 @@
         }
         
-        /* Wait that the PSM are authorized to start in the daemon */
-        CHECK_FCT_DO( fd_psm_waitstart(), goto end );
-        
         /* The state machine starts in CLOSED state */
         peer->p_hdr.info.pi_state = STATE_CLOSED;
+        
+        /* Wait that the PSM are authorized to start in the daemon */
+        CHECK_FCT_DO( fd_psm_waitstart(), goto psm_end );
         
         /* Initialize the timer */
@@ -174 +178 @@
         }
         
-psm:
-        do {
-                int event;
-                void * ev_data;
-                
-                /* Get next event */
-                CHECK_FCT_DO( psm_ev_timedget(peer, &event, &ev_data), goto end );
-                TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p)\t'%s'",
-                                STATE_STR(peer->p_hdr.info.pi_state),
-                                fd_pev_str(event), ev_data,
-                                peer->p_hdr.info.pi_diamid);
-                
-                /* Now, the action depends on the current state and the incoming event */
-                
-        
-        } while (1);    
-        
-        
-end:    
-        /* set STATE_ZOMBIE */
-        pthread_cleanup_pop(1);
+psm_loop:
+        /* Get next event */
+        CHECK_FCT_DO( psm_ev_timedget(peer, &event, &ev_data), goto psm_end );
+        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p)\t'%s'",
+                        STATE_STR(peer->p_hdr.info.pi_state),
+                        fd_pev_str(event), ev_data,
+                        peer->p_hdr.info.pi_diamid);
+
+        /* Now, the action depends on the current state and the incoming event */
+
+        /* The following two states are impossible */
+        ASSERT( peer->p_hdr.info.pi_state != STATE_NEW );
+        ASSERT( peer->p_hdr.info.pi_state != STATE_ZOMBIE );
+
+        /* Purge invalid events */
+        if (!CHECK_EVENT(event)) {
+                TRACE_DEBUG(INFO, "Invalid event received in PSM '%s' : %d", peer->p_hdr.info.pi_diamid, event);
+                goto psm_loop;
+        }
+
+        /* Handle the (easy) debug event now */
+        if (event == FDEVP_DUMP_ALL) {
+                fd_peer_dump(peer, ANNOYING);
+                goto psm_loop;
+        }
+
+        /* Requests to terminate the peer object */
+        if (event == FDEVP_TERMINATE) {
+                switch (peer->p_hdr.info.pi_state) {
+                        case STATE_CLOSING:
+                        case STATE_WAITCNXACK:
+                        case STATE_WAITCNXACK_ELEC:
+                        case STATE_WAITCEA:
+                        case STATE_SUSPECT:
+                                /* In these cases, we just cleanup the peer object and terminate now */
+                                TODO("Cleanup the PSM: terminate connection object, ...");
+                        case STATE_CLOSED:
+                                /* Then we just terminate the PSM */
+                                goto psm_end;
+                                
+                        case STATE_OPEN:
+                        case STATE_REOPEN:
+                                /* We cannot just close the conenction, we have to send a DPR first */
+                                TODO("Send DPR, mark the peer as CLOSING");
+                                goto psm_loop;
+                }
+        }
+        
+        /* MSG_RECEIVED: fd_p_expi_update(struct fd_peer * peer ) */
+        /* If timeout or OPEN : call cb if defined */
+
+        /* Default action : the handling has not yet been implemented. */
+        TODO("Missing handler in PSM : '%s'\t<-- '%s'", STATE_STR(peer->p_hdr.info.pi_state), fd_pev_str(event));
+        if (event == FDEVP_PSM_TIMEOUT) {
+                /* We have not handled timeout in this state, let's postpone next alert */
+                psm_next_timeout(peer, 0, 60);
+        }
+        
+        goto psm_loop;
+        
+psm_end:
+        pthread_cleanup_pop(1); /* set STATE_ZOMBIE */
         return NULL;
 }       
@@ -205 +250 @@
 {
         TRACE_ENTRY("%p", peer);
-        TODO("");
-        return ENOTSUP;
+        
+        /* Check the peer and state are OK */
+        CHECK_PARAMS( CHECK_PEER(peer) && (peer->p_hdr.info.pi_state == STATE_NEW) );
+        
+        /* Create the PSM controler thread */
+        CHECK_POSIX( pthread_create( &peer->p_psm, NULL, p_psm_th, peer ) );
+        
+        /* We're done */
+        return 0;
 }
 
@@ -214 +266 @@
         TRACE_ENTRY("%p", peer);
         CHECK_PARAMS( CHECK_PEER(peer) );
-        CHECK_FCT( fd_event_send(peer->p_events, FDEVP_TERMINATE, NULL) );
+        if (peer->p_hdr.info.pi_state != STATE_ZOMBIE) {
+                CHECK_FCT( fd_event_send(peer->p_events, FDEVP_TERMINATE, NULL) );
+        } else {
+                TRACE_DEBUG(FULL, "Peer '%s' was already terminated", peer->p_hdr.info.pi_diamid);
+        }
         return 0;
 }
@@ -225 +281 @@
         TODO("Cancel IN thread");
         TODO("Cancel OUT thread");
-        TODO("Cleanup the connection");
+        TODO("Cleanup the peer connection object");
+        TODO("Cleanup the message queues (requeue)");
         return;
 }