Changeset 37:cc3c59fe98fe in freeDiameter for freeDiameter/fD.h

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/fD.h (modified) (5 diffs)

freeDiameter/fD.h

@@ -119 +119 @@
         /* Some flags influencing the peer state machine */
         struct {
-                unsigned pf_responder   : 1;    /* The local peer is responder on the connection */
+                unsigned pf_responder   : 1;    /* The peer has been created to handle incoming connection */
                 
                 unsigned pf_dw_pending  : 1;    /* A DWR message was sent and not answered yet */
@@ -125 +125 @@
                 unsigned pf_cnx_pb      : 1;    /* The peer was disconnected because of watchdogs; must exchange 3 watchdogs before putting back to normal */
                 unsigned pf_reopen_cnt  : 2;    /* remaining DW to be exchanged after re-established connection */
-                
-                /* to be completed */
                 
         }                p_flags;
@@ -144 +142 @@
         /* Sent requests (for fallback), list of struct sentreq ordered by hbh */
         struct sr_list   p_sr;
+        
+        /* Data for transitional states before the peer is in OPEN state */
+        struct {
+                struct cnxctx * p_initiator;    /* Connection before CEA is received */
+                struct cnxctx * p_receiver;     /* Only used in case of election */
+                pthread_t       p_ini_thr;
+        };
+                
         
         /* connection context: socket and related information */
@@ -176 +182 @@
         ,FDEVP_CNX_EP_CHANGE
         
-        /* A new connection has been established (data contains the appropriate info) */
+        /* A new connection (with a CER) has been received */
         ,FDEVP_CNX_INCOMING
+        
+        /* A new connection has been established to the remote peer (event data is the cnxctx object) */
+        ,FDEVP_CNX_ESTABLISHED
         
         /* The PSM state is expired */
@@ -196 +205 @@
                 case_str(FDEVP_CNX_EP_CHANGE);          \
                 case_str(FDEVP_CNX_INCOMING);           \
+                case_str(FDEVP_CNX_ESTABLISHED);        \
                 case_str(FDEVP_PSM_TIMEOUT);            \
         }                                               \