projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error message at client disconnect when using OpenSSL.
[umurmur.git]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index f2baa3106de0d943126bb20fdf5fa1fa8c32b7e3..efacd56e6bae6ed10ee773efdcd7922eb41adcda 100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-45,6
+45,7
@@
static config_t configuration;
#define DEFAULT_MAX_BANDWIDTH 48000
#define DEFAULT_BINDPORT 64738
#define DEFAULT_BAN_LENGTH (60*60)
#define DEFAULT_MAX_BANDWIDTH 48000
#define DEFAULT_BINDPORT 64738
#define DEFAULT_BAN_LENGTH (60*60)
+#define DEFAULT_OPUS_THRESHOLD 100
const char defaultconfig[] = DEFAULT_CONFIG;
const char defaultconfig[] = DEFAULT_CONFIG;
@@
-195,6
+196,17
@@
const char *getStrConf(param_t param)
return NULL;
}
break;
return NULL;
}
break;
+ case BANFILE:
+ setting = config_lookup(&configuration, "banfile");
+ if (!setting)
+ return NULL;
+ else {
+ if ((strsetting = config_setting_get_string(setting)) != NULL)
+ return strsetting;
+ else
+ return NULL;
+ }
+ break;
default:
doAssert(false);
break;
default:
doAssert(false);
break;
@@
-239,6
+251,14
@@
int getIntConf(param_t param)
return config_setting_get_int(setting);
}
break;
return config_setting_get_int(setting);
}
break;
+ case OPUS_THRESHOLD:
+ setting = config_lookup(&configuration, "opus_threshold");
+ if (!setting)
+ return DEFAULT_OPUS_THRESHOLD;
+ else {
+ return config_setting_get_int(setting);
+ }
+ break;
default:
doAssert(false);
}
default:
doAssert(false);
}
@@
-263,6
+283,13
@@
bool_t getBoolConf(param_t param)
else
return config_setting_get_bool(setting);
break;
else
return config_setting_get_bool(setting);
break;
+ case SYNC_BANFILE:
+ setting = config_lookup(&configuration, "sync_banfile");
+ if (!setting)
+ return false;
+ else
+ return config_setting_get_bool(setting);
+ break;
default:
doAssert(false);
}
default:
doAssert(false);
}