Changes in freeDiameter/p_psm.c [29:5ba91682f0bc:20:277ec00d793e] in freeDiameter

File:

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

freeDiameter/p_psm.c

@@ -55 +55 @@
         #define case_str( _val )\
                 case _val : return #_val
+                case_str(FDEVP_TERMINATE);
                 case_str(FDEVP_DUMP_ALL);
-                case_str(FDEVP_TERMINATE);
-                case_str(FDEVP_CNX_MSG_RECV);
-                case_str(FDEVP_CNX_ERROR);
-                case_str(FDEVP_CNX_EP_CHANGE);
-                case_str(FDEVP_CNX_INCOMING);
+                case_str(FDEVP_MSG_INCOMING);
                 case_str(FDEVP_PSM_TIMEOUT);
                 
@@ -128 +125 @@
 }
 
+/* Wait for the next event in the PSM, or timeout */
+static int psm_ev_timedget(struct fd_peer * peer, int *code, void ** data)
+{
+        struct fd_event * ev;
+        int ret = 0;
+        
+        TRACE_ENTRY("%p %p %p", peer, code, data);
+        
+        ret = fd_fifo_timedget(peer->p_events, &ev, &peer->p_psm_timer);
+        if (ret == ETIMEDOUT) {
+                *code = FDEVP_PSM_TIMEOUT;
+                *data = NULL;
+        } else {
+                CHECK_FCT( ret );
+                *code = ev->code;
+                *data = ev->data;
+                free(ev);
+        }
+        
+        return 0;
+}
+
 /* The state machine thread (controler) */
 static void * p_psm_th( void * arg )
@@ -134 +153 @@
         int created_started = started;
         int event;
-        size_t ev_sz;
         void * ev_data;
         
@@ -163 +181 @@
 psm_loop:
         /* Get next event */
-        CHECK_FCT_DO( fd_event_timedget(peer->p_events, &peer->p_psm_timer, FDEVP_PSM_TIMEOUT, &event, &ev_sz, &ev_data), goto psm_end );
-        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p,%zd)\t'%s'",
+        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, ev_sz,
+                        fd_pev_str(event), ev_data,
                         peer->p_hdr.info.pi_diamid);
 
@@ -209 +227 @@
         }
         
-        /* A new connection was established and CER containing this peer id was received */
-        if (event == FDEVP_CNX_INCOMING) {
-                struct cnx_incoming * params = ev_data;
-                ASSERT(params);
-                
-                switch (peer->p_hdr.info.pi_state) {
-                        case STATE_CLOSED:
-                                TODO("Handle the CER, validate the peer if needed (and set expiry), set the alt_fifo in the connection, reply a CEA, eventually handshake, move to OPEN or REOPEN state");
-                                break;
-                                
-                        case STATE_WAITCNXACK:
-                        case STATE_WAITCEA:
-                                TODO("Election");
-                                break;
-                                
-                        default:
-                                TODO("Reply with error CEA");
-                                TODO("Close the connection");
-                                /* reject_incoming_connection */
-                        
-                }
-                
-                free(ev_data);
-                goto psm_loop;
-        }
-        
         /* MSG_RECEIVED: fd_p_expi_update(struct fd_peer * peer ) */
         /* If timeout or OPEN : call cb if defined */
@@ -249 +241 @@
 psm_end:
         pthread_cleanup_pop(1); /* set STATE_ZOMBIE */
-        peer->p_psm = (pthread_t)NULL;
-        pthread_detach(pthread_self());
         return NULL;
 }       
+        
+        
+
 
 /* Create the PSM thread of one peer structure */
@@ -274 +267 @@
         TRACE_ENTRY("%p", peer);
         CHECK_PARAMS( CHECK_PEER(peer) );
-        
         if (peer->p_hdr.info.pi_state != STATE_ZOMBIE) {
-                CHECK_FCT( fd_event_send(peer->p_events, FDEVP_TERMINATE, 0, NULL) );
+                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);