rawudp: Send the original STUN packets from the same thread

This is to make sure the STUN packets for each component are sent in order.
Some firewalls just allocate output ports linearly. In that case, we prefer
if the order of the outside ports is the same as the order of the local ports,
that way, if we do UPnP, we have fewer chances of mixing it up.

1 files changed, 12 insertions, 4 deletions

diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 3052583e..c16e5451 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -1306,9 +1306,17 @@ fs_rawudp_component_start_stun (FsRawUdpComponent *self, GError **error)
       self->priv->stun_buffer,
       sizeof(self->priv->stun_buffer));
 
-  if (self->priv->stun_timeout_thread == NULL) {
-    /* only create a new thread if the old one was stopped. Otherwise we can
-     * just reuse the currently running one. */
+
+  /* only create a new thread if the old one was stopped. Otherwise we can
+   * just reuse the currently running one. */
+  if (self->priv->stun_timeout_thread == NULL)
+  {
+    if (!fs_rawudp_component_send_stun_locked (self, error))
+    {
+      FS_RAWUDP_COMPONENT_UNLOCK (self);
+      return FALSE;
+    }
+
     self->priv->stun_timeout_thread =
       g_thread_create (stun_timeout_func, self, TRUE, error);
   }
@@ -1465,7 +1473,7 @@ stun_timeout_func (gpointer user_data)
   GError *error = NULL;
   guint timeout_accum_ms = 0;
   guint remainder;
-  StunUsageTimerReturn timer_ret = STUN_USAGE_TIMER_RETURN_RETRANSMIT;
+  StunUsageTimerReturn timer_ret = STUN_USAGE_TIMER_RETURN_SUCCESS;
   StunTransactionId stunid;
   StunTimer stun_timer;