X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/187b1faf20e70c4c2f15b7ced0440fc3eb798ea5..HEAD:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index bad3159..469804d 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -37,9 +37,6 @@ # include #endif -#if HAVE_SHLOBJ_H -# include -#endif #include #include "rights.h" @@ -48,6 +45,7 @@ #include "log.h" #include "split.h" #include "syscalls.h" +#include "home.h" #include "table.h" #include "inputline.h" #include "charset.h" @@ -68,6 +66,12 @@ */ char *configfile; +/** @brief Path to user's config file + * + * set_configfile() sets the default if it is null. + */ +char *userconfigfile; + /** @brief Read user configuration * * If clear, the user-specific configuration is not read. @@ -984,6 +988,24 @@ static int validate_pausemode(const struct config_state attribute((unused)) *cs, return -1; } +/** @brief Validate an MTU-discovery setting + * @param cs Configuration state + * @param nvec Length of (proposed) new value + * @param vec Elements of new value + * @return 0 on success, non-0 on error + */ +static int validate_mtu_discovery(const struct config_state attribute((unused)) *cs, + int nvec, + char **vec) { + if (nvec == 1 && + (!strcmp(vec[0], "default") || + !strcmp(vec[0], "yes") || + !strcmp(vec[0], "no"))) + return 0; + disorder_error(0, "%s:%d: invalid MTU-discovery setting", cs->path, cs->line); + return -1; +} + /** @brief Validate a destination network address * @param cs Configuration state * @param nvec Length of (proposed) new value @@ -1010,6 +1032,32 @@ static int validate_destaddr(const struct config_state attribute((unused)) *cs, return 0; } +/** @brief Validate an internet address + * @param cs Configuration state + * @param nvec Length of (proposed) new value + * @param vec Elements of new value + * @return 0 on success, non-0 on error + * + * By a destination address, it is meant that it must be either IPv4 or IPv6. + */ +static int validate_inetaddr(const struct config_state *cs, + int nvec, char **vec) { + struct netaddress na[1]; + + if(netaddress_parse(na, nvec, vec)) { + disorder_error(0, "%s:%d: invalid network address", cs->path, cs->line); + return -1; + } + switch(na->af) { + case AF_INET: case AF_INET6: case AF_UNSPEC: break; + default: + disorder_error(0, "%s:%d: must be an intenet address", + cs->path, cs->line); + return -1; + } + return 0; +} + /** @brief Item name and and offset */ #define C(x) #x, offsetof(struct config, x) /** @brief Item name and and offset */ @@ -1065,8 +1113,16 @@ static const struct conf conf[] = { { C(reminder_interval), &type_integer, validate_positive }, { C(remote_userman), &type_boolean, validate_any }, { C(replay_min), &type_integer, validate_non_negative }, + { C(rtp_always_request), &type_boolean, validate_any }, { C(rtp_delay_threshold), &type_integer, validate_positive }, + { C(rtp_instance_name), &type_string, validate_any }, + { C(rtp_max_payload), &type_integer, validate_positive }, + { C(rtp_maxbuffer), &type_integer, validate_non_negative }, + { C(rtp_minbuffer), &type_integer, validate_non_negative }, { C(rtp_mode), &type_string, validate_any }, + { C(rtp_mtu_discovery), &type_string, validate_mtu_discovery }, + { C(rtp_rcvbuf), &type_integer, validate_non_negative }, + { C(rtp_request_address), &type_netaddress, validate_inetaddr }, { C(rtp_verbose), &type_boolean, validate_any }, { C(sample_format), &type_sample_format, validate_sample_format }, { C(scratch), &type_string_accum, validate_isreg }, @@ -1378,6 +1434,8 @@ static struct config *config_default(void) { c->listen.af = -1; c->connect.af = -1; c->rtp_mode = xstrdup("auto"); + c->rtp_max_payload = -1; + c->rtp_mtu_discovery = xstrdup("default"); return c; } @@ -1399,10 +1457,20 @@ char *config_get_file2(struct config *c, const char *name) { /** @brief Set the default configuration file */ static void set_configfile(void) { + char *t; + #if !_WIN32 - if(!configfile) - byte_xasprintf(&configfile, "%s/config", pkgconfdir); + if(!configfile) { + configfile = getenv("DISORDER_CONFIG"); + if(!configfile) + byte_xasprintf(&configfile, "%s/config", pkgconfdir); + } #endif + if(!userconfigfile && config_per_user) { + if((t = getenv("DISORDER_USERCONFIG"))) userconfigfile = xstrdup(t); + else if(!(userconfigfile = profile_filename("passwd"))) + disorder_fatal(0, "failed to find user profile directory"); + } } /** @brief Free a configuration object @@ -1552,11 +1620,9 @@ int config_read(int server, xfree(privconf); #endif /* if we have a password file, read it */ - if((privconf = config_userconf(0, pw)) - && access(privconf, F_OK) == 0 - && config_include(c, privconf)) + if(access(userconfigfile, F_OK) == 0 + && config_include(c, userconfigfile)) return -1; - xfree(privconf); } /* install default namepart and transform settings */ config_postdefaults(c, server); @@ -1611,38 +1677,22 @@ char *config_private(void) { #else char *s; + if((s = getenv("DISORDER_PRIVCONFIG"))) return xstrdup(s); set_configfile(); byte_xasprintf(&s, "%s.private", configfile); return s; #endif } -/** @brief Return the path to user's personal configuration file */ -char *config_userconf(const char *home, const struct passwd *pw) { - char *s; -#if _WIN32 - wchar_t *wpath = 0; - char *appdata; - if(SHGetKnownFolderPath(&FOLDERID_RoamingAppData, 0, NULL, &wpath) != S_OK) - disorder_fatal(0, "error calling SHGetKnownFolderPath"); - appdata = win_wtomb(wpath); - CoTaskMemFree(wpath); - byte_xasprintf(&s, "%s\\DisOrder\\passwd", appdata); -#else - if(!home && !pw && !(pw = getpwuid(getuid()))) - disorder_fatal(0, "cannot determine our username"); - byte_xasprintf(&s, "%s/.disorder/passwd", home ? home : pw->pw_dir); -#endif - return s; -} - #if !_WIN32 /** @brief Return the path to user-specific system configuration */ char *config_usersysconf(const struct passwd *pw) { char *s; set_configfile(); - if(!strchr(pw->pw_name, '/')) { + if((s = getenv("DISORDER_USERCONFIG_SYS"))) + return xstrdup(s); + else if(!strchr(pw->pw_name, '/')) { byte_xasprintf(&s, "%s.%s", configfile, pw->pw_name); return s; } else