X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/05b3f1f69c02a260bb8315dcedd60d35daf1875c..e1e3ef08ef3419f4aabcfb3f45ab49a78000cdb7:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index 19a84a2..17f9ec7 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -36,9 +36,7 @@ #if HAVE_LANGINFO_H # include #endif -#if HAVE_PCRE_H -# include -#endif + #include #include "rights.h" @@ -47,18 +45,20 @@ #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" -#if HAVE_PCRE_H -# include "regsub.h" -#endif +#include "regexp.h" +#include "regsub.h" #include "signame.h" #include "authhash.h" #include "vector.h" +#if !_WIN32 #include "uaudio.h" +#endif /** @brief Path to config file * @@ -72,11 +72,13 @@ char *configfile; */ int config_per_user = 1; +#if !_WIN32 /** @brief Table of audio APIs * * Only set in server processes. */ const struct uaudio *const *config_uaudio_apis; +#endif /** @brief Config file parser state */ struct config_state { @@ -260,22 +262,6 @@ static int set_string(const struct config_state *cs, return 0; } -static int set_stringlist(const struct config_state *cs, - const struct conf *whoami, - int nvec, char **vec) { - int n; - struct stringlist *sl; - - sl = ADDRESS(cs->config, struct stringlist); - sl->n = 0; - for(n = 0; n < nvec; ++n) { - sl->n++; - sl->s = xrealloc(sl->s, (sl->n * sizeof (char *))); - sl->s[sl->n - 1] = xstrdup(vec[n]); - } - return 0; -} - static int set_integer(const struct config_state *cs, const struct conf *whoami, int nvec, char **vec) { @@ -358,13 +344,13 @@ static int parse_sample_format(const struct config_state *cs, cs->path, cs->line, t); return -1; } - if(format) format->bits = t; + if(format) format->bits = (uint8_t)t; switch (*p) { case 'l': case 'L': t = ENDIAN_LITTLE; p++; break; case 'b': case 'B': t = ENDIAN_BIG; p++; break; default: t = ENDIAN_NATIVE; break; } - if(format) format->endian = t; + if(format) format->endian = (uint8_t)t; if(*p != '/') { disorder_error(errno, "%s:%d: expected `/' after bits-per-sample", cs->path, cs->line); @@ -395,7 +381,7 @@ static int parse_sample_format(const struct config_state *cs, cs->path, cs->line, t); return -1; } - if(format) format->channels = t; + if(format) format->channels = (uint8_t)t; if(*p) { disorder_error(0, "%s:%d: junk after channels", cs->path, cs->line); return -1; @@ -410,15 +396,15 @@ static int set_sample_format(const struct config_state *cs, nvec, vec); } -#if HAVE_PCRE_H static int set_namepart(const struct config_state *cs, const struct conf *whoami, 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", @@ -431,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; } @@ -463,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", @@ -479,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; } @@ -496,7 +480,6 @@ static int set_transform(const struct config_state *cs, ++tl->n; return 0; } -#endif static int set_rights(const struct config_state *cs, const struct conf *whoami, @@ -578,7 +561,6 @@ static void free_collectionlist(struct config *c, xfree(cll->s); } -#if HAVE_PCRE_H static void free_namepartlist(struct config *c, const struct conf *whoami) { struct namepartlist *npl = ADDRESS(c, struct namepartlist); @@ -588,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); @@ -605,13 +587,12 @@ 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); } xfree(tl->t); } -#endif static void free_netaddress(struct config *c, const struct conf *whoami) { @@ -627,7 +608,6 @@ static const struct conftype type_collections = { set_collections, free_collectionlist }, type_boolean = { set_boolean, free_none }, type_string = { set_string, free_string }, - type_stringlist = { set_stringlist, free_stringlist }, type_integer = { set_integer, free_none }, type_stringlist_accum = { set_stringlist_accum, free_stringlistlist }, type_string_accum = { set_string_accum, free_stringlist }, @@ -676,7 +656,7 @@ static int validate_isabspath(const struct config_state *cs, for(n = 0; n < nvec; ++n) if(vec[n][0] != '/') { - disorder_error(errno, "%s:%d: %s: not an absolute path", + disorder_error(0, "%s:%d: %s: not an absolute path", cs->path, cs->line, vec[n]); return -1; } @@ -741,15 +721,15 @@ 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) { disorder_error(0, "%s:%d: missing argument", cs->path, cs->line); @@ -759,10 +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)) { - disorder_error(0, "%s:%d: %s", cs->path, cs->line, strerror(errno)); + 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; @@ -779,19 +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; - - 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, strerror(errno)); - 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; @@ -799,6 +781,7 @@ static int validate_positive(const struct config_state *cs, return 0; } +#if !_WIN32 /** @brief Validate a system username * @param cs Configuration state * @param nvec Length of (proposed) new value @@ -814,6 +797,7 @@ static int validate_isauser(const struct config_state *cs, } return 0; } +#endif /** @brief Validate a sample format string * @param cs Configuration state @@ -952,6 +936,7 @@ static int validate_algo(const struct config_state attribute((unused)) *cs, return 0; } +#if !_WIN32 /** @brief Validate a playback backend name * @param cs Configuration state * @param nvec Length of (proposed) new value @@ -980,6 +965,7 @@ static int validate_backend(const struct config_state attribute((unused)) *cs, /* In non-server processes we have no idea what's valid */ return 0; } +#endif /** @brief Validate a pause mode string * @param cs Configuration state @@ -996,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 @@ -1022,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 */ @@ -1030,7 +1060,9 @@ static int validate_destaddr(const struct config_state attribute((unused)) *cs, /** @brief All configuration items */ static const struct conf conf[] = { { C(alias), &type_string, validate_alias }, +#if !_WIN32 { C(api), &type_string, validate_backend }, +#endif { C(authorization_algorithm), &type_string, validate_algo }, { C(broadcast), &type_netaddress, validate_destaddr }, { C(broadcast_from), &type_netaddress, validate_any }, @@ -1045,16 +1077,16 @@ static const struct conf conf[] = { { C(default_rights), &type_rights, validate_any }, { C(device), &type_string, validate_any }, { C(history), &type_integer, validate_positive }, +#if !_WIN32 { C(home), &type_string, validate_isabspath }, +#endif { C(listen), &type_netaddress, validate_any }, { C(mail_sender), &type_string, validate_any }, { C(mixer), &type_string, validate_any }, { C(mount_rescan), &type_boolean, validate_any }, { C(multicast_loop), &type_boolean, validate_any }, { C(multicast_ttl), &type_integer, validate_non_negative }, -#if HAVE_PCRE_H { C(namepart), &type_namepart, validate_any }, -#endif { C(new_bias), &type_integer, validate_positive }, { C(new_bias_age), &type_integer, validate_positive }, { C(new_max), &type_integer, validate_positive }, @@ -1075,26 +1107,38 @@ 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 }, +#if !_WIN32 { C(sendmail), &type_string, validate_isabspath }, +#endif { C(short_display), &type_integer, validate_positive }, { C(signal), &type_signal, validate_any }, { C(smtp_server), &type_string, validate_any }, { C(sox_generation), &type_integer, validate_non_negative }, +#if !_WIN32 { C2(speaker_backend, api), &type_string, validate_backend }, +#endif { C(speaker_command), &type_string, validate_any }, { C(stopword), &type_string_accum, validate_any }, { C(templates), &type_string_accum, validate_isdir }, { C(tracklength), &type_stringlist_accum, validate_tracklength }, -#if HAVE_PCRE_H { C(transform), &type_transform, validate_any }, -#endif { C(url), &type_string, validate_url }, +#if !_WIN32 { C(user), &type_string, validate_isauser }, +#endif { C(username), &type_string, validate_any }, }; @@ -1297,8 +1341,10 @@ static const char *const default_players[] = { */ static struct config *config_default(void) { struct config *c = xmalloc(sizeof *c); +#if !_WIN32 const char *logname; struct passwd *pw; +#endif struct config_state cs; size_t n; @@ -1307,14 +1353,30 @@ static struct config *config_default(void) { cs.config = c; /* Strings had better be xstrdup'd as they will get freed at some point. */ c->history = 60; +#if !_WIN32 c->home = xstrdup(pkgstatedir); +#endif +#if _WIN32 + { + char buffer[128]; + DWORD bufsize = sizeof buffer; + if(!GetUserNameA(buffer, &bufsize)) + disorder_fatal(0, "cannot determine our username"); + c->username = xstrdup(buffer); + } +#else if(!(pw = getpwuid(getuid()))) disorder_fatal(0, "cannot determine our username"); logname = pw->pw_name; c->username = xstrdup(logname); +#endif c->refresh = 15; c->refresh_min = 1; +#ifdef SIGKILL c->signal = SIGKILL; +#else + c->signal = SIGTERM; +#endif c->alias = xstrdup("{/artist}{/album}{/title}{ext}"); c->device = xstrdup("default"); c->nice_rescan = 10; @@ -1336,8 +1398,10 @@ static struct config *config_default(void) { c->dbversion = 2; c->cookie_login_lifetime = 86400; c->cookie_key_lifetime = 86400 * 7; +#if !_WIN32 if(sendmail_binary[0] && strcmp(sendmail_binary, "none")) c->sendmail = xstrdup(sendmail_binary); +#endif c->smtp_server = xstrdup("127.0.0.1"); c->new_max = 100; c->reminder_interval = 600; /* 10m */ @@ -1364,9 +1428,12 @@ 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; } +#if !_WIN32 /** @brief Construct a filename * @param c Configuration * @param name Base filename @@ -1380,11 +1447,14 @@ char *config_get_file2(struct config *c, const char *name) { byte_xasprintf(&s, "%s/%s", c->home, name); return s; } +#endif /** @brief Set the default configuration file */ static void set_configfile(void) { +#if !_WIN32 if(!configfile) byte_xasprintf(&configfile, "%s/config", pkgconfdir); +#endif } /** @brief Free a configuration object @@ -1415,12 +1485,9 @@ void config_free(struct config *c) { static void config_postdefaults(struct config *c, int server) { struct config_state cs; -#if HAVE_PCRE_H const struct conf *whoami; int n; -#endif -#if HAVE_PCRE_H static const char *namepart[][4] = { { "title", "/([0-9]+ *[-:]? *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" }, { "title", "/([^/]+)\\.[a-zA-Z0-9]+$", "$1", "sort" }, @@ -1438,12 +1505,10 @@ static void config_postdefaults(struct config *c, { "dir", "[[:punct:]]", "", "sort", "g", } }; #define NTRANSFORM (int)(sizeof transform / sizeof *transform) -#endif cs.path = ""; cs.line = 0; cs.config = c; -#if HAVE_PCRE_H if(!c->namepart.n) { whoami = find("namepart"); for(n = 0; n < NNAMEPART; ++n) @@ -1454,15 +1519,16 @@ static void config_postdefaults(struct config *c, for(n = 0; n < NTRANSFORM; ++n) set_transform(&cs, whoami, 5, (char **)transform[n]); } -#endif if(!c->api) { if(c->speaker_command) c->api = xstrdup("command"); else if(c->broadcast.af != -1) c->api = xstrdup("rtp"); +#if !_WIN32 else if(config_uaudio_apis) c->api = xstrdup(uaudio_default(config_uaudio_apis, UAUDIO_API_SERVER)->name); +#endif else c->api = xstrdup(""); } @@ -1471,8 +1537,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")) { @@ -1509,14 +1577,15 @@ int config_read(int server, const struct config *oldconfig) { struct config *c; char *privconf; - struct passwd *pw; + struct passwd *pw = NULL; set_configfile(); c = config_default(); - /* standalone Disobedience installs might not have a global config file */ - if(access(configfile, F_OK) == 0) - if(config_include(c, configfile)) - return -1; + /* standalone client installs might not have a global config file */ + if(configfile) + if(access(configfile, F_OK) == 0) + if(config_include(c, configfile)) + return -1; /* if we can read the private config file, do */ if((privconf = config_private()) && access(privconf, R_OK) == 0 @@ -1525,6 +1594,7 @@ int config_read(int server, xfree(privconf); /* if there's a per-user system config file for this user, read it */ if(config_per_user) { +#if !_WIN32 if(!(pw = getpwuid(getuid()))) disorder_fatal(0, "cannot determine our username"); if((privconf = config_usersysconf(pw)) @@ -1532,8 +1602,9 @@ int config_read(int server, && config_include(c, privconf)) return -1; 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; @@ -1543,10 +1614,12 @@ int config_read(int server, config_postdefaults(c, server); if(oldconfig) { int failed = 0; +#if !_WIN32 if(strcmp(c->home, oldconfig->home)) { disorder_error(0, "'home' cannot be changed without a restart"); failed = 1; } +#endif if(strcmp(c->alias, oldconfig->alias)) { disorder_error(0, "'alias' cannot be changed without a restart"); failed = 1; @@ -1563,12 +1636,10 @@ int config_read(int server, disorder_error(0, "'nice_server' cannot be changed without a restart"); /* ...but we accept the new config anyway */ } -#if HAVE_PCRE_H if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) { disorder_error(0, "'namepart' settings cannot be changed without a restart"); failed = 1; } -#endif if(stringlist_compare(&c->stopword, &oldconfig->stopword)) { disorder_error(0, "'stopword' settings cannot be changed without a restart"); failed = 1; @@ -1587,23 +1658,23 @@ int config_read(int server, /** @brief Return the path to the private configuration file */ char *config_private(void) { +#if _WIN32 + return NULL; +#else char *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(!home && !pw && !(pw = getpwuid(getuid()))) - disorder_fatal(0, "cannot determine our username"); - byte_xasprintf(&s, "%s/.disorder/passwd", home ? home : pw->pw_dir); - return s; +char *config_userconf(void) { + return profile_filename("passwd"); } +#if !_WIN32 /** @brief Return the path to user-specific system configuration */ char *config_usersysconf(const struct passwd *pw) { char *s; @@ -1623,6 +1694,7 @@ char *config_usersysconf(const struct passwd *pw) { char *config_get_file(const char *name) { return config_get_file2(config, name); } +#endif /** @brief Order two stringlists * @param a First stringlist @@ -1646,7 +1718,6 @@ static int stringlist_compare(const struct stringlist *a, return 0; } -#if HAVE_PCRE_H /** @brief Order two namepart definitions * @param a First namepart definition * @param b Second namepart definition @@ -1692,7 +1763,6 @@ static int namepartlist_compare(const struct namepartlist *a, else return 0; } -#endif /** @brief Verify configuration table. * @return The number of problems found