Changeset 14:14cf6daf716d in freeDiameter for include

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

Location:

include/freeDiameter

Files:

• freeDiameter.h (modified) (4 diffs)
• libfreeDiameter.h (modified) (2 diffs)

include/freeDiameter/freeDiameter.h

@@ -141 +141 @@
         ,FDEV_DUMP_PEERS        /* Dump the list of peers */
 };
-
+const char * fd_ev_str(int event);
 
 
@@ -151 +151 @@
 enum peer_state {
         /* Stable states */
-        STATE_DISABLED = 1,     /* No connexion must be attempted / only this state means that the peer PSM thread is not running */
+        STATE_ZOMBIE = 0,       /* The threads handling the peer are not running for some reason */
         STATE_OPEN,             /* Connexion established */
         
@@ -167 +167 @@
         /* Failover state machine */
         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 */
+        STATE_REOPEN,           /* Connection has been re-established, waiting for 3 DWR/DWA exchanges before putting back to service */
 };
 extern const char *peer_state_str[];
 #define STATE_STR(state) \
-        peer_state_str[ ((unsigned)(state)) <= STATE_REOPEN ? ((unsigned)(state)) : 0 ]
+        (((unsigned)(state)) <= STATE_REOPEN ? peer_state_str[((unsigned)(state)) ] : "<Invalid>")
 
 /* Information about a remote peer. Same structure is used for creating a new entry, but not all fields are meaningful in that case */
@@ -238 +238 @@
         }               pi_sec_data;
         
-        /* The remaining information is read-only, not used for peer creation */
+        /* The remaining information must not be modified, and is not used for peer creation */
         enum peer_state pi_state;
         uint32_t        pi_vendorid;    /* Content of the Vendor-Id AVP, or 0 by default */

include/freeDiameter/libfreeDiameter.h

@@ -193 +193 @@
 #ifndef ERRORS_ON_TODO
 #define TODO( _msg, _args... ) \
-        TRACE_DEBUG(NONE, _msg , ##_args);
+        TRACE_DEBUG(NONE, "TODO: " _msg , ##_args);
 #else /* ERRORS_ON_TODO */
 #define TODO( _msg, _args... ) \
@@ -446 +446 @@
 };
 
-#define FD_LIST( _li ) ((struct fd_list *)( _li ))
-
 /* Initialize a list element */
+#define FD_LIST_INITIALIZER( _list_name ) \
+        { .next = & _list_name, .prev = & _list_name, .head = & _list_name, .o = NULL }
+#define FD_LIST_INITIALIZER_O( _list_name, _obj ) \
+        { .next = & _list_name, .prev = & _list_name, .head = & _list_name, .o = _obj }
 void fd_list_init ( struct fd_list * list, void *obj );
 
 /* Return boolean, true if the list is empty */
-#define FD_IS_LIST_EMPTY( _list ) (((FD_LIST(_list))->head == (_list)) && ((FD_LIST(_list))->next == (_list)))
+#define FD_IS_LIST_EMPTY( _list ) ((((struct fd_list *)(_list))->head == (_list)) && (((struct fd_list *)(_list))->next == (_list)))
 
 /* Insert an item in a list at known position */