Changeset 11:6576ef5e01eb in freeDiameter

Timestamp:

Sep 25, 2009, 6:05:06 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added some support for peers

Files:

• extensions/dbg_monitor/monitor.c (modified) (1 diff)
• freeDiameter/CMakeLists.txt (modified) (1 diff)
• freeDiameter/fD.h (modified) (1 diff)
• freeDiameter/main.c (modified) (3 diffs)
• freeDiameter/peers.c (added)
• include/freeDiameter/freeDiameter.h (modified) (2 diffs)
• libfreeDiameter/fifo.c (modified) (1 diff)

extensions/dbg_monitor/monitor.c

@@ -71 +71 @@
         /* Loop */
         while (1) {
-                sleep(60);
+                #ifdef DEBUG
+                sleep(30);
+                #else /* DEBUG */
+                sleep(3600); /* 1 hour */
+                #endif /* DEBUG */
                 TRACE_DEBUG(NONE, "Monitor information");
                 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_QUEUES, NULL), /* continue */);

freeDiameter/CMakeLists.txt

@@ -15 +15 @@
         dict_base_proto.c
         messages.c
+        peers.c
         queues.c
         )

freeDiameter/fD.h

@@ -69 +69 @@
 int fd_dict_base_protocol(struct dictionary * dict);
 
+/* Peers */
+struct fd_peer { /* The "real" definition of the peer structure */
+        
+        struct peer_hdr p_hdr; /* contains all public data */
+        
+        int             p_eyec; /* Eye catcher, EYEC_PEER */
+        #define EYEC_PEER       0x373C9336
+        
+        /* threads, message queues, socket & callbacks */
+        
+};
+
+int fd_peer_init();
+void fd_peer_dump(int details);
+int fd_peer_start();
+int fd_peer_waitstart();
+
 #endif /* _FD_H */

freeDiameter/main.c

@@ -80 +80 @@
         CHECK_FCT(  fd_queues_init()  );
         CHECK_FCT(  fd_msg_init()  );
+        CHECK_FCT(  fd_peer_init()  );
         
         /* Parse the configuration file */
@@ -88 +89 @@
         
         /* Start the peer state machines */
-        
+        CHECK_FCT( fd_peer_start() );
         
         /* Now, just wait for events */
@@ -115 +116 @@
                                 break;
                         
+                        case FDEV_DUMP_PEERS:
+                                fd_peer_dump(FULL);
+                                break;
                         
                         case FDEV_TERMINATE:

include/freeDiameter/freeDiameter.h

@@ -160 +160 @@
         STATE_REOPEN            /* Connection has been re-established, waiting for 3 DWR/DWA exchanges before putting back to service */
 };
-extern char *peer_state_str[];
+extern const char *peer_state_str[];
 
 /* Information about a remote peer, used both for query and for creating a new entry */
@@ -214 +214 @@
 };
 
+struct peer_hdr {
+        struct fd_list   chain; /* List of all the peers, ordered by their Diameter Id */
+        struct peer_info info;  /* The public data */
+        
+        /* This header is followed by more data in the private peer structure definition */
+};
+
+/* the global list of peers. 
+  Since we are not expecting so many connections, we don't use a hash, but it might be changed.
+  The list items are peer_hdr structures (actually, fd_peer, but the cast is OK) */
+extern struct fd_list fd_g_peers;
+extern pthread_rwlock_t fd_g_peers_rw; /* protect the list */
+
+/*
+ * FUNCTION:    fd_peer_add
+ *
+ * PARAMETERS:
+ *  info        : Information to create the peer.
+ *  cb          : optional, a callback to call (once) when the peer connection is established or failed
+ *  cb_data     : opaque data to pass to the callback.
+ *
+ * DESCRIPTION: 
+ *  Add a peer to the list of peers to which the daemon must maintain a connexion.
+ * If cb is not null, the callback is called when the connection is in OPEN state or
+ * when an error has occurred. The callback should use the pi_state information to 
+ * determine which one it is.
+ *
+ * RETURN VALUE:
+ *  0           : The peer is added.
+ *  EINVAL      : A parameter is invalid.
+ *  EEXIST      : A peer with the same Diameter-Id is already in the list.
+ *  (other standard errors may be returned, too, with their standard meaning. Example:
+ *    ENOMEM    : Memory allocation for the new object element failed.)
+ */
+int fd_peer_add ( struct peer_info * info, void (*cb)(struct peer_info *, void *), void * cb_data );
+
+/*
+ * FUNCTION:    peer_validate_register
+ *
+ * PARAMETERS:
+ *  peer_validate       : Callback as defined bellow.
+ *
+ * DESCRIPTION: 
+ *  Add a callback to authorize / reject incoming peer connections.
+ * All registered callbacks are called until a callback sets auth = -1 or auth = 1.
+ * If no callback returns a clear decision, the default behavior is applied (reject unknown connections)
+ *
+ * RETURN VALUE:
+ *  0   : The callback is added.
+ * !0   : An error occurred.
+ */
+int fd_peer_validate_register ( int (*peer_validate)(struct peer_info * /* info */, int * /* auth */) );
+/*
+ * CALLBACK:    peer_validate
+ *
+ * PARAMETERS:
+ *   info     : Structure containing information about the peer attempting the connection.
+ *   auth     : Store there the result if the peer is accepted (1), rejected (-1), or unknown (0).
+ *
+ * DESCRIPTION: 
+ *   This callback is called when a new connection is being established from an unknown peer,
+ *  after the CER is received. An extension must register such callback with peer_validate_register.
+ *
+ * RETURN VALUE:
+ *  0           : The authorization decision has been written in the location pointed by auth.
+ *  !0          : An error occurred.
+ */
 
 /***************************************/

libfreeDiameter/fifo.c

@@ -117 +117 @@
         
         CHECK_POSIX_DO(  pthread_mutex_lock( &queue->mtx ), /* continue */  );
-        fd_log_debug("  %d elements in queue\n", queue->count);
-        fd_log_debug("  %d threads waiting\n", queue->thrs);
-        fd_log_debug("  thresholds: %d / %d, cb: %p / %p (%p), highest: %d\n",
+        fd_log_debug("   %d elements in queue / %d threads waiting\n", queue->count, queue->thrs);
+        fd_log_debug("   thresholds: %d / %d, cb: %p / %p (%p), highest: %d\n",
                         queue->high, queue->low,
                         queue->h_cb, queue->l_cb, queue->data,