* all: added a i_ttl field in network_socket_t to allow per connection ttl

setting (in fact only used by access_out/udp.c.

diff --git a/include/network.h b/include/network.h
index 6d006005bf7b9a46291b194b5b83502c8539d2d4..3be7ce87d880b5b9ccb9c0ce655ccc71efb9ab29 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -2,7 +2,7 @@
  * network.h: interface to communicate with network plug-ins
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: network.h,v 1.3 2002/07/20 18:01:41 sam Exp $
+ * $Id: network.h,v 1.4 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -35,6 +35,8 @@ struct network_socket_t
     char * psz_server_addr;
     int i_server_port;
 
+    int i_ttl;
+
     /* Return values */
     int i_handle;
     size_t i_mtu;

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 6bec70002a6372ca02b21ad7c7ecc791ec67b299..bbc39428db77abdc20a9d5813e2fd1a906ac103d 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -2,7 +2,7 @@
  * ftp.c:
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: ftp.c,v 1.19 2003/05/15 22:27:36 massiot Exp $
+ * $Id: ftp.c,v 1.20 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -200,6 +200,7 @@ static int Open( vlc_object_t *p_this )
     socket_desc.i_server_port   = p_url->i_server_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
+    socket_desc.i_ttl           = 0;
     p_input->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_input, "network", psz_network ) ) )
     {
@@ -644,6 +645,7 @@ static int  ftp_StartStream( input_thread_t *p_input, off_t i_start )
     socket_desc.i_server_port   = i_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
+    socket_desc.i_ttl           = 0;
     p_input->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_input, "network", "" ) ) )
     {

diff --git a/modules/access/http.c b/modules/access/http.c
index 132ed70d2b9547682bb8b90a68f4306cf802dec4..b11a106bdb7822d553dafc5ac22e13ec8d129dd5 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.40 2003/07/31 21:18:59 bigben Exp $
+ * $Id: http.c,v 1.41 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -710,6 +710,7 @@ static int Open( vlc_object_t *p_this )
         p_access_data->socket_desc.psz_server_addr = psz_proxy;
         p_access_data->socket_desc.i_server_port = i_proxy_port;
         p_access_data->socket_desc.i_type = NETWORK_TCP;
+        p_access_data->socket_desc.i_ttl           = 0;
 
         snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE,
                   "GET http://%s:%d/%s HTTP/1.0\r\n",
@@ -721,6 +722,7 @@ static int Open( vlc_object_t *p_this )
         p_access_data->socket_desc.i_type = NETWORK_TCP;
         p_access_data->socket_desc.psz_server_addr = psz_server_addr;
         p_access_data->socket_desc.i_server_port = i_server_port;
+        p_access_data->socket_desc.i_ttl           = 0;
 
         snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE,
                   "GET /%s HTTP/1.1\r\nHost: %s\r\n",

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 1af268b02fdabf314eba37f979f75cf32b3d8e38..a4c4dafdefac384b1959a048046de97fad796fd6 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -2,7 +2,7 @@
  * mmsh.c:
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mmsh.c,v 1.3 2003/05/08 19:06:45 titer Exp $
+ * $Id: mmsh.c,v 1.4 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -711,6 +711,7 @@ static input_socket_t * NetOpenTCP( input_thread_t *p_input, url_t *p_url )
     socket_desc.i_server_port   = p_url->i_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
+    socket_desc.i_ttl           = 0;
     p_input->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_input, "network", psz_network ) ) )
     {

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 14b70c2972bd0c89c4ee8280783d85fd3c779762..b6bda8e96200576ea8fa443ce3533db77c4938c1 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -2,7 +2,7 @@
  * mms.c: MMS access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mmstu.c,v 1.5 2003/07/16 15:32:41 sam Exp $
+ * $Id: mmstu.c,v 1.6 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -449,6 +449,7 @@ static int MMSOpen( input_thread_t  *p_input,
     socket_desc.i_server_port   = p_url->i_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
+    socket_desc.i_ttl           = 0;
     p_input->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_input, "network", psz_network ) ) )
     {
@@ -490,6 +491,7 @@ static int MMSOpen( input_thread_t  *p_input,
         socket_desc.i_server_port   = 0;
         socket_desc.psz_bind_addr   = p_sys->psz_bind_addr;
         socket_desc.i_bind_port     = 7000; //p_url->i_bind_port; FIXME
+        socket_desc.i_ttl           = 0;
         p_input->p_private = (void*)&socket_desc;
         if( !( p_network = module_Need( p_input, "network", psz_network ) ) )
         {

diff --git a/modules/access/udp.c b/modules/access/udp.c
index de0245ccdf22f5e5edd48b6927abd01385edb9bd..ba78385bafb8bc8767537165122759136813ee9d 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -2,7 +2,7 @@
  * udp.c: raw UDP & RTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.20 2003/07/23 07:37:34 jpsaman Exp $
+ * $Id: udp.c,v 1.21 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Tristan Leteurtre <tooney@via.ecp.fr>
@@ -261,6 +261,7 @@ static int Open( vlc_object_t *p_this )
     socket_desc.i_bind_port = i_bind_port;
     socket_desc.psz_server_addr = psz_server_addr;
     socket_desc.i_server_port = i_server_port;
+    socket_desc.i_ttl           = 0;
 
     /* Find an appropriate network module */
     p_input->p_private = (void*) &socket_desc;

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index fbc6a63f6c560e032cc95afe0b03f22de30cd311..e0bd4329ff00554348488ac1496d1f793e534e33 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -2,7 +2,7 @@
  * udp.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.10 2003/06/19 18:45:06 gbazin Exp $
+ * $Id: udp.c,v 1.11 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -127,6 +127,8 @@ static int Open( vlc_object_t *p_this )
     module_t            *p_network;
     network_socket_t    socket_desc;
 
+    char                *val;
+
     if( !( p_sys = p_access->p_sys =
                 malloc( sizeof( sout_access_out_sys_t ) ) ) )
     {
@@ -192,6 +194,11 @@ static int Open( vlc_object_t *p_this )
     socket_desc.i_server_port   = i_dst_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
+    socket_desc.i_ttl           = 0;
+    if( ( val = sout_cfg_find_value( p_access->p_cfg, "ttl" ) ) )
+    {
+        socket_desc.i_ttl = atoi( val );
+    }
     p_sys->p_thread->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_sys->p_thread,
                                     "network", "" ) ) )

diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c
index eebc826dbb1db3822af6e17a0fca0dabd8c1e182..3fa5bc00abc72d0525018f1b5a71df7bb47cebe2 100644 (file)
--- a/modules/misc/network/ipv4.c
+++ b/modules/misc/network/ipv4.c
@@ -2,7 +2,7 @@
  * ipv4.c: IPv4 network abstraction layer
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ipv4.c,v 1.19 2003/06/15 01:23:31 massiot Exp $
+ * $Id: ipv4.c,v 1.20 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Mathias Kretschmer <mathias@research.att.com>
@@ -347,7 +347,11 @@ static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
         if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
         {
             /* set the time-to-live */
-            int ttl = config_GetInt( p_this, "ttl" );
+            int ttl = p_socket->i_ttl;
+            if( ttl < 1 )
+            {
+                ttl = config_GetInt( p_this, "ttl" );
+            }
             if( ttl < 1 ) ttl = 1;
 
             if( setsockopt( i_handle, IPPROTO_IP, IP_MULTICAST_TTL,

diff --git a/modules/misc/network/ipv6.c b/modules/misc/network/ipv6.c
index 41095c858b31e10b3e408185b3c5b9ce73773709..418d1154d266da18847c6daa428f1f388e45f48d 100644 (file)
--- a/modules/misc/network/ipv6.c
+++ b/modules/misc/network/ipv6.c
@@ -2,7 +2,7 @@
  * ipv6.c: IPv6 network abstraction layer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.13 2003/06/15 01:23:31 massiot Exp $
+ * $Id: ipv6.c,v 1.14 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Alexis Guillard <alexis.guillard@bt.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -367,7 +367,11 @@ static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
 
     if( *psz_server_addr )
     {
-        int ttl = config_GetInt( p_this, "ttl" );
+        int ttl = p_socket->i_ttl;
+        if( ttl < 1 )
+        {
+            ttl = config_GetInt( p_this, "ttl" );
+        }
         if( ttl < 1 ) ttl = 1;
 
         /* Build socket for remote connection */

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index 1db6872a16e541acb43ee04d5869d5ab8bfde142..ad960b2f752c12dff3f93d40d0706f168c35d455 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.20 2003/07/23 01:28:54 gbazin Exp $
+ * $Id: sap.c,v 1.21 2003/07/31 23:44:49 fenrir Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *          Clément Stenac <zorglub@via.ecp.fr>
@@ -225,6 +225,7 @@ static void Run( intf_thread_t *p_intf )
         socket_desc.i_bind_port       = HELLO_PORT;
         socket_desc.psz_server_addr   = "";
         socket_desc.i_server_port     = 0;
+        socket_desc.i_ttl             = 0;
         p_intf->p_private = (void*) &socket_desc;
 
         psz_network = "ipv4"; 
@@ -257,6 +258,7 @@ static void Run( intf_thread_t *p_intf )
         socket_desc.i_bind_port       = HELLO_PORT;
         socket_desc.psz_server_addr   = "";
         socket_desc.i_server_port     = 0;
+        socket_desc.i_ttl             = 0;
         p_intf->p_private = (void*) &socket_desc;
 
         psz_network = "ipv6"; 

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index c0beaa97d6110d4d58f6f34d9e2072cfaa8ddf14..90d664b40c258214909e2196614e82a1dcd08ccd 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -211,6 +211,7 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout, char * psz_url_arg,
         socket_desc.psz_server_addr   = SAP_IPV4_ADDR;
         socket_desc.i_server_port     = SAP_PORT;
         socket_desc.i_handle          = 0;
+        socket_desc.i_ttl             = 0;
 
         /* Call the network module */
         p_sout->p_private = (void*) &socket_desc;
@@ -250,6 +251,7 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout, char * psz_url_arg,
         socket_desc.psz_server_addr = sap_ipv6_addr;
         socket_desc.i_server_port   = SAP_PORT;
         socket_desc.i_handle        = 0;
+        socket_desc.i_ttl           = 0;
 
         /* Call the network module */
         p_sout->p_private = (void *) &socket_desc;