Changeset 25:67ca08d5bc48 in freeDiameter for freeDiameter/p_psm.c

Timestamp:

Oct 26, 2009, 4:00:49 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Completed connection context files

File:

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

freeDiameter/p_psm.c

@@ -58 +58 @@
                 case_str(FDEVP_TERMINATE);
                 case_str(FDEVP_CNX_MSG_RECV);
+                case_str(FDEVP_CNX_ERROR);
+                case_str(FDEVP_CNX_EP_CHANGE);
                 case_str(FDEVP_MSG_INCOMING);
                 case_str(FDEVP_PSM_TIMEOUT);
@@ -126 +128 @@
 }
 
-/* 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 )
@@ -154 +134 @@
         int created_started = started;
         int event;
+        size_t ev_sz;
         void * ev_data;
         
@@ -182 +163 @@
 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'",
+        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,%g)\t'%s'",
                         STATE_STR(peer->p_hdr.info.pi_state),
-                        fd_pev_str(event), ev_data,
+                        fd_pev_str(event), ev_data, ev_sz,
                         peer->p_hdr.info.pi_diamid);
 
@@ -272 +253 @@
         
         if (peer->p_hdr.info.pi_state != STATE_ZOMBIE) {
-                CHECK_FCT( fd_event_send(peer->p_events, FDEVP_TERMINATE, NULL) );
+                CHECK_FCT( fd_event_send(peer->p_events, FDEVP_TERMINATE, 0, NULL) );
         } else {
                 TRACE_DEBUG(FULL, "Peer '%s' was already terminated", peer->p_hdr.info.pi_diamid);