Changeset 1396:188c82b6690b in freeDiameter for libfdcore/fdd.y

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/fdd.y (modified) (3 diffs)

libfdcore/fdd.y

@@ -110 +110 @@
 %token          LISTENON
 %token          THRPERSRV
+%token          PROCESSINGPEERSPATTERN
+%token          PROCESSINGPEERSMINIMUM
 %token          TCTIMER
 %token          TWTIMER
@@ -142 +144 @@
                         | conffile listenon
                         | conffile thrpersrv
+                        | conffile processingpeerspattern
+                        | conffile processingpeersminimum
                         | conffile norelay
                         | conffile appservthreads
@@ -250 +254 @@
                                         { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } );
                                 conf->cnf_thr_srv = $3;
+                        }
+                        ;
+
+processingpeerspattern:         PROCESSINGPEERSPATTERN '=' QSTRING ';'
+                        {
+                                char *pattern = $3;
+                                int err;
+                                CHECK_FCT_DO( err=regcomp(&conf->cnf_processing_peers_pattern_regex, pattern, REG_EXTENDED | REG_NOSUB),
+                                        {
+                                                char * buf;
+                                                size_t bl;
+
+                                                /* Error while compiling the regex */
+                                                TRACE_DEBUG(INFO, "error while compiling the regular expression '%s':", pattern);
+
+                                                /* Get the error message size */
+                                                bl = regerror(err, &conf->cnf_processing_peers_pattern_regex, NULL, 0);
+
+                                                /* Alloc the buffer for error message */
+                                                CHECK_MALLOC( buf = malloc(bl) );
+
+                                                /* Get the error message content */
+                                                regerror(err, &conf->cnf_processing_peers_pattern_regex, buf, bl);
+                                                TRACE_DEBUG(INFO, "\t%s", buf);
+
+                                                /* Free the buffer, return the error */
+                                                free(buf);
+
+                                                yyerror (&yylloc, conf, "Invalid regular expression in ProcessingPeersPattern");
+                                                YYERROR;
+                                        } );
+                        }
+                        ;
+
+processingpeersminimum:         PROCESSINGPEERSMINIMUM '=' INTEGER ';'
+                        {
+                                CHECK_PARAMS_DO( ($3 >= 0),
+                                        { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } );
+                                conf->cnf_processing_peers_minimum = $3;
                         }
                         ;