lib/configuration.c, etc.: Remove arguments from `config_userconf'.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 2b0db524361ae4a4996d171b8500162cfd6d0329..46a6272ec8487eddded45e9b08e8cdaf4cc1f23f 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -244,12 +244,15 @@ struct config {
   /** @brief RTP buffer maximum size */
   long rtp_maxbuffer;
 
-  /* @brief RTP receive buffer size */
+  /** @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;
   
@@ -269,6 +272,15 @@ struct config {
    */
   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;
 
@@ -330,9 +342,8 @@ char *config_get_file(const char *name);
 
 struct passwd;
 
-char *config_userconf(const char *home, const struct passwd *pw);
-/* get the user's own private conffile, assuming their home dir is
- * @home@ if not null and using @pw@ otherwise */
+char *config_userconf(void);
+/* get the user's own private conffile */
 
 char *config_usersysconf(const struct passwd *pw );
 /* get the user's conffile in /etc */