Changeset 706:4ffbc9f1e922 in freeDiameter for include/freeDiameter/libfdcore.h

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

• include/freeDiameter/libfdcore.h (modified) (10 diffs)

include/freeDiameter/libfdcore.h

@@ -108 +108 @@
         char            *cnf_file;      /* Configuration file to parse, default is DEFAULT_CONF_FILE */
         
-        char            *cnf_diamid;    /* Diameter Identity of the local peer (FQDN -- UTF-8) */
-        size_t           cnf_diamid_len;        /* length of the previous string */
-        char            *cnf_diamrlm;   /* Diameter realm of the local peer, default to realm part of diam_id */
+        DiamId_t         cnf_diamid;    /* Diameter Identity of the local peer (FQDN -- ASCII) */
+        size_t           cnf_diamid_len;/* cached length of the previous string */
+        DiamId_t         cnf_diamrlm;   /* Diameter realm of the local peer, default to realm part of cnf_diamid */
         size_t           cnf_diamrlm_len;/* length of the previous string */
         
@@ -187 +187 @@
         STATE_SUSPECT,          /* A DWR was sent and not answered within TwTime. Failover in progress. */
         STATE_REOPEN,           /* Connection has been re-established, waiting for 3 DWR/DWA exchanges before putting back to service */
+        
+        /* Ordering issues with multistream & state machine. -- see top of p_psm.c for explanation */
+        STATE_OPEN_NEW,         /* after CEA is sent, until a new message is received. Force ordering in this state */
+        STATE_CLOSING_GRACE,    /* after DPA is sent or received, give a short delay for messages in the pipe to be received. */
         
         /* Error state */
@@ -205 +209 @@
         , "STATE_SUSPECT"               \
         , "STATE_REOPEN"                \
+        , "STATE_OPEN_NEW"              \
+        , "STATE_CLOSING_GRACE"         \
         , "STATE_ZOMBIE"                \
         };
@@ -237 +243 @@
 struct peer_info {
         
-        char *          pi_diamid;      /* UTF-8, \0 terminated. The Diameter Identity of the remote peer. */
+        DiamId_t        pi_diamid;      /* (supposedly) UTF-8, \0 terminated. The Diameter Identity of the remote peer. */
+        size_t          pi_diamidlen;   /* cached length of pi_diamid */
         
         struct {
@@ -250 +257 @@
                 }               pic_flags;      /* Flags influencing the connection to the remote peer */
                 
-                char *          pic_realm;      /* If configured, the daemon will match the received realm in CER/CEA matches this. */
+                DiamId_t        pic_realm;      /* If configured, the daemon will check the received realm in CER/CEA matches this. */
                 uint16_t        pic_port;       /* port to connect to. 0: default. */
                 
@@ -263 +270 @@
         struct {
                 
-                enum peer_state pir_state;      /* Current state of the peer in the state machine. fd_cpu_flush_cache() might be useful before reading. */
-                
-                char *          pir_realm;      /* The received realm in CER/CEA. */
+                /* enum peer_state      pir_state; */ 
+                /* Since 1.1.0, read the state with fd_peer_getstate(peer). */
+                
+                DiamId_t        pir_realm;      /* The received realm in CER/CEA. */
+                size_t          pir_realmlen;   /* length of the realm */
                 
                 uint32_t        pir_vendorid;   /* Content of the Vendor-Id AVP, or 0 by default */
                 uint32_t        pir_orstate;    /* Origin-State-Id value */
-                char *          pir_prodname;   /* copy of UTF-8 Product-Name AVP (\0 terminated) */
+                os0_t           pir_prodname;   /* copy of Product-Name AVP (\0 terminated) */
                 uint32_t        pir_firmrev;    /* Content of the Firmware-Revision AVP */
                 int             pir_relay;      /* The remote peer advertized the relay application */
@@ -290 +299 @@
 
 struct peer_hdr {
-        struct fd_list   chain; /* List of all the peers, ordered by their Diameter Id */
+        struct fd_list   chain; /* Link into the list of all the peers, ordered by their Diameter Id (fd_os_cmp) */
         struct peer_info info;  /* The public data */
         
@@ -339 +348 @@
  *
  * PARAMETERS:
- *  diamid      : A \0 terminated string.
+ *  diamid      : an UTF8 string describing the diameter Id of the peer to seek
+ *  diamidlen   : length of the diamid
+ *  igncase     : perform an almost-case-insensitive search? (slower)
  *  peer        : The peer is stored here if it exists.
  *
@@ -349 +360 @@
  * !0   : An error occurred.
  */
-int fd_peer_getbyid( char * diamid, struct peer_hdr ** peer );
+int fd_peer_getbyid( DiamId_t diamid, size_t diamidlen, int igncase, struct peer_hdr ** peer );
+
+/* 
+ * FUNCTION:    fd_peer_get_state
+ *
+ * PARAMETERS:
+ *  peer        : The peer which state to read
+ *
+ * DESCRIPTION: 
+ *   Returns the current state of the peer.
+ *
+ * RETURN VALUE:
+ *  -1  : peer is invalid
+ * >=0  : the state of the peer at the time of reading.
+ */
+int fd_peer_get_state(struct peer_hdr *peer);
 
 /*
@@ -474 +500 @@
 /* Add Origin-Host, Origin-Realm, (if osi) Origin-State-Id AVPS at the end of the message */
 int fd_msg_add_origin ( struct msg * msg, int osi ); 
+
+/* Generate a new Session-Id and add it at the beginning of the message (opt is added at the end of the sid if provided) */
+int fd_msg_new_session( struct msg * msg, os0_t opt, size_t optlen );
+
 
 /* Parse a message against our dictionary, and in case of error log and eventually build the error reply (on return and EBADMSG, *msg == NULL or *msg is the error message ready to send) */