Added configuration params for admin and ban.

diff --git a/src/conf.c b/src/conf.c
index 2a83e53e0712025f072a3587f4d29d3bb8ff86a1..adc0e1ba335d3859ef18b6cad8dc576a66218775 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -44,6 +44,7 @@ static config_t configuration;
 #define DEFAULT_MAX_CLIENTS 10
 #define DEFAULT_MAX_BANDWIDTH 48000
 #define DEFAULT_BINDPORT 64738
+#define DEFAULT_BAN_LENGTH (60*60)
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
@@ -117,6 +118,17 @@ const char *getStrConf(param_t param)
                                return "";
                }
                break;
+       case ADMIN_PASSPHRASE:
+               setting = config_lookup(&configuration, "admin_password");
+               if (!setting)
+                       return "";
+               else {
+                       if ((strsetting = config_setting_get_string(setting)) != NULL)
+                               return strsetting;
+                       else
+                               return "";
+               }
+               break;
        case BINDADDR:
                setting = config_lookup(&configuration, "bindaddr");
                if (!setting)
@@ -203,6 +215,14 @@ int getIntConf(param_t param)
                        return config_setting_get_int(setting);
                }
                break;
+       case BAN_LENGTH:
+               setting = config_lookup(&configuration, "ban_length");
+               if (!setting)
+                       return DEFAULT_BAN_LENGTH;
+               else {
+                       return config_setting_get_int(setting);
+               }
+               break;
        case MAX_BANDWIDTH:
                setting = config_lookup(&configuration, "max_bandwidth");
                if (!setting)

diff --git a/src/conf.h b/src/conf.h
index 20141dcca468d06a8f3d242d591130c1fc6fb912..100c73fd85f350f8daa6555d1d0cc932affa88d6 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -48,6 +48,8 @@ typedef enum param {
        USERNAME,
        GROUPNAME,
        LOGFILE,
+       ADMIN_PASSPHRASE,
+       BAN_LENGTH,
 } param_t;
 
 typedef struct {