[farsight2/master] Pass upnp parameter to the components

[Olivier Crête]

---
 transmitters/rawudp/fs-rawudp-component.c          |   12 ++++++++++++
 transmitters/rawudp/fs-rawudp-component.h          |    5 +++++
 transmitters/rawudp/fs-rawudp-stream-transmitter.c |    9 +++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index c4d4878..01a778a 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -812,6 +812,11 @@ fs_rawudp_component_new (
     const gchar *stun_ip,
     guint stun_port,
     guint stun_timeout,
+    gboolean upnp_mapping,
+    gboolean upnp_discovery,
+    guint upnp_mapping_timeout,
+    guint upnp_discovery_timeout,
+    gpointer upnp_igd,
     guint *used_port,
     GError **error)
 {
@@ -826,6 +831,13 @@ fs_rawudp_component_new (
       "stun-ip", stun_ip,
       "stun-port", stun_port,
       "stun-timeout", stun_timeout,
+#ifdef HAVE_GUPNP
+      "upnp-mapping", upnp_mapping,
+      "upnp-discovery", upnp_discovery,
+      "upnp-mapping-timeout", upnp_mapping_timeout,
+      "upnp-discovery-timeout", upnp_discovery_timeout,
+      "upnp-igd", upnp_igd,
+#endif
       NULL);
 
   if (!self)
diff --git a/transmitters/rawudp/fs-rawudp-component.h b/transmitters/rawudp/fs-rawudp-component.h
index 73d6175..d37379a 100644
--- a/transmitters/rawudp/fs-rawudp-component.h
+++ b/transmitters/rawudp/fs-rawudp-component.h
@@ -99,6 +99,11 @@ fs_rawudp_component_new (
     const gchar *stun_ip,
     guint stun_port,
     guint stun_timeout,
+    gboolean upnp_mapping,
+    gboolean upnp_discovery,
+    guint upnp_mapping_timeout,
+    guint upnp_discovery_timeout,
+    gpointer upnp_igd,
     guint *used_port,
     GError **error);
 
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 2850869..b80e7db 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -628,6 +628,15 @@ fs_rawudp_stream_transmitter_build (FsRawUdpStreamTransmitter *self,
         self->priv->stun_ip,
         self->priv->stun_port,
         self->priv->stun_timeout,
+#ifdef HAVE_GUPNP
+        self->priv->upnp_mapping,
+        self->priv->upnp_discovery,
+        self->priv->upnp_mapping_timeout,
+        self->priv->upnp_discovery_timeout,
+        self->priv->upnp_igd,
+#else
+        FALSE, FALSE, 0, 0, NULL,
+#endif
         &used_port,
         error);
     if (self->priv->component[c] == NULL)
-- 
1.5.6.5