Changeset 1336:cec0812038bb in freeDiameter for extensions/rt_default/rtd_conf.y

Timestamp:

Apr 9, 2019, 10:46:50 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

histedit_source:

4e04e2f73d936608db88f0e70d10049fcaf66190

Message:

rt_default: add reload support.

When SIGUSR1 is sent to the freeDiameter process, rt_default reloads
its config file.

Written for Effortel Technologies SA, published with their consent.

File:

• extensions/rt_default/rtd_conf.y (modified) (4 diffs)

extensions/rt_default/rtd_conf.y

@@ -55 +55 @@
 /* Forward declaration */
 int yyparse(char * conffile);
+void rtd_confrestart(FILE *input_file);
 
 static int rules_added = 0;
@@ -66 +67 @@
         TRACE_ENTRY("%p", conffile);
         
-        TRACE_DEBUG (FULL, "Parsing configuration file: %s...", conffile);
-        
+        TRACE_DEBUG (FULL, "rt_default: Parsing configuration file: %s...", conffile);
+
+        rules_added = 0;
         rtd_confin = fopen(conffile, "r");
         if (rtd_confin == NULL) {
                 ret = errno;
                 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret));
-                TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file.");
+                TRACE_DEBUG (INFO, "rt_default: Error occurred, message logged -- configuration file.");
                 return ret;
         }
 
+        rtd_confrestart(rtd_confin);
         ret = yyparse(conffile);
 
@@ -81 +84 @@
 
         if (ret != 0) {
-                TRACE_DEBUG (INFO, "Unable to parse the configuration file.");
+                TRACE_DEBUG (INFO, "rt_default: Unable to parse the configuration file.");
                 return EINVAL;
         } else {
-                TRACE_DEBUG(FULL, "Added %d RULES routing entries successfully.", rules_added);
+                TRACE_DEBUG(INFO, "rt_default: Added %d RULES routing entries successfully.", rules_added);
         }
         
@@ -96 +99 @@
 void yyerror (YYLTYPE *ploc, char * conffile, char const *s)
 {
-        TRACE_DEBUG(INFO, "Error in configuration parsing");
+        TRACE_DEBUG(INFO, "rt_default: Error in configuration parsing");
         
         if (ploc->first_line != ploc->last_line)