X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c7e016d34b8f0429c0cd9e5366625fdf83776297..8ab2aa9fd51a89e06d92a4f7c3792aaa4a08cc71:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index 83423c7..56a9696 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -36,10 +36,7 @@ #if HAVE_LANGINFO_H # include #endif -#include -#if HAVE_SHLOBJ_H -# include -#endif + #include #include "rights.h" @@ -48,11 +45,13 @@ #include "log.h" #include "split.h" #include "syscalls.h" +#include "home.h" #include "table.h" #include "inputline.h" #include "charset.h" #include "defs.h" #include "printf.h" +#include "regexp.h" #include "regsub.h" #include "signame.h" #include "authhash.h" @@ -402,9 +401,10 @@ static int set_namepart(const struct config_state *cs, int nvec, char **vec) { struct namepartlist *npl = ADDRESS(cs->config, struct namepartlist); unsigned reflags; - const char *errstr; - int erroffset, n; - pcre *re; + regexp *re; + char errstr[RXCERR_LEN]; + size_t erroffset; + int n; if(nvec < 3) { disorder_error(0, "%s:%d: namepart needs at least 3 arguments", @@ -417,11 +417,10 @@ static int set_namepart(const struct config_state *cs, return -1; } reflags = nvec >= 5 ? regsub_flags(vec[4]) : 0; - if(!(re = pcre_compile(vec[1], - PCRE_UTF8 - |regsub_compile_options(reflags), - &errstr, &erroffset, 0))) { - disorder_error(0, "%s:%d: compiling regexp /%s/: %s (offset %d)", + if(!(re = regexp_compile(vec[1], regsub_compile_options(reflags), + errstr, sizeof(errstr), &erroffset))) + { + disorder_error(0, "%s:%d: compiling regexp /%s/: %s (offset %zu)", cs->path, cs->line, vec[1], errstr, erroffset); return -1; } @@ -449,10 +448,10 @@ static int set_transform(const struct config_state *cs, const struct conf *whoami, int nvec, char **vec) { struct transformlist *tl = ADDRESS(cs->config, struct transformlist); - pcre *re; + regexp *re; + char errstr[RXCERR_LEN]; unsigned reflags; - const char *errstr; - int erroffset; + size_t erroffset; if(nvec < 3) { disorder_error(0, "%s:%d: transform needs at least 3 arguments", @@ -465,11 +464,10 @@ static int set_transform(const struct config_state *cs, return -1; } reflags = (nvec >= 5 ? regsub_flags(vec[4]) : 0); - if(!(re = pcre_compile(vec[1], - PCRE_UTF8 - |regsub_compile_options(reflags), - &errstr, &erroffset, 0))) { - disorder_error(0, "%s:%d: compiling regexp /%s/: %s (offset %d)", + if(!(re = regexp_compile(vec[1], regsub_compile_options(reflags), + errstr, sizeof(errstr), &erroffset))) + { + disorder_error(0, "%s:%d: compiling regexp /%s/: %s (offset %zu)", cs->path, cs->line, vec[1], errstr, erroffset); return -1; } @@ -572,7 +570,7 @@ static void free_namepartlist(struct config *c, for(n = 0; n < npl->n; ++n) { np = &npl->s[n]; xfree(np->part); - pcre_free(np->re); /* ...whatever pcre_free is set to. */ + regexp_free(np->re); xfree(np->res); xfree(np->replace); xfree(np->context); @@ -589,7 +587,7 @@ static void free_transformlist(struct config *c, for(n = 0; n < tl->n; ++n) { t = &tl->t[n]; xfree(t->type); - pcre_free(t->re); /* ...whatever pcre_free is set to. */ + regexp_free(t->re); xfree(t->replace); xfree(t->context); } @@ -723,15 +721,14 @@ static int validate_tracklength(const struct config_state *cs, return 0; } -/** @brief Validate a non-negative (@c long) integer +/** @brief Common code for validating integer values * @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 + * @param n_out Where to put the value */ -static int validate_non_negative(const struct config_state *cs, - int nvec, char **vec) { - long n; +static int common_validate_integer(const struct config_state *cs, + int nvec, char **vec, long *n_out) { char errbuf[1024]; if(nvec < 1) { @@ -742,11 +739,24 @@ static int validate_non_negative(const struct config_state *cs, disorder_error(0, "%s:%d: too many arguments", cs->path, cs->line); return -1; } - if(xstrtol(&n, vec[0], 0, 0)) { + if(xstrtol(n_out, vec[0], 0, 0)) { disorder_error(0, "%s:%d: %s", cs->path, cs->line, format_error(ec_errno, errno, errbuf, sizeof errbuf)); return -1; } + return 0; +} + +/** @brief Validate a non-negative (@c long) integer + * @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_non_negative(const struct config_state *cs, + int nvec, char **vec) { + long n; + if(common_validate_integer(cs, nvec, vec, &n)) return -1; if(n < 0) { disorder_error(0, "%s:%d: must not be negative", cs->path, cs->line); return -1; @@ -763,21 +773,7 @@ static int validate_non_negative(const struct config_state *cs, static int validate_positive(const struct config_state *cs, int nvec, char **vec) { long n; - char errbuf[1024]; - - if(nvec < 1) { - disorder_error(0, "%s:%d: missing argument", cs->path, cs->line); - return -1; - } - if(nvec > 1) { - disorder_error(0, "%s:%d: too many arguments", cs->path, cs->line); - return -1; - } - if(xstrtol(&n, vec[0], 0, 0)) { - disorder_error(0, "%s:%d: %s", cs->path, cs->line, - format_error(ec_errno, errno, errbuf, sizeof errbuf)); - return -1; - } + if(common_validate_integer(cs, nvec, vec, &n)) return -1; if(n <= 0) { disorder_error(0, "%s:%d: must be positive", cs->path, cs->line); return -1; @@ -986,6 +982,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 @@ -1012,6 +1026,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 */ @@ -1067,8 +1107,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 }, @@ -1380,6 +1428,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; } @@ -1402,8 +1452,11 @@ char *config_get_file2(struct config *c, const char *name) { /** @brief Set the default configuration file */ static void set_configfile(void) { #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 } @@ -1487,8 +1540,10 @@ static void config_postdefaults(struct config *c, if(server) { if(!strcmp(c->api, "command") && !c->speaker_command) disorder_fatal(0, "'api command' but speaker_command is not set"); - if((!strcmp(c->api, "rtp")) && c->broadcast.af == -1) - disorder_fatal(0, "'api rtp' but broadcast is not set"); + if((!strcmp(c->api, "rtp")) && + c->broadcast.af == -1 && strcmp(c->rtp_mode, "request")) + disorder_fatal(0, "'api rtp' but broadcast is not set " + "and mode is not not 'request'"); } /* Override sample format */ if(!strcmp(c->api, "rtp")) { @@ -1552,7 +1607,7 @@ int config_read(int server, xfree(privconf); #endif /* if we have a password file, read it */ - if((privconf = config_userconf(0, pw)) + if((privconf = config_userconf()) && access(privconf, F_OK) == 0 && config_include(c, privconf)) return -1; @@ -1618,22 +1673,10 @@ char *config_private(void) { } /** @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; +char *config_userconf(void) { + char *t; + if((t = getenv("DISORDER_USERCONFIG"))) return xstrdup(t); + return profile_filename("passwd"); } #if !_WIN32 @@ -1642,7 +1685,9 @@ 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