X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/711a4497dbc85cd50e77f01c0763de1cb57e47de..e31de8226f81ac0d38666423f60ea4754da1b874:/lib/client.c

diff --git a/lib/client.c b/lib/client.c
index e7a1acc..fdf0abe 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-13 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
@@ -25,13 +25,22 @@
 #include "common.h"
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <unistd.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <errno.h>
-#include <netdb.h>
-#include <pcre.h>
+#if HAVE_NETDB_H
+# include <netdb.h>
+#endif
 
 #include "log.h"
 #include "mem.h"
@@ -50,15 +59,15 @@
 #include "authhash.h"
 #include "client-common.h"
 #include "rights.h"
-#include "trackdb.h"
 #include "kvp.h"
+#include "socketio.h"
 
 /** @brief Client handle contents */
 struct disorder_client {
   /** @brief Stream to read from */
-  FILE *fpin;
+  struct source *input;
   /** @brief Stream to write to */
-  FILE *fpout;
+  struct sink *output;
   /** @brief Peer description */
   char *ident;
   /** @brief Username */
@@ -67,6 +76,14 @@ struct disorder_client {
   int verbose;
   /** @brief Last error string */
   const char *last;
+  /** @brief Address family */
+  int family;
+  /** @brief True if open */
+  int open;
+  /** @brief Socket I/O context */
+  struct socketio sio;
+  /** @brief Whether to try to open a privileged connection */
+  int trypriv;
 };
 
 /** @brief Create a new client
@@ -81,9 +98,45 @@ disorder_client *disorder_new(int verbose) {
   disorder_client *c = xmalloc(sizeof (struct disorder_client));
 
   c->verbose = verbose;
+  c->family = -1;
+  c->trypriv = 1;
   return c;
 }
 
+/** @brief Don't try to make a privileged connection
+ * @param c Client
+ *
+ * You must call this before any of the connection functions (e.g.,
+ * disorder_connect(), disorder_connect_user()), if at all.
+ */
+void disorder_force_unpriv(disorder_client *c) {
+  assert(!c->open);
+  c->trypriv = 0;
+}
+
+/** @brief Return the address family used by this client */
+int disorder_client_af(disorder_client *c) {
+  return c->family;
+}
+
+/** @brief Determine the local socket address of this client */
+int disorder_client_sockname(disorder_client *c,
+			     struct sockaddr *sa, socklen_t *len_inout) {
+  int rc;
+  if((rc = getsockname(c->sio.sd, sa, len_inout)))
+    disorder_error(errno, "failed to read client socket name");
+  return rc;
+}
+
+/** @brief Determine the remote peer address for this client */
+int disorder_client_peername(disorder_client *c,
+			     struct sockaddr *sa, socklen_t *len_inout) {
+  int rc;
+  if((rc = getpeername(c->sio.sd, sa, len_inout)))
+    disorder_error(errno, "failed to read client socket name");
+  return rc;
+}
+
 /** @brief Read a response line
  * @param c Client
  * @param rp Where to store response, or NULL (UTF-8)
@@ -91,9 +144,11 @@ disorder_client *disorder_new(int verbose) {
  */
 static int response(disorder_client *c, char **rp) {
   char *r;
+  char errbuf[1024];
 
-  if(inputline(c->ident, c->fpin, &r, '\n')) {
-    byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
+  if(inputlines(c->ident, c->input, &r, '\n')) {
+    byte_xasprintf((char **)&c->last, "input error: %s",
+                   format_error(c->input->eclass, source_err(c->input), errbuf, sizeof errbuf));
     return -1;
   }
   D(("response: %s", r));
@@ -155,8 +210,6 @@ static int check_response(disorder_client *c, char **rp) {
  * @param c Client
  * @param rp Where to store result, or NULL
  * @param cmd Command
- * @param body Body or NULL
- * @param nbody Length of body or -1
  * @param ap Arguments (UTF-8), terminated by (char *)0
  * @return 0 on success, non-0 on error
  *
@@ -168,24 +221,38 @@ static int check_response(disorder_client *c, char **rp) {
  * NB that the response will NOT be converted to the local encoding
  * nor will quotes be stripped.  See dequote().
  *
- * If @p body is not NULL then the body is sent immediately after the
- * command.  @p nbody should be the number of lines or @c -1 to count
- * them if @p body is NULL-terminated.
+ * Put @ref disorder__body in the argument list followed by a char **
+ * and int giving the body to follow the command.  If the int is @c -1
+ * then the list is assumed to be NULL-terminated.  This may be used
+ * only once.
+ *
+ * Put @ref disorder__list in the argument list followed by a char **
+ * and int giving a list of arguments to include.  If the int is @c -1
+ * then the list is assumed to be NULL-terminated.  This may be used
+ * any number of times.
+ *
+ * Put @ref disorder__integer in the argument list followed by a long to
+ * send its value in decimal.  This may be used any number of times.
+ *
+ * Put @ref disorder__time in the argument list followed by a time_t
+ * to send its value in decimal.  This may be used any number of
+ * times.
  *
  * Usually you would call this via one of the following interfaces:
  * - disorder_simple()
- * - disorder_simple_body()
- * - disorder_simple_list()
  */
 static int disorder_simple_v(disorder_client *c,
 			     char **rp,
 			     const char *cmd,
-                             char **body, int nbody,
                              va_list ap) {
   const char *arg;
   struct dynstr d;
+  char **body = NULL;
+  int nbody = 0;
+  int has_body = 0;
+  char errbuf[1024];
 
-  if(!c->fpout) {
+  if(!c->open) {
     c->last = "not connected";
     disorder_error(0, "not connected to server");
     return -1;
@@ -194,38 +261,70 @@ static int disorder_simple_v(disorder_client *c,
     dynstr_init(&d);
     dynstr_append_string(&d, cmd);
     while((arg = va_arg(ap, const char *))) {
-      dynstr_append(&d, ' ');
-      dynstr_append_string(&d, quoteutf8(arg));
+      if(arg == disorder__body) {
+	body = va_arg(ap, char **);
+	nbody = va_arg(ap, int);
+	has_body = 1;
+      } else if(arg == disorder__list) {
+	char **list = va_arg(ap, char **);
+	int nlist = va_arg(ap, int);
+        int n;
+	if(nlist < 0) {
+	  for(nlist = 0; list[nlist]; ++nlist)
+	    ;
+	}
+	for(n = 0; n < nlist; ++n) {
+	  dynstr_append(&d, ' ');
+	  dynstr_append_string(&d, quoteutf8(arg));
+	}
+      } else if(arg == disorder__integer) {
+	long n = va_arg(ap, long);
+	char buffer[16];
+	byte_snprintf(buffer, sizeof buffer, "%ld", n);
+	dynstr_append(&d, ' ');
+	dynstr_append_string(&d, buffer);
+      } else if(arg == disorder__time) {
+	time_t n = va_arg(ap, time_t);
+	char buffer[16];
+	byte_snprintf(buffer, sizeof buffer, "%lld", (long long)n);
+	dynstr_append(&d, ' ');
+	dynstr_append_string(&d, buffer);
+      } else {
+	dynstr_append(&d, ' ');
+	dynstr_append_string(&d, quoteutf8(arg));
+      }
     }
     dynstr_append(&d, '\n');
     dynstr_terminate(&d);
     D(("command: %s", d.vec));
-    if(fputs(d.vec, c->fpout) < 0)
+    if(sink_write(c->output, d.vec, d.nvec) < 0)
       goto write_error;
     xfree(d.vec);
-    if(body) {
+    if(has_body) {
+      int n;
       if(nbody < 0)
         for(nbody = 0; body[nbody]; ++nbody)
           ;
-      for(int n = 0; n < nbody; ++n) {
+      for(n = 0; n < nbody; ++n) {
         if(body[n][0] == '.')
-          if(fputc('.', c->fpout) < 0)
+          if(sink_writec(c->output, '.') < 0)
             goto write_error;
-        if(fputs(body[n], c->fpout) < 0)
+        if(sink_writes(c->output, body[n]) < 0)
           goto write_error;
-        if(fputc('\n', c->fpout) < 0)
+        if(sink_writec(c->output, '\n') < 0)
           goto write_error;
       }
-      if(fputs(".\n", c->fpout) < 0)
+      if(sink_writes(c->output, ".\n") < 0)
         goto write_error;
     }
-    if(fflush(c->fpout))
+    if(sink_flush(c->output))
       goto write_error;
   }
   return check_response(c, rp);
 write_error:
-  byte_xasprintf((char **)&c->last, "write error: %s", strerror(errno));
-  disorder_error(errno, "error writing to %s", c->ident);
+  byte_xasprintf((char **)&c->last, "write error: %s", 
+                 format_error(c->output->eclass, sink_err(c->output), errbuf, sizeof errbuf));
+  disorder_error(0, "%s: %s", c->ident, c->last);
   return -1;
 }
 
@@ -253,31 +352,61 @@ static int disorder_simple(disorder_client *c,
   int ret;
 
   va_start(ap, cmd);
-  ret = disorder_simple_v(c, rp, cmd, 0, 0, ap);
+  ret = disorder_simple_v(c, rp, cmd, ap);
   va_end(ap);
   return ret;
 }
 
-/** @brief Issue a command with a body and parse a simple response
+/** @brief Issue a command and split the response
  * @param c Client
- * @param rp Where to store result, or NULL (UTF-8)
- * @param body Pointer to body
- * @param nbody Size of body
+ * @param vecp Where to store results
+ * @param nvecp Where to store count of results
+ * @param expected Expected count (or -1 to not check)
  * @param cmd Command
  * @return 0 on success, non-0 on error
  *
- * See disorder_simple().
+ * The remaining arguments are command arguments, terminated by (char
+ * *)0.  They should be in UTF-8.
+ *
+ * 5xx responses count as errors.
+ *
+ * @p rp will NOT be filled in for xx9 responses (where it is just
+ * commentary for a command where it would normally be meaningful).
+ *
+ * NB that the response will NOT be converted to the local encoding
+ * nor will quotes be stripped.  See dequote().
  */
-static int disorder_simple_body(disorder_client *c,
-                                char **rp,
-                                char **body, int nbody,
-                                const char *cmd, ...) {
+static int disorder_simple_split(disorder_client *c,
+				 char ***vecp,
+				 int *nvecp,
+				 int expected,
+				 const char *cmd, ...) {
   va_list ap;
   int ret;
+  char *r;
+  char **vec;
+  int nvec;
 
   va_start(ap, cmd);
-  ret = disorder_simple_v(c, rp, cmd, body, nbody, ap);
+  ret = disorder_simple_v(c, &r, cmd, ap);
   va_end(ap);
+  if(!ret) {
+    vec = split(r, &nvec, SPLIT_QUOTES, 0, 0);
+    xfree(r);
+    if(expected < 0 || nvec == expected) {
+      *vecp = vec;
+      *nvecp = nvec;
+    } else {
+      disorder_error(0, "malformed reply to %s", cmd);
+      c->last = "malformed reply";
+      ret = -1;
+      free_strings(nvec, vec);
+    }
+  }
+  if(ret) {
+    *vecp = NULL;
+    *nvecp = 0;
+  }
   return ret;
 }
 
@@ -321,7 +450,8 @@ int disorder_connect_generic(struct config *conf,
                              const char *username,
                              const char *password,
                              const char *cookie) {
-  int fd = -1, fd2 = -1, nrvec = 0, rc;
+  SOCKET sd = INVALID_SOCKET;
+  int nrvec = 0, rc;
   unsigned char *nonce = NULL;
   size_t nl;
   char *res = NULL;
@@ -329,37 +459,32 @@ int disorder_connect_generic(struct config *conf,
   const char *protocol, *algorithm, *challenge;
   struct sockaddr *sa = NULL;
   socklen_t salen;
+  char errbuf[1024];
 
-  if((salen = find_server(conf, &sa, &c->ident)) == (socklen_t)-1)
+  if((salen = disorder_find_server(conf,
+				   (c->trypriv ? 0 : DISORDER_FS_NOTPRIV),
+				   &sa, &c->ident)) == (socklen_t)-1)
     return -1;
-  c->fpin = c->fpout = 0;
-  if((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
-    byte_xasprintf((char **)&c->last, "socket: %s", strerror(errno));
-    disorder_error(errno, "error calling socket");
+  c->input = 0;
+  c->output = 0;
+  if((sd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
+    byte_xasprintf((char **)&c->last, "socket: %s",
+                   format_error(ec_socket, socket_error(), errbuf, sizeof errbuf));
+    disorder_error(0, "%s", c->last);
     return -1;
   }
-  if(connect(fd, sa, salen) < 0) {
-    byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno));
-    disorder_error(errno, "error calling connect");
+  c->family = sa->sa_family;
+  if(connect(sd, sa, salen) < 0) {
+    byte_xasprintf((char **)&c->last, "connect: %s",
+                   format_error(ec_socket, socket_error(), errbuf, sizeof errbuf));
+    disorder_error(0, "%s", c->last);
     goto error;
   }
-  if((fd2 = dup(fd)) < 0) {
-    byte_xasprintf((char **)&c->last, "dup: %s", strerror(errno));
-    disorder_error(errno, "error calling dup");
-    goto error;
-  }
-  if(!(c->fpin = fdopen(fd, "rb"))) {
-    byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
-    disorder_error(errno, "error calling fdopen");
-    goto error;
-  }
-  fd = -1;
-  if(!(c->fpout = fdopen(fd2, "wb"))) {
-    byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
-    disorder_error(errno, "error calling fdopen");
-    goto error;
-  }
-  fd2 = -1;
+  socketio_init(&c->sio, sd);
+  c->open = 1;
+  sd = INVALID_SOCKET;
+  c->output = sink_socketio(&c->sio);
+  c->input = source_socketio(&c->sio);
   if((rc = disorder_simple(c, &r, 0, (const char *)0)))
     goto error_rc;
   if(!(rvec = split(r, &nrvec, SPLIT_QUOTES, 0, 0)))
@@ -405,16 +530,12 @@ int disorder_connect_generic(struct config *conf,
 error:
   rc = -1;
 error_rc:
-  if(c->fpin) {
-    fclose(c->fpin);
-    c->fpin = 0;
-  }
-  if(c->fpout) {
-    fclose(c->fpout);
-    c->fpout = 0;
-  }
-  if(fd2 != -1) close(fd2);
-  if(fd != -1) close(fd);
+  xfree(c->output);
+  c->output = NULL;
+  xfree(c->input);
+  c->input = NULL;
+  if(c->open) { socketio_close(&c->sio); c->open = 0; }
+  if(sd != INVALID_SOCKET) closesocket(sd);
   return rc;
 }
 
@@ -451,13 +572,13 @@ int disorder_connect(disorder_client *c) {
     return -1;
   }
   password = config->password;
-  /* Maybe we can read the database */
-  if(!password && trackdb_readable()) {
-    trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
-    trackdb_open(TRACKDB_READ_ONLY);
-    password = trackdb_get_password(username);
-    trackdb_close();
-  }
+  /* If we're connecting as 'root' guess that we're the system root
+   * user (or the jukebox user), both of which can use the privileged
+   * socket.  They can also furtle with the db directly: that is why
+   * privileged socket does not represent a privilege escalation. */
+  if(!password
+     && !strcmp(username, "root"))
+    password = "anything will do for root";
   if(!password) {
     /* Oh well */
     c->last = "no password";
@@ -478,7 +599,7 @@ int disorder_connect(disorder_client *c) {
  *
  * If @p cookie is NULL or does not work then we attempt to log in as
  * guest instead (so when the cookie expires only an extra round trip
- * is needed rathre than a complete new login).
+ * is needed rather than a complete new login).
  */
 int disorder_connect_cookie(disorder_client *c,
 			    const char *cookie) {
@@ -499,22 +620,12 @@ int disorder_connect_cookie(disorder_client *c,
 int disorder_close(disorder_client *c) {
   int ret = 0;
 
-  if(c->fpin) {
-    if(fclose(c->fpin) < 0) {
-      byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
-      disorder_error(errno, "error calling fclose");
-      ret = -1;
-    }
-    c->fpin = 0;
-  }
-  if(c->fpout) {
-    if(fclose(c->fpout) < 0) {
-      byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
-      disorder_error(errno, "error calling fclose");
-      ret = -1;
-    }
-    c->fpout = 0;
-  }
+  if(c->open)
+    socketio_close(&c->sio);
+  xfree(c->output);
+  c->output = NULL;
+  xfree(c->input);
+  c->input = NULL;
   xfree(c->ident);
   c->ident = 0;
   xfree(c->user);
@@ -522,37 +633,24 @@ int disorder_close(disorder_client *c) {
   return ret;
 }
 
-/** @brief Move a track
- * @param c Client
- * @param track Track to move (UTF-8)
- * @param delta Distance to move by
- * @return 0 on success, non-0 on error
- */
-int disorder_move(disorder_client *c, const char *track, int delta) {
-  char d[16];
-
-  byte_snprintf(d, sizeof d, "%d", delta);
-  return disorder_simple(c, 0, "move", track, d, (char *)0);
-}
-
 static void client_error(const char *msg,
 			 void attribute((unused)) *u) {
   disorder_error(0, "error parsing reply: %s", msg);
 }
 
-/** @brief Get currently playing track
+/** @brief Get a single queue entry
  * @param c Client
+ * @param cmd Command
  * @param qp Where to store track information
  * @return 0 on success, non-0 on error
- *
- * @p qp gets NULL if no track is playing.
  */
-int disorder_playing(disorder_client *c, struct queue_entry **qp) {
+static int onequeue(disorder_client *c, const char *cmd,
+		    struct queue_entry **qp) {
   char *r;
   struct queue_entry *q;
   int rc;
 
-  if((rc = disorder_simple(c, &r, "playing", (char *)0)))
+  if((rc = disorder_simple(c, &r, cmd, (char *)0)))
     return rc;
   if(r) {
     q = xmalloc(sizeof *q);
@@ -565,15 +663,13 @@ int disorder_playing(disorder_client *c, struct queue_entry **qp) {
 }
 
 /** @brief Fetch the queue, recent list, etc */
-static int disorder_somequeue(disorder_client *c,
-			      const char *cmd, struct queue_entry **qp) {
+static int readqueue(disorder_client *c,
+		     struct queue_entry **qp) {
   struct queue_entry *qh, **qt = &qh, *q;
   char *l;
-  int rc;
+  char errbuf[1024];
 
-  if((rc = disorder_simple(c, 0, cmd, (char *)0)))
-    return rc;
-  while(inputline(c->ident, c->fpin, &l, '\n') >= 0) {
+  while(inputlines(c->ident, c->input, &l, '\n') >= 0) {
     if(!strcmp(l, ".")) {
       *qt = 0;
       *qp = qh;
@@ -587,38 +683,16 @@ static int disorder_somequeue(disorder_client *c,
     }
     xfree(l);
   }
-  if(ferror(c->fpin)) {
-    byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
-    disorder_error(errno, "error reading %s", c->ident);
+  if(source_err(c->input)) {
+    byte_xasprintf((char **)&c->last, "input error: %s",
+                   format_error(c->input->eclass, source_err(c->input), errbuf, sizeof errbuf));
   } else {
-    c->last = "input error: unexpxected EOF";
-    disorder_error(0, "error reading %s: unexpected EOF", c->ident);
+    c->last = "input error: unexpected EOF";
   }
+  disorder_error(0, "%s: %s", c->ident, c->last);
   return -1;
 }
 
-/** @brief Get recently played tracks
- * @param c Client
- * @param qp Where to store track information
- * @return 0 on success, non-0 on error
- *
- * The last entry in the list is the most recently played track.
- */
-int disorder_recent(disorder_client *c, struct queue_entry **qp) {
-  return disorder_somequeue(c, "recent", qp);
-}
-
-/** @brief Get queue
- * @param c Client
- * @param qp Where to store track information
- * @return 0 on success, non-0 on error
- *
- * The first entry in the list will be played next.
- */
-int disorder_queue(disorder_client *c, struct queue_entry **qp) {
-  return disorder_somequeue(c, "queue", qp);
-}
-
 /** @brief Read a dot-stuffed list
  * @param c Client
  * @param vecp Where to store list (UTF-8)
@@ -630,9 +704,10 @@ int disorder_queue(disorder_client *c, struct queue_entry **qp) {
 static int readlist(disorder_client *c, char ***vecp, int *nvecp) {
   char *l;
   struct vector v;
+  char errbuf[1024];
 
   vector_init(&v);
-  while(inputline(c->ident, c->fpin, &l, '\n') >= 0) {
+  while(inputlines(c->ident, c->input, &l, '\n') >= 0) {
     if(!strcmp(l, ".")) {
       vector_terminate(&v);
       if(nvecp)
@@ -644,43 +719,16 @@ static int readlist(disorder_client *c, char ***vecp, int *nvecp) {
     vector_append(&v, xstrdup(l + (*l == '.')));
     xfree(l);
   }
-  if(ferror(c->fpin)) {
-    byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
-    disorder_error(errno, "error reading %s", c->ident);
+  if(source_err(c->input)) {
+    byte_xasprintf((char **)&c->last, "input error: %s",
+                   format_error(c->input->eclass, source_err(c->input), errbuf, sizeof errbuf));
   } else {
     c->last = "input error: unexpxected EOF";
-    disorder_error(0, "error reading %s: unexpected EOF", c->ident);
   }
+  disorder_error(0, "%s: %s", c->ident, c->last);
   return -1;
 }
 
-/** @brief Issue a comamnd and get a list response
- * @param c Client
- * @param vecp Where to store list (UTF-8)
- * @param nvecp Where to store number of items, or NULL
- * @param cmd Command
- * @return 0 on success, non-0 on error
- *
- * The remaining arguments are command arguments, terminated by (char
- * *)0.  They should be in UTF-8.
- *
- * 5xx responses count as errors.
- *
- * See disorder_simple().
- */
-static int disorder_simple_list(disorder_client *c,
-				char ***vecp, int *nvecp,
-				const char *cmd, ...) {
-  va_list ap;
-  int ret;
-
-  va_start(ap, cmd);
-  ret = disorder_simple_v(c, 0, cmd, 0, 0, ap);
-  va_end(ap);
-  if(ret) return ret;
-  return readlist(c, vecp, nvecp);
-}
-
 /** @brief Return the user we logged in with
  * @param c Client
  * @return User name (owned by @p c, don't modify)
@@ -689,29 +737,36 @@ char *disorder_user(disorder_client *c) {
   return c->user;
 }
 
-static void pref_error_handler(const char *msg,
+static void pairlist_error_handler(const char *msg,
 			       void attribute((unused)) *u) {
-  disorder_error(0, "error handling 'prefs' reply: %s", msg);
+  disorder_error(0, "error handling key-value pair reply: %s", msg);
 }
 
-/** @brief Get all preferences for a trcak
+/** @brief Get a list of key-value pairs
  * @param c Client
- * @param track Track name
  * @param kp Where to store linked list of preferences
+ * @param cmd Command
+ * @param ... Arguments
  * @return 0 on success, non-0 on error
  */
-int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) {
+static int pairlist(disorder_client *c, struct kvp **kp, const char *cmd, ...) {
   char **vec, **pvec;
   int nvec, npvec, n, rc;
   struct kvp *k;
+  va_list ap;
 
-  if((rc = disorder_simple_list(c, &vec, &nvec, "prefs", track, (char *)0)))
+  va_start(ap, cmd);
+  rc = disorder_simple_v(c, 0, cmd, ap);
+  va_end(ap);
+  if(rc)
     return rc;
+  if((rc = readlist(c, &vec, &nvec)))
+     return rc;
   for(n = 0; n < nvec; ++n) {
-    if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pref_error_handler, 0)))
+    if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pairlist_error_handler, 0)))
       return -1;
     if(npvec != 2) {
-      pref_error_handler("malformed response", 0);
+      pairlist_error_handler("malformed response", 0);
       return -1;
     }
     *kp = k = xmalloc(sizeof *k);
@@ -725,6 +780,10 @@ int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) {
   return 0;
 }
 
+#if _WIN32
+# define boolean bodge_boolean
+#endif
+
 /** @brief Parse a boolean response
  * @param cmd Command for use in error messsage
  * @param value Result from server
@@ -742,41 +801,6 @@ static int boolean(const char *cmd, const char *value,
   return 0;
 }
 
-/** @brief Set volume
- * @param c Client
- * @param left New left channel value
- * @param right New right channel value
- * @return 0 on success, non-0 on error
- */
-int disorder_set_volume(disorder_client *c, int left, int right) {
-  char *ls, *rs;
-
-  if(byte_asprintf(&ls, "%d", left) < 0
-     || byte_asprintf(&rs, "%d", right) < 0)
-    return -1;
-  return disorder_simple(c, 0, "volume", ls, rs, (char *)0);
-}
-
-/** @brief Get volume
- * @param c Client
- * @param left Where to store left channel value
- * @param right Where to store right channel value
- * @return 0 on success, non-0 on error
- */
-int disorder_get_volume(disorder_client *c, int *left, int *right) {
-  char *r;
-  int rc;
-
-  if((rc = disorder_simple(c, &r, "volume", (char *)0)))
-    return rc;
-  if(sscanf(r, "%d %d", left, right) != 2) {
-    c->last = "malformed volume response";
-    disorder_error(0, "error parsing response to 'volume': '%s'", r);
-    return -1;
-  }
-  return 0;
-}
-
 /** @brief Log to a sink
  * @param c Client
  * @param s Sink to write log lines to
@@ -785,143 +809,24 @@ int disorder_get_volume(disorder_client *c, int *left, int *right) {
 int disorder_log(disorder_client *c, struct sink *s) {
   char *l;
   int rc;
+  char errbuf[1024];
     
   if((rc = disorder_simple(c, 0, "log", (char *)0)))
     return rc;
-  while(inputline(c->ident, c->fpin, &l, '\n') >= 0 && strcmp(l, "."))
+  while(inputlines(c->ident, c->input, &l, '\n') >= 0 && strcmp(l, "."))
     if(sink_printf(s, "%s\n", l) < 0) return -1;
-  if(ferror(c->fpin) || feof(c->fpin)) {
+  if(source_err(c->input)) {
     byte_xasprintf((char **)&c->last, "input error: %s",
-		   ferror(c->fpin) ? strerror(errno) : "unexpxected EOF");
+		   format_error(c->input->eclass, source_err(c->input), errbuf, sizeof errbuf));
     return -1;
-  }
-  return 0;
-}
-
-/** @brief Get recently added tracks
- * @param c Client
- * @param vecp Where to store pointer to list (UTF-8)
- * @param nvecp Where to store count
- * @param max Maximum tracks to fetch, or 0 for all available
- * @return 0 on success, non-0 on error
- */
-int disorder_new_tracks(disorder_client *c,
-			char ***vecp, int *nvecp,
-			int max) {
-  char limit[32];
-
-  sprintf(limit, "%d", max);
-  return disorder_simple_list(c, vecp, nvecp, "new", limit, (char *)0);
-}
-
-/** @brief Get server's RTP address information
- * @param c Client
- * @param addressp Where to store address (UTF-8)
- * @param portp Where to store port (UTF-8)
- * @return 0 on success, non-0 on error
- */
-int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) {
-  char *r;
-  int rc, n;
-  char **vec;
-
-  if((rc = disorder_simple(c, &r, "rtp-address", (char *)0)))
-    return rc;
-  vec = split(r, &n, SPLIT_QUOTES, 0, 0);
-  if(n != 2) {
-    c->last = "malformed RTP address";
-    disorder_error(0, "malformed rtp-address reply");
+  } else if(source_eof(c->input)) {
+    byte_xasprintf((char **)&c->last, "input error: unexpected EOF");
     return -1;
   }
-  *addressp = vec[0];
-  *portp = vec[1];
-  return 0;
-}
 
-/** @brief Get details of a scheduled event
- * @param c Client
- * @param id Event ID
- * @param actiondatap Where to put details
- * @return 0 on success, non-0 on error
- */
-int disorder_schedule_get(disorder_client *c, const char *id,
-			  struct kvp **actiondatap) {
-  char **lines, **bits;
-  int rc, nbits;
-
-  *actiondatap = 0;
-  if((rc = disorder_simple_list(c, &lines, NULL,
-				"schedule-get", id, (char *)0)))
-    return rc;
-  while(*lines) {
-    if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) {
-      disorder_error(0, "invalid schedule-get reply: cannot split line");
-      return -1;
-    }
-    if(nbits != 2) {
-      disorder_error(0, "invalid schedule-get reply: wrong number of fields");
-      return -1;
-    }
-    kvp_set(actiondatap, bits[0], bits[1]);
-  }
   return 0;
 }
 
-/** @brief Add a scheduled event
- * @param c Client
- * @param when When to trigger the event
- * @param priority Event priority ("normal" or "junk")
- * @param action What action to perform
- * @param ... Action-specific arguments
- * @return 0 on success, non-0 on error
- *
- * For action @c "play" the next argument is the track.
- *
- * For action @c "set-global" next argument is the global preference name
- * and the final argument the value to set it to, or (char *)0 to unset it.
- */
-int disorder_schedule_add(disorder_client *c,
-			  time_t when,
-			  const char *priority,
-			  const char *action,
-			  ...) {
-  va_list ap;
-  char when_str[64];
-  int rc;
-
-  snprintf(when_str, sizeof when_str, "%lld", (long long)when);
-  va_start(ap, action);
-  if(!strcmp(action, "play"))
-    rc = disorder_simple(c, 0, "schedule-add", when_str, priority,
-			 action, va_arg(ap, char *),
-			 (char *)0);
-  else if(!strcmp(action, "set-global")) {
-    const char *key = va_arg(ap, char *);
-    const char *value = va_arg(ap, char *);
-    rc = disorder_simple(c, 0,"schedule-add",  when_str, priority,
-			 action, key, value,
-			 (char *)0);
-  } else
-    disorder_fatal(0, "unknown action '%s'", action);
-  va_end(ap);
-  return rc;
-}
-
-/** @brief Set the contents of a playlst
- * @param c Client
- * @param playlist Playlist to modify
- * @param tracks List of tracks
- * @param ntracks Length of @p tracks (or -1 to count up to the first NULL)
- * @return 0 on success, non-0 on error
- */
-int disorder_playlist_set(disorder_client *c,
-                          const char *playlist,
-                          char **tracks,
-                          int ntracks) {
-  return disorder_simple_body(c, 0, tracks, ntracks,
-                              "playlist-set", playlist, (char *)0);
-}
-
 #include "client-stubs.c"
 
 /*