Changeset 90 for trunk/wifidog/src/conf.c

Timestamp:

04/20/04 20:03:24 (9 years ago)

Author:

aprilp

Message:

A lot of changes regarding debugging facilities and added logging to syslog

Files:

• trunk/wifidog/src/conf.c (modified) (14 diffs)

trunk/wifidog/src/conf.c

@@ -28 +28 @@
 
 #define DEFAULT_CONFIGFILE "/etc/wifidog.conf"
-#define DEFAULT_DEBUGLEVEL D_LOG_DEBUG
+#define DEFAULT_DAEMON 1
+#define DEFAULT_DEBUGLEVEL LOG_INFO
 #define DEFAULT_HTTPDMAXCONN 10
 #define DEFAULT_GATEWAYID "default"
@@ -38 +39 @@
 #define DEFAULT_FWSCRIPTS_PATH "."
 #define DEFAULT_FWTYPE "."
+#define DEFAULT_LOG_SYSLOG 0
+#define DEFAULT_SYSLOG_FACILITY LOG_DAEMON
 
 s_config config;
@@ -61 +64 @@
         oFWType,
         oUserClass,
+    oSyslogFacility,
 } OpCodes;
 
@@ -84 +88 @@
         { "fwscriptspath",      oFWScriptsPath },
         { "fwtype",             oFWType },
-        { "userclass",          oUserClass },
+        { "userclass",                  oUserClass },
+        { "syslogfacility",     oSyslogFacility },
         { NULL,                 oBadOption },
 };
@@ -91 +96 @@
 config_init(void)
 {
-        debug(D_LOG_DEBUG, "Setting default config parameters");
+        debug(LOG_DEBUG, "Setting default config parameters");
         config.configfile = (char *)malloc(255);
         strcpy(config.configfile, DEFAULT_CONFIGFILE);
-        config.daemon = 1;
         config.debuglevel = DEFAULT_DEBUGLEVEL;
         config.httpdmaxconn = DEFAULT_HTTPDMAXCONN;
@@ -112 +116 @@
         config.userclasses = (char **)malloc(sizeof(char *) * 256);
         memset(config.userclasses, 0, sizeof(char *) * 256);
+        config.syslog_facility = DEFAULT_SYSLOG_FACILITY;
+    config.daemon = -1;
+    config.log_syslog = DEFAULT_LOG_SYSLOG;
+}
+
+/**
+ * @brief Initialize the variables we override with the command line
+ *
+ *
+ * Initialize the variables we override with the command line after the config has been read
+ * if they haven't been initialized by the configuration file
+ */
+void
+config_init_override(void)
+{
+    if (!config.daemon) config.daemon = DEFAULT_DAEMON;
 }
 
@@ -123 +143 @@
                         return keywords[i].opcode;
 
-        debug(D_LOG_ERR, "%s: line %d: Bad configuration option: %s", 
+        debug(LOG_ERR, "%s: line %d: Bad configuration option: %s", 
                         filename, linenum, cp);
         return oBadOption;
@@ -135 +155 @@
         int linenum = 0, opcode, value;
 
-        debug(D_LOG_INFO, "Reading configuration file '%s'", filename);
+        debug(LOG_INFO, "Reading configuration file '%s'", filename);
 
         if (!(fd = fopen(filename, "r"))) {
-                debug(D_LOG_ERR, "Could not open configuration file '%s', "
+                debug(LOG_ERR, "Could not open configuration file '%s', "
                                 "exiting...", filename);
                 exit(1);
@@ -172 +192 @@
 
                         if ((strncmp(s, "#", 1)) != 0) {
-                                debug(D_LOG_DEBUG, "Parsing token: %s, "
+                                debug(LOG_DEBUG, "Parsing token: %s, "
                                                 "value: %s", s, p1);
                                 opcode = parse_token(s, filename, linenum);
@@ -182 +202 @@
                                         break;
                                 case oDaemon:
-                                        if (((value = parse_value(p1)) != -1)) {
+                                        if (config.daemon == -1 && ((value = parse_value(p1)) != -1)) {
                                                 config.daemon = value;
                                         }
@@ -216 +236 @@
                                         break;
                                 case oBadOption:
+                    debug(LOG_ERR, "Exiting...");
                                         exit(-1);
                                         break;
@@ -229 +250 @@
                 case oFWType:
                                         config.fwtype = get_string(p1);
+                                        break;
+                case oSyslogFacility:
+                                        sscanf(p1, "%d", &config.syslog_facility);
                                         break;
                                 }
@@ -295 +319 @@
 
         if (missing_parms) {
-                debug(D_LOG_ERR, "Configuration is not complete, exiting...");
+                debug(LOG_ERR, "Configuration is not complete, exiting...");
                 exit(-1);
         }
@@ -304 +328 @@
 {
         if (parm == NULL) {
-                debug(D_LOG_ERR, "%s is not set", parmname);
+                debug(LOG_ERR, "%s is not set", parmname);
                 missing_parms = 1;
         }