2 files changed, 62 insertions, 1 deletions

diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
index 72fec4cf..21899c95 100644
--- a/gst/udp/gstmultiudpsink.c
+++ b/gst/udp/gstmultiudpsink.c
@@ -400,6 +400,14 @@ join_multicast (GstUDPClient * client)
     perror ("setsockopt IP_MULTICAST_LOOP\n");
 }
 
+static void
+leave_multicast (GstUDPClient * client)
+{
+  if (setsockopt (*(client->sock), IPPROTO_IP, IP_DROP_MEMBERSHIP,
+          &(client->multi_addr), sizeof (client->multi_addr)) < 0)
+    perror ("setsockopt IP_DROP_MEMBERSHIP\n");
+}
+
 /* create a socket for sending to remote machine */
 static gboolean
 gst_multiudpsink_init_send (GstMultiUDPSink * sink)
@@ -563,6 +571,9 @@ gst_multiudpsink_remove (GstMultiUDPSink * sink, const gchar * host, gint port)
   g_get_current_time (&now);
   client->disconnect_time = GST_TIMEVAL_TO_TIME (now);
 
+  if (client->multi_addr.imr_multiaddr.s_addr)
+    leave_multicast (client);
+
   /* Unlock to emit signal before we delete the actual client */
   g_mutex_unlock (sink->client_lock);
   g_signal_emit (G_OBJECT (sink),
diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index 583827dd..78386062 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -153,10 +153,59 @@ gst_udpsink_finalize (GstUDPSink * udpsink)
   G_OBJECT_CLASS (parent_class)->finalize ((GObject *) udpsink);
 }
 
+static void
+gst_udpsink_update_uri (GstUDPSink * sink)
+{
+  g_free (sink->uri);
+  sink->uri = g_strdup_printf ("udp://%s:%d", sink->host, sink->port);
+
+  GST_DEBUG_OBJECT (sink, "updated uri to %s", sink->uri);
+}
+
 static gboolean
 gst_udpsink_set_uri (GstUDPSink * sink, const gchar * uri)
 {
-  return FALSE;
+  gchar *protocol;
+  gchar *location;
+  gchar *colptr;
+
+  protocol = gst_uri_get_protocol (uri);
+  if (strcmp (protocol, "udp") != 0)
+    goto wrong_protocol;
+  g_free (protocol);
+
+  location = gst_uri_get_location (uri);
+  if (!location)
+    return FALSE;
+  colptr = strstr (location, ":");
+
+  gst_multiudpsink_remove (GST_MULTIUDPSINK (sink), sink->host, sink->port);
+
+  if (colptr != NULL) {
+    g_free (sink->host);
+    sink->host = g_strndup (location, colptr - location);
+    sink->port = atoi (colptr + 1);
+  } else {
+    g_free (sink->host);
+    sink->host = g_strdup (location);
+    sink->port = UDP_DEFAULT_PORT;
+  }
+  g_free (location);
+
+  gst_multiudpsink_add (GST_MULTIUDPSINK (sink), sink->host, sink->port);
+
+  gst_udpsink_update_uri (sink);
+
+  return TRUE;
+
+  /* ERRORS */
+wrong_protocol:
+  {
+    g_free (protocol);
+    GST_ELEMENT_ERROR (sink, RESOURCE, READ, (NULL),
+        ("error parsing uri %s: wrong protocol (%s != udp)", uri, protocol));
+    return FALSE;
+  }
 }
 
 static void
@@ -216,6 +265,7 @@ gst_udpsink_uri_get_type (void)
 {
   return GST_URI_SINK;
 }
+
 static gchar **
 gst_udpsink_uri_get_protocols (void)
 {