X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f2620548144b356661614eba36c9de12ef31395c..53a4a6fdcc52280765216ff019cf77b85ec48c18:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index 9170a2f..284ae7a 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2009 Richard Kettlewell + * Copyright (C) 2004-2011, 2013 Richard Kettlewell * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,9 +22,8 @@ #ifndef CONFIGURATION_H #define CONFIGURATION_H -#include - #include "speaker-protocol.h" +#include "regexp.h" #include "rights.h" #include "addr.h" @@ -68,28 +67,32 @@ struct collectionlist { struct collection *s; }; +/** @brief A track name part */ struct namepart { char *part; /* part */ - pcre *re; /* compiled regexp */ + regexp *re; /* compiled regexp */ char *res; /* regexp as a string */ char *replace; /* replacement string */ char *context; /* context glob */ unsigned reflags; /* regexp flags */ }; +/** @brief A list of track name parts */ struct namepartlist { int n; struct namepart *s; }; +/** @brief A track name transform */ struct transform { char *type; /* track or dir */ char *context; /* sort or choose */ char *replace; /* substitution string */ - pcre *re; /* compiled re */ + regexp *re; /* compiled re */ unsigned flags; /* regexp flags */ }; +/** @brief A list of track name transforms */ struct transformlist { int n; struct transform *t; @@ -108,24 +111,15 @@ struct config { /** @brief All tracklength plugins */ struct stringlistlist tracklength; - /** @brief Allowed users */ - struct stringlistlist allow; - /** @brief Scratch tracks */ struct stringlist scratch; - /** @brief Gap between tracks in seconds */ - long gap; - /** @brief Maximum number of recent tracks to record in history */ long history; /** @brief Expiry limit for noticed.db */ long noticed_history; - /** @brief Trusted users */ - struct stringlist trust; - /** @brief User for server to run as */ const char *user; @@ -153,17 +147,12 @@ struct config { /** @brief Mixer channel to use */ char *channel; - long prefsync; /* preflog sync interval */ - /** @brief Secondary listen address */ struct netaddress listen; /** @brief Alias format string */ const char *alias; - /** @brief Enable server locking */ - int lock; - /** @brief Nice value for server */ long nice_server; @@ -191,14 +180,16 @@ struct config { /** @brief Maximum lifetime of a playlist lock */ long playlist_lock_timeout; +#if !_WIN32 /** @brief Home directory for state files */ const char *home; +#endif /** @brief Login username */ - const char *username; + char *username; /** @brief Login password */ - const char *password; + char *password; /** @brief Address to connect to */ struct netaddress connect; @@ -215,15 +206,8 @@ struct config { /** @brief Maximum refresh interval for web interface (seconds) */ long refresh; - /** @brief Facilities restricted to trusted users - * - * A bitmap of @ref RESTRICT_SCRATCH, @ref RESTRICT_REMOVE and @ref - * RESTRICT_MOVE. - */ - unsigned restrictions; /* restrictions */ -#define RESTRICT_SCRATCH 1 /**< Restrict scratching */ -#define RESTRICT_REMOVE 2 /**< Restrict removal */ -#define RESTRICT_MOVE 4 /**< Restrict rearrangement */ + /** @brief Minimum refresh interval for web interface (seconds) */ + long refresh_min; /** @brief Target queue length */ long queue_pad; @@ -238,6 +222,7 @@ struct config { /** @brief ALSA output device */ const char *device; + struct transformlist transform; /* path name transformations */ /** @brief Address to send audio data to */ @@ -248,6 +233,28 @@ struct config { /** @brief RTP delay threshold */ long rtp_delay_threshold; + + /** @brief Whether to ignore the server's suggested RTP arrangement and + * always request a unicast stream */ + int rtp_always_request; + + /** @brief RTP buffer low-water mark */ + long rtp_minbuffer; + + /** @brief RTP buffer maximum size */ + long rtp_maxbuffer; + + /** @brief RTP receive buffer size */ + long rtp_rcvbuf; + + /** @brief Fixed RTP listening address */ + struct netaddress rtp_request_address; + + /** @brief @c disorder-playrtp instance name (for naming sockets etc.) */ + char *rtp_instance_name; + + /** @brief Verbose RTP transmission logging */ + int rtp_verbose; /** @brief TTL for multicast packets */ long multicast_ttl; @@ -255,6 +262,25 @@ struct config { /** @brief Whether to loop back multicast packets */ int multicast_loop; + /** @brief Maximum size of RTP payload to send + * + * This is the maximum number of bytes we pass to write(2); to determine + * actual packet sizes, add a UDP header and an IP header (and a link layer + * header if it's the link layer size you care about). + * + * Don't make this too big or arithmetic will start to overflow. + */ + long rtp_max_payload; + + /** @brief Whether to allow MTU discovery + * + * This is `yes' to force it on, `no' to force it off, or `default' to do + * whatever the system is configured to do. Note that this only has a + * useful effect in IPv4, since IPv6 doesn't permit hop-by-hop + * fragmentation. + */ + char *rtp_mtu_discovery; + /** @brief Login lifetime in seconds */ long cookie_login_lifetime; @@ -287,7 +313,13 @@ struct config { /** @brief Maximum bias */ long new_bias; - + + /** @brief Rescan on (un)mount */ + int mount_rescan; + + /** @brief RTP mode */ + const char *rtp_mode; + /* derived values: */ int nparts; /* number of distinct name parts */ char **parts; /* name part list */ @@ -320,6 +352,10 @@ char *config_usersysconf(const struct passwd *pw ); char *config_private(void); /* get the private config file */ +int config_verify(void); + +void config_free(struct config *c); + extern char *configfile; extern int config_per_user;