projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix my name in the list of contributors.
[umurmur.git]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index bf21d99bb84cbe41f00caad5d82d34b07a789505..725aab6ab19bfe550ce27eb8890e0992c03dc080 100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-252,7
+252,10
@@
int getIntConf(param_t param)
case BINDPORT6:
setting = config_lookup(&configuration, "bindport6");
if (!setting)
case BINDPORT6:
setting = config_lookup(&configuration, "bindport6");
if (!setting)
- return DEFAULT_BINDPORT;
+ /* If bindport6 is not specified, we default
+ * to whatever bindport is, rather than always
+ * default to 64738 */
+ return getIntConf(BINDPORT);
else {
return config_setting_get_int(setting);
}
else {
return config_setting_get_int(setting);
}
@@
-320,6
+323,13
@@
bool_t getBoolConf(param_t param)
else
return config_setting_get_bool(setting);
break;
else
return config_setting_get_bool(setting);
break;
+ case SHOW_ADDRESSES:
+ setting = config_lookup(&configuration, "show_addresses");
+ if (!setting)
+ return true;
+ else
+ return config_setting_get_bool(setting);
+ break;
default:
doAssert(false);
}
default:
doAssert(false);
}