Changeset 21f7e7ea477453871b494758c2dec31e0c23287c

Timestamp:

03/28/08 10:54:55 (5 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1206698095 +0100

git-parent:

[d0641277d87a51ed1602dc36f5585c9b4705dccb]

git-author:

Rafaël Carré <funman@videolan.org> 1206697525 +0100

Message:

MMS: close access on network timeout

defaults to timeout on 5s (configurable) without data (there will be 10 tries before returning EOF)
fix some EOF return paths
check malloc()

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

Files:

• modules/access/mms/mms.c (modified) (2 diffs)
• modules/access/mms/mmstu.c (modified) (12 diffs)
• modules/access/mms/mmstu.h (modified) (1 diff)

modules/access/mms/mms.c

@@ -66 +66 @@
-    "if empty, the http_proxy environment variable will be tried." )
-
+#define TIMEOUT_TEXT N_("TCP/UDP timeout (ms)")
+#define TIMEOUT_LONGTEXT N_("Amount of time (in ms) to wait before aborting network reception of data. Note that there will be 10 retries before completely giving up.")
+
-vlc_module_begin();
-    set_shortname( "MMS" );
@@ -75 +78 @@
-    add_integer( "mms-caching", 19 * DEFAULT_PTS_DELAY / 1000, NULL,
-                 CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+
+    add_integer( "mms-timeout", 5000, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
+                 VLC_TRUE );
-
-    add_bool( "mms-all", 0, NULL, ALL_TEXT, ALL_LONGTEXT, VLC_TRUE );

modules/access/mms/mmstu.c

@@ -112 +112 @@
-    p_access->info.i_seekpoint = 0;
-    p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
+    if( !p_sys ) return VLC_ENOMEM;
-    memset( p_sys, 0, sizeof( access_sys_t ) );
+
+    p_sys->i_timeout = var_CreateGetInteger( p_access, "mms-timeout" );
-
-    /* *** Parse URL and get server addr/port and path *** */
@@ -346 +349 @@
-    while( !p_access->b_die )
-    {
-
+
+
+
+
+
+
-        if( p_sys->i_command == 0x1e )
-        {
@@ -356 +364 @@
-    while( !p_access->b_die )
-    {
-
+
+
+
+
+
-        if( p_sys->i_command == 0x05 )
-        {
@@ -365 +377 @@
-
-    /* get a packet */
-
+
+
+
+
+
+
-    msg_Dbg( p_access, "Streaming restarted" );
-
@@ -387 +404 @@
-
-    /* *** now send data if needed *** */
-(size_t)
+
-    {
-        if( p_access->info.i_pos < p_sys->i_header )
@@ -504 +521 @@
-    p_sys->p_cmd = NULL;
-    p_sys->i_cmd = 0;
-0
+VLC_FALSE
-
-    /* *** send command 1 : connection request *** */
@@ -853 +870 @@
-                 "unknown answer (0x%x instead of 0x05)",
-                 p_sys->i_command );
-( -1 )
+ -1
-    }
-    else
-    {
-        /* get a packet */
-
+
+
-        msg_Dbg( p_access, "streaming started" );
-( 0 )
+ 0
-    }
-}
@@ -1029 +1047 @@
-        /* We'll wait 0.5 second if nothing happens */
-        timeout = 500;
+
+        if( i_try * timeout > p_sys->i_timeout )
+        {
+            msg_Err(p_access, "no data received");
+            return -1;
+        }
-
-        if( i_try > 3 && (p_sys->i_buffer_tcp > 0 || p_sys->i_buffer_udp > 0) )
@@ -1444 +1468 @@
-                case 0x03:
-                    msg_Warn( p_access, "socket closed by server" );
-1
+VLC_TRUE
-                    return VLC_EGENERIC;
-                case 0x1e:
-                    msg_Warn( p_access, "end of media stream" );
-1
+VLC_TRUE
-                    return VLC_EGENERIC;
-                default:
@@ -1455 +1479 @@
-        }
-    }
+    p_access->info.b_eof = VLC_TRUE;
-    msg_Warn( p_access, "failed to receive command (aborting)" );
-
@@ -1491 +1516 @@
-                case 0x03:
-                    msg_Warn( p_access, "socket closed by server" );
-1
+VLC_TRUE
-                    return -1;
-                case 0x1e:
-                    msg_Warn( p_access, "end of media stream" );
-1
+VLC_TRUE
-                    return -1;
-                case 0x20:
@@ -1513 +1538 @@
-    msg_Err( p_access, "cannot receive %s (aborting)",
-             ( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" );
+    p_access->info.b_eof = VLC_TRUE;
-    return -1;
-}

modules/access/mms/mmstu.h

@@ -45 +45 @@
-
-    asf_header_t    asfh;
+
+    unsigned    i_timeout;
-
-    /* */