[farsight2/master] Allow multicast sockets to start in the sending state

[Olivier Crête]

---
 .../multicast/fs-multicast-stream-transmitter.c    |    5 +----
 transmitters/multicast/fs-multicast-transmitter.c  |    3 ++-
 transmitters/multicast/fs-multicast-transmitter.h  |    1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.c b/transmitters/multicast/fs-multicast-stream-transmitter.c
index 5b7ebb4..05ceed9 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.c
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.c
@@ -487,6 +487,7 @@ fs_multicast_stream_transmitter_add_remote_candidate (
       candidate->ip,
       candidate->port,
       candidate->ttl,
+      self->priv->sending,
       error);
 
   if (!newudpsock)
@@ -506,10 +507,6 @@ fs_multicast_stream_transmitter_add_remote_candidate (
 
   self->priv->udpsocks[candidate->component_id] = newudpsock;
 
-  if (self->priv->sending)
-    fs_multicast_transmitter_udpsock_inc_sending (
-        self->priv->udpsocks[candidate->component_id]);
-
   fs_candidate_destroy (self->priv->remote_candidate[candidate->component_id]);
   self->priv->remote_candidate[candidate->component_id] =
     fs_candidate_copy (candidate);
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index 4fd2114..d82fcb9 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -809,6 +809,7 @@ fs_multicast_transmitter_get_udpsock_locked (FsMulticastTransmitter *trans,
     const gchar *multicast_ip,
     guint16 port,
     guint8 ttl,
+    gboolean sending,
     GError **error)
 {
   UdpSock *udpsock;
@@ -839,7 +840,7 @@ fs_multicast_transmitter_get_udpsock_locked (FsMulticastTransmitter *trans,
         udpsock->current_ttl = ttl;
       }
       g_byte_array_append (udpsock->ttls, &ttl, 1);
-      g_mutex_unlock (trans->priv->mutex);
+
       return udpsock;
     }
   }
diff --git a/transmitters/multicast/fs-multicast-transmitter.h b/transmitters/multicast/fs-multicast-transmitter.h
index c712bde..609a455 100644
--- a/transmitters/multicast/fs-multicast-transmitter.h
+++ b/transmitters/multicast/fs-multicast-transmitter.h
@@ -92,6 +92,7 @@ UdpSock *fs_multicast_transmitter_get_udpsock (FsMulticastTransmitter *trans,
     const gchar *multicast_ip,
     guint16 port,
     guint8 ttl,
+    gboolean sending,
     GError **error);
 
 void fs_multicast_transmitter_put_udpsock (FsMulticastTransmitter *trans,
-- 
1.5.6.5