Changeset 14:14cf6daf716d in freeDiameter for freeDiameter/fD.h

Timestamp:

Oct 1, 2009, 6:24:07 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some progress on peers module

File:

• freeDiameter/fD.h (modified) (7 diffs)

freeDiameter/fD.h

@@ -42 +42 @@
 #include <freeDiameter/freeDiameter.h>
 
+/* Timeout for establishing a connection */
+#ifndef CNX_TIMEOUT
+#define  CNX_TIMEOUT    10      /* in seconds */
+#endif /* CNX_TIMEOUT */
+
+/* Timeout for receiving a CER after incoming connection is established */
+#ifndef INCNX_TIMEOUT
+#define  INCNX_TIMEOUT   20     /* in seconds */
+#endif /* INCNX_TIMEOUT */
+
+/* Timeout for receiving a CEA after CER is sent */
+#ifndef CEA_TIMEOUT
+#define  CEA_TIMEOUT    10      /* in seconds */
+#endif /* CEA_TIMEOUT */
+
+/* The timeout value to wait for answer to a DPR */
+#ifndef DPR_TIMEOUT
+#define DPR_TIMEOUT     15      /* in seconds */
+#endif /* DPR_TIMEOUT */
+
 /* Configuration */
 int fd_conf_init();
@@ -49 +69 @@
 
 /* Extensions */
-int fd_ext_init();
 int fd_ext_add( char * filename, char * conffile );
 int fd_ext_load();
@@ -82 +101 @@
         char            *p_dbgorig;
         
-        /* Mutex that protect this peer structure */
-        pthread_mutex_t  p_mtx;
-        
-        /* Reference counter -- freed only when this reaches 0 */
-        unsigned         p_refcount;
-        
         /* Chaining in peers sublists */
+        struct fd_list   p_actives;     /* list of peers in the STATE_OPEN state -- faster routing creation */
         struct fd_list   p_expiry;      /* list of expiring peers, ordered by their timeout value */
-        struct fd_list   p_actives;     /* list of peers in the STATE_OPEN state -- faster routing creation */
-        
-        /* The next hop-by-hop id value for the link */
-        uint32_t         p_hbh;
+        struct timespec  p_exp_timer;   /* Timestamp where the peer will expire; updated each time activity is seen on the peer (except DW) */
         
         /* Some flags influencing the peer state machine */
@@ -109 +120 @@
         
         /* The events queue, peer state machine thread, timer for states timeouts */
-        struct fifo     *p_events;
+        struct fifo     *p_events;      /* The mutex of this FIFO list protects also the state and timer information */
         pthread_t        p_psm;
         struct timespec  p_psm_timer;
@@ -121 +132 @@
         pthread_t        p_outthr;
         
+        /* The next hop-by-hop id value for the link, only read & modified by p_outthr */
+        uint32_t         p_hbh;
+        
         /* Sent requests (for fallback), list of struct sentreq ordered by hbh */
         struct fd_list   p_sentreq;
         
-        /* connection context: socket & other metadata */
+        /* connection context: socket, callbacks and so on */
         struct cnxctx   *p_cnxctx;
         
@@ -145 +159 @@
         /* A message was received in the peer */
         ,FDEVP_MSG_INCOMING
+        
+        /* The PSM state is expired */
+        ,FDEVP_PSM_TIMEOUT
 };
+const char * fd_pev_str(int event);
 
 /* Structure to store a sent request */
@@ -154 +172 @@
 
 /* Functions */
-int fd_peer_init();
 int fd_peer_fini();
 void fd_peer_dump_list(int details);
 /* fd_peer_add declared in freeDiameter.h */
-int fd_peer_rc_decr(struct fd_peer **ptr, int locked);
 
 /* Peer expiry */
 int fd_p_expi_init(void);
 int fd_p_expi_fini(void);
-int fd_p_expi_update(struct fd_peer * peer, int locked );
-int fd_p_expi_unlink(struct fd_peer * peer, int locked );
+int fd_p_expi_update(struct fd_peer * peer );
 
 /* Peer state machine */