Removes trailing spaces. Removes tabs.

[vlc] / modules / access / udp.c

diff --git a/modules/access/udp.c b/modules/access/udp.c
index b8d9dd679caba045982409fa6c1d6c8aecc8cf13..c569316ebbec020393415a435dea7d6fd6055c3b 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -36,14 +36,6 @@
 #include <vlc_access.h>
 #include <vlc_network.h>
 
-/* Big pile of stuff missing form glibc 2.5 */
-#if defined (HAVE_NETINET_UDPLITE_H)
-# include <netinet/udplite.h>
-#elif defined (__linux__)
-# define UDPLITE_SEND_CSCOV     10
-# define UDPLITE_RECV_CSCOV     11
-#endif
-
 #ifndef SOCK_DCCP /* provisional API */
 # ifdef __linux__
 #  define SOCK_DCCP 6
@@ -61,6 +53,7 @@
 # define SOL_UDPLITE IPPROTO_UDPLITE
 #endif
 
+#define MTU 65535
 
 /*****************************************************************************
  * Module descriptor
@@ -70,11 +63,6 @@
     "Caching value for UDP streams. This " \
     "value should be set in milliseconds." )
 
-#define AUTO_MTU_TEXT N_("Autodetection of MTU")
-#define AUTO_MTU_LONGTEXT N_( \
-    "Automatically detect the line's MTU. This will increase the size if" \
-    " truncated packets are found" )
-
 #define RTP_LATE_TEXT N_("RTP reordering timeout in ms")
 #define RTP_LATE_LONGTEXT N_( \
     "VLC reorders RTP packets. The input will wait for late packets at most "\
@@ -92,9 +80,7 @@ vlc_module_begin();
     add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, VLC_TRUE );
     add_integer( "rtp-late", 100, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, VLC_TRUE );
-
-    add_bool( "udp-auto-mtu", 1, NULL,
-              AUTO_MTU_TEXT, AUTO_MTU_LONGTEXT, VLC_TRUE );
+    add_obsolete_bool( "udp-auto-mtu" );
 
     set_capability( "access2", 0 );
     add_shortcut( "udp" );
@@ -126,8 +112,6 @@ struct access_sys_t
 {
     int fd;
 
-    int i_mtu;
-    vlc_bool_t b_auto_mtu;
     vlc_bool_t b_framed_rtp;
 
     /* reorder rtp packets when out-of-sequence */
@@ -259,27 +243,12 @@ static int Open( vlc_object_t *p_this )
 
     shutdown( p_sys->fd, SHUT_WR );
 
-#ifdef UDPLITE_RECV_CSCOV
-    if (proto == IPPROTO_UDPLITE)
-        /* UDP header: 8 bytes + RTP header: 12 bytes (or more) */
-        setsockopt (p_sys->fd, SOL_UDPLITE, UDPLITE_RECV_CSCOV,
-                    &(int){ 20 }, sizeof (int));
-#endif
+    net_SetCSCov (p_sys->fd, -1, 12);
 
     if (p_sys->b_framed_rtp)
     {
         /* We don't do autodetection and prebuffering in case of framing */
         p_access->pf_block = BlockRTP;
-        p_sys->i_mtu = 65535;
-    }
-    else
-    {
-        /* FIXME */
-        p_sys->i_mtu = var_CreateGetInteger( p_access, "mtu" );
-        if( p_sys->i_mtu <= 1 )
-            p_sys->i_mtu  = 1500;   /* Avoid problem */
-
-        p_sys->b_auto_mtu = var_CreateGetBool( p_access, "udp-auto-mtu" );;
     }
 
     /* Update default_pts to a suitable value for udp access */
@@ -311,7 +280,6 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    access_sys_t *p_sys = p_access->p_sys;
     vlc_bool_t   *pb_bool;
     int          *pi_int;
     int64_t      *pi_64;
@@ -329,7 +297,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_MTU:
             pi_int = (int*)va_arg( args, int * );
-            *pi_int = p_sys->i_mtu;
+            *pi_int = MTU;
             break;
 
         case ACCESS_GET_PTS_DELAY:
@@ -362,25 +330,16 @@ static block_t *BlockUDP( access_t *p_access )
     block_t      *p_block;
 
     /* Read data */
-    p_block = block_New( p_access, p_sys->i_mtu );
+    p_block = block_New( p_access, MTU );
     p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL,
-                                  p_block->p_buffer, p_sys->i_mtu,
-                                  VLC_FALSE );
+                                  p_block->p_buffer, MTU, VLC_FALSE );
     if( p_block->i_buffer < 0 )
     {
         block_Release( p_block );
         return NULL;
     }
 
-    if( (p_block->i_buffer >= p_sys->i_mtu) && p_sys->b_auto_mtu &&
-        p_sys->i_mtu < 32767 )
-    {
-        /* Increase by 100% */
-        p_sys->i_mtu *= 2;
-        msg_Dbg( p_access, "increasing MTU to %d", p_sys->i_mtu );
-    }
-
-    return p_block;
+    return block_Realloc( p_block, 0, p_block->i_buffer );
 }
 
 /*****************************************************************************
@@ -397,7 +356,7 @@ static block_t *BlockTCP( access_t *p_access )
     if( p_block == NULL )
     {
         /* MTU should always be 65535 in this case */
-        p_sys->p_partial_frame = p_block = block_New( p_access, 65537 );
+        p_sys->p_partial_frame = p_block = block_New( p_access, 2 + MTU );
         if (p_block == NULL)
             return NULL;
     }
@@ -465,7 +424,7 @@ static inline vlc_bool_t rtp_ChainInsert( access_t *p_access, block_t *p_block )
         p_sys->p_end = p_block;
         return VLC_TRUE;
     }
-    /* walk through the queue from top down since the new packet is in 
+    /* walk through the queue from top down since the new packet is in
     most cases just appended to the end */
 
     for( ;; )
@@ -646,7 +605,7 @@ static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block )
             break;
 
         p = BlockParseRTP( p_access, BlockUDP( p_access ) );
-        if( !p && (i_date - i_first) > p_sys->i_rtp_late ) 
+        if( !p && (i_date - i_first) > p_sys->i_rtp_late )
         {
             msg_Err( p_access, "error in RTP prebuffering!" );
             break;