[farsight2/master] Set the STUN timeout property correctly

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:19:38 PST 2008


---
 transmitters/rawudp/fs-rawudp-stream-transmitter.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 172f088..ca6bfb3 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -224,7 +224,7 @@ fs_rawudp_stream_transmitter_class_init (FsRawUdpStreamTransmitterClass *klass)
     g_param_spec_uint ("stun-timeout",
       "The timeout for the STUN reply",
       "How long to wait for for the STUN reply (in seconds) before giving up",
-      0, G_MAXUINT, 30,
+      1, G_MAXUINT, 30,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
   gobject_class->dispose = fs_rawudp_stream_transmitter_dispose;
@@ -453,7 +453,7 @@ fs_rawudp_stream_transmitter_set_property (GObject *object,
       self->priv->stun_port = g_value_get_uint (value);
       break;
     case PROP_STUN_TIMEOUT:
-      self->priv->stun_port = g_value_get_uint (value);
+      self->priv->stun_timeout = g_value_get_uint (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -807,7 +807,6 @@ fs_rawudp_stream_transmitter_stun_recv_cb (GstPad *pad, GstBuffer *buffer,
       candidate->proto_profile = g_strdup ("AVP");
       candidate->type = FS_CANDIDATE_TYPE_SRFLX;
 
-
       g_debug ("Stun server says we are %u.%u.%u.%u %u\n",
           ((*attr)->address.ip & 0xff000000) >> 24,
           ((*attr)->address.ip & 0x00ff0000) >> 16,
@@ -844,7 +843,6 @@ fs_rawudp_stream_transmitter_stun_timeout_cb (gpointer user_data)
 {
   struct CandidateTransit *data = user_data;
 
-
   g_mutex_lock (data->self->priv->sources_mutex);
 
   fs_rawudp_stream_transmitter_stop_stun (data->self, data->component_id);
-- 
1.5.6.5




More information about the farsight-commits mailing list