Leave a bit of headroom above test port number, since we go at least

[disorder] / server / state.c

diff --git a/server/state.c b/server/state.c
index 9a93dc967acfa31dd064e2bca58090e74370ddc4..e10a2302044be5e6d88d443d7ed62549655f1f12 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -20,13 +20,21 @@
  */
 #include "disorder-server.h"
 
+/** @brief Current AF_UNIX socket path */
 static const char *current_unix;
+
+/** @brief Current AF_UNIX socket */
 static int current_unix_fd;
 
 /** @brief TCP listener definition */
 struct listener {
+  /** @brief Next listener */
   struct listener *next;
+
+  /** @brief Local socket address */
   struct sockaddr *sa;
+
+  /** @brief File descriptor */
   int fd;
 };
 
@@ -36,6 +44,7 @@ static struct listener *listeners;
 /** @brief Current audio API */
 const struct uaudio *api;
 
+/** @brief Quit DisOrder */
 void quit(ev_source *ev) {
   info("shutting down...");
   quitting(ev);
@@ -45,12 +54,14 @@ void quit(ev_source *ev) {
   exit(0);
 }
 
+/** @brief Create a copy of an @c addrinfo structure */
 static struct sockaddr *copy_sockaddr(const struct addrinfo *addr) {
   struct sockaddr *sa = xmalloc_noptr(addr->ai_addrlen);
   memcpy(sa, addr->ai_addr, addr->ai_addrlen);
   return sa;
 }
 
+/** @brief Create and destroy sockets to set current configuration */
 static void reset_socket(ev_source *ev) {
   const char *new_unix;
   struct addrinfo *res, *r;
@@ -123,6 +134,8 @@ static void reset_socket(ev_source *ev) {
        l->fd = fd;
        listeners = l;
       }
+      /* We ignore any failures (though server_start() will have
+       * logged them). */
     }
   }
   /* if res is still set it needs freeing */
@@ -130,42 +143,44 @@ static void reset_socket(ev_source *ev) {
     freeaddrinfo(res);
 }
 
+/** @brief Reconfigure the server
+ * @param reload 0 at startup, 1 for a reload
+ */
 int reconfigure(ev_source *ev, int reload) {
   int need_another_rescan = 0;
   int ret = 0;
 
   D(("reconfigure(%d)", reload));
+  /* Deconfigure the old audio API if there is one */
   if(api) {
     if(api->close_mixer)
       api->close_mixer();
     api = NULL;
   }
   if(reload) {
+    /* If there's a rescan in progress, cancel it but remember to start a fresh
+     * one after the reload. */
     need_another_rescan = trackdb_rescan_cancel();
-    trackdb_close();
-    if(config_read(1))
+    /* (Re-)read the configuration */
+    if(config_read(1/*server*/, config))
       ret = -1;
     else {
       /* Tell the speaker it needs to reload its config too. */
       speaker_reload();
       info("%s: installed new configuration", configfile);
     }
-    trackdb_open(TRACKDB_NO_UPGRADE);
-  } else
-    /* We only allow for upgrade at startup */
-    trackdb_open(TRACKDB_CAN_UPGRADE);
+  }
+  /* New audio API */
   api = uaudio_find(config->api);
   if(api->configure)
     api->configure();
   if(api->open_mixer)
     api->open_mixer();
+  /* If we interrupted a rescan of all the tracks, start a new one */
   if(need_another_rescan)
     trackdb_rescan(ev, 1/*check*/, 0, 0);
-  /* Arrange timeouts for schedule actions */
-  schedule_init(ev);
   if(!ret) {
-    queue_read();
-    recent_read();
+    /* Reset sockets */
     reset_socket(ev);
   }
   return ret;
@@ -175,5 +190,7 @@ int reconfigure(ev_source *ev, int reload) {
 Local Variables:
 c-basic-offset:2
 comment-column:40
+fill-column:79
+indent-tabs-mode:nil
 End:
 */