From 2bf77f20129f3faf2d7fee3bcf8cc0003402b3f3 Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Wed, 30 Sep 2020 19:47:05 +0000
Subject: [PATCH] Feature: Support moving individual clients between mounts

---
 admin/listclients.xsl |  6 +++++-
 admin/moveclients.xsl | 10 +++++++++-
 src/admin.c           | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/admin/listclients.xsl b/admin/listclients.xsl
index 69689f01..79642763 100644
--- a/admin/listclients.xsl
+++ b/admin/listclients.xsl
@@ -36,7 +36,11 @@
 													<td><xsl:value-of select="role" /></td>
 													<td><xsl:value-of select="connected" /></td>
 													<td><xsl:value-of select="useragent" /></td>
-													<td><a href="killclient.xsl?mount={../@mount}&amp;id={id}">Kick</a></td>
+													<td>
+														<a href="killclient.xsl?mount={../@mount}&amp;id={id}">Kick</a>
+														&#160;
+														<a href="moveclients.xsl?mount={../@mount}&amp;id={id}">Move</a>
+													</td>
 												</tr>
 											</xsl:for-each>
 										</tbody>
diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl
index 5bdcacba..107a4f0f 100644
--- a/admin/moveclients.xsl
+++ b/admin/moveclients.xsl
@@ -17,7 +17,15 @@
 						</xsl:call-template>
 						<xsl:choose>
 							<xsl:when test="source">
-								<p>Choose the mountpoint to which you want to move the listeners to:</p>
+								<xsl:choose>
+									<xsl:when test="param-id">
+										<input type="hidden" name="id" value="{param-id}" />
+										<p>Choose the mountpoint to which you want to move the listener to:</p>
+									</xsl:when>
+									<xsl:otherwise>
+										<p>Choose the mountpoint to which you want to move the listeners to:</p>
+									</xsl:otherwise>
+								</xsl:choose>
 								<form method="post" action="moveclients.xsl">
 									<label for="moveto" class="hidden">
 										Move from <code><xsl:value-of select="current_source" /></code> to
diff --git a/src/admin.c b/src/admin.c
index 2523771f..a44e95ba 100644
--- a/src/admin.c
+++ b/src/admin.c
@@ -617,6 +617,8 @@ static void command_move_clients(client_t   *client,
                                  admin_format_t response)
 {
     const char *dest_source;
+    const char *idtext = NULL;
+    connection_id_t id;
     source_t *dest;
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -627,9 +629,18 @@ static void command_move_clients(client_t   *client,
     if((COMMAND_OPTIONAL(client, "destination", dest_source))) {
         parameters_passed = 1;
     }
+    if ((COMMAND_OPTIONAL(client, "id", idtext))) {
+        id = atoi(idtext);
+    } else {
+        idtext = NULL;
+    }
     ICECAST_LOG_DEBUG("Done optional check (%d)", parameters_passed);
     if (!parameters_passed) {
         doc = admin_build_sourcelist(source->mount);
+        if (idtext) {
+            xmlNodePtr root = xmlDocGetRootElement(doc);
+            xmlNewTextChild(root, NULL, XMLSTR("param-id"), XMLSTR(idtext));
+        }
         admin_send_response(doc, client, response,
              MOVECLIENTS_HTML_REQUEST);
         xmlFreeDoc(doc);
@@ -659,7 +670,7 @@ static void command_move_clients(client_t   *client,
     node = admin_build_rootnode(doc, "iceresponse");
     xmlDocSetRootElement(doc, node);
 
-    source_move_clients(source, dest, NULL);
+    source_move_clients(source, dest, idtext ? &id : NULL);
 
     snprintf(buf, sizeof(buf), "Clients moved from %s to %s",
         source->mount, dest_source);