Changeset 1396:188c82b6690b in freeDiameter for libfdcore/p_ce.c

Timestamp:

Nov 15, 2019, 7:38:30 PM (4 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Add ProcessingPeersPattern? and ProcessingPeersMinimum? parameters.

If this is configured, the process will accept all connections from
peers matching ProcessingPeersPattern?, but will NOT accept connections
from other peers until ProcessingPeersMinimum? peers of the first
type are connected.

This allows relays to only go online if there are enough worker
peers connected behind them.

File:

• libfdcore/p_ce.c (modified) (2 diffs)

libfdcore/p_ce.c

@@ -834 +834 @@
 }
 
+/* Check if enough processing peers are connected to allow connections by other peers */
+static int sufficient_processing_peers(void) {
+        int processing_peers_count = 0;
+        struct fd_list * li;
+
+        CHECK_FCT( pthread_rwlock_rdlock(&fd_g_activ_peers_rw) );
+        for (li = fd_g_activ_peers.next; li != &fd_g_activ_peers; li = li->next) {
+                struct fd_peer * p = (struct fd_peer *)li->o;
+
+                TRACE_DEBUG(FULL, "comparing '%s' against processing peers pattern", p->p_hdr.info.pi_diamid);
+                if (regexec(&fd_g_config->cnf_processing_peers_pattern_regex, p->p_hdr.info.pi_diamid, 0, NULL, 0) == 0) {
+                        processing_peers_count++;
+                }
+        }
+        CHECK_FCT( pthread_rwlock_unlock(&fd_g_activ_peers_rw) );
+
+        TRACE_DEBUG(FULL, "%d processing peers found", processing_peers_count);
+        return (processing_peers_count >= fd_g_config->cnf_processing_peers_minimum);
+}
+
 /* Handle the receiver side to go to OPEN or OPEN_NEW state (any election is resolved) */
 int fd_p_ce_process_receiver(struct fd_peer * peer)
@@ -884 +904 @@
         }
         
+        /* Check peer type and if enough processing peers are already connected */
+        if (fd_g_config->cnf_processing_peers_minimum > 0) {
+                if (regexec(&fd_g_config->cnf_processing_peers_pattern_regex, peer->p_hdr.info.pi_diamid, 0, NULL, 0) != 0) {
+                        /* peer is not a processing peer */
+                        if (!sufficient_processing_peers()) {
+                                pei.pei_errcode = "DIAMETER_TOO_BUSY";
+                                goto error_abort;
+                        }
+                }
+        }
+
+        if (peer->p_flags.pf_responder) {
+                int res = fd_peer_validate( peer );
+                if (res < 0) {
+                        TRACE_DEBUG(INFO, "Rejected CER from peer '%s', validation failed (returning DIAMETER_UNKNOWN_PEER).", peer->p_hdr.info.pi_diamid);
+                        pei.pei_errcode = "DIAMETER_UNKNOWN_PEER";
+                        goto error_abort;
+                }
+                CHECK_FCT( res );
+        }
         /* Check if we have common applications */
         if ( fd_g_config->cnf_flags.no_fwd && (! peer->p_hdr.info.runtime.pir_relay) ) {