Changeset 37:cc3c59fe98fe in freeDiameter for freeDiameter/p_expiry.c

Timestamp:

Nov 5, 2009, 2:28:46 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Lot of cleanups in peer structure management

File:

• freeDiameter/p_expiry.c (modified) (3 diffs)

freeDiameter/p_expiry.c

@@ -61 +61 @@
                         struct fd_peer * peer = (struct fd_peer *)li;
                         
-                        if (peer->p_hdr.info.pi_state != STATE_ZOMBIE)
+                        if (peer->p_hdr.info.runtime.pir_state != STATE_ZOMBIE)
                                 continue;
                         
-                        if (peer->p_hdr.info.pi_flags.persist == PI_PRST_ALWAYS)
+                        if (peer->p_hdr.info.config.pic_flags.persist == PI_PRST_ALWAYS)
                                 continue; /* This peer was not supposed to terminate, keep it in the list for debug */
                         
@@ -158 +158 @@
         CHECK_FCT_DO( fd_thr_term(&exp_thr), );
         CHECK_POSIX( pthread_mutex_lock(&exp_mtx) );
-        
         while (!FD_IS_LIST_EMPTY(&exp_list)) {
                 struct fd_peer * peer = (struct fd_peer *)(exp_list.next->o);
                 fd_list_unlink(&peer->p_expiry );
         }
-        
         CHECK_POSIX( pthread_mutex_unlock(&exp_mtx) );
+        
         CHECK_FCT_DO( fd_thr_term(&gc_thr), );
         return 0;
@@ -180 +179 @@
         
         /* if peer expires */
-        if (peer->p_hdr.info.pi_flags.exp) {
+        if (peer->p_hdr.info.config.pic_flags.exp) {
                 struct fd_list * li;
                 
                 /* update the p_exp_timer value */
                 CHECK_SYS(  clock_gettime(CLOCK_REALTIME, &peer->p_exp_timer)  );
-                peer->p_exp_timer.tv_sec += peer->p_hdr.info.pi_lft;
+                peer->p_exp_timer.tv_sec += peer->p_hdr.info.config.pic_lft;
                 
                 /* add to the expiry list in appropriate position (probably around the end) */