Changeset 1010:357c2f892d24 in freeDiameter for libfdcore/fdcore-internal.h

Timestamp:

Mar 26, 2013, 12:39:32 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implement a new counter on pending answers to send back to a peer.
Function fd_peer_get_load_pending updated to retrieve this counter as well.
When a peer has answers pending, the connection is not immediately teared down
upon DPR/DPA exchange, but a GRACE_TIMEOUT delay (default 1 sec) is granted.

File:

• libfdcore/fdcore-internal.h (modified) (3 diffs)

libfdcore/fdcore-internal.h

@@ -71 +71 @@
 #endif /* DPR_TIMEOUT */
 
+/* Delai where the connection is maintained opened to allow exchanging remaining pending answers after DPR/DPA */
+#ifndef GRACE_TIMEOUT
+#define GRACE_TIMEOUT   1       /* in seconds */
+#endif /* GRACE_TIMEOUT */
+
 /* The Vendor-Id to advertise in CER/CEA */
 #ifndef MY_VENDOR_ID
@@ -126 +131 @@
         struct fd_list  srs; /* requests ordered by hop-by-hop id */
         struct fd_list  exp; /* requests that have a timeout set, ordered by timeout */
-        int             cnt; /* number of requests in the srs list */
+        long            cnt; /* number of requests in the srs list */
         pthread_mutex_t mtx; /* mutex to protect these lists */
         pthread_cond_t  cnd; /* cond var used by the thread that handles timeouts */
@@ -181 +186 @@
         /* Sent requests (for fallback), list of struct sentreq ordered by hbh */
         struct sr_list   p_sr;
+        
+        /* Pending received requests not yet answered (count only) */
+        long             p_reqin_count; /* We use p_state_mtx to protect this value */
         
         /* Data for transitional states before the peer is in OPEN state */