Changeset e677a71b037e0b3ddb1735273afafa4493e7fb6b

Timestamp:

10/02/06 18:24:25 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1139592265 +0000

git-parent:

[15f7074e9da205cefd69d30f93a2d4e736ea95b0]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1139592265 +0000

Message:

Use correct Transport answer

Files:

• modules/misc/rtsp.c (modified) (12 diffs)

modules/misc/rtsp.c

@@ -133 +133 @@
-    media_es_t **es;
-    char       *psz_mux;
-int      
+vlc_bool_t
-
-    /* RTSP client */
@@ -274 +274 @@
-    p_media->psz_mux = 0;
-    p_media->rtsp = 0;
+    p_media->b_raw = VLC_FALSE;
-
-    asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
@@ -632 +633 @@
-    if( answer == NULL || query == NULL ) return VLC_SUCCESS;
-
-Info
+Dbg
-
-    answer->i_proto   = HTTPD_PROTO_RTSP;
-    answer->i_version = query->i_version;
-    answer->i_type    = HTTPD_MSG_ANSWER;
+    answer->i_body    = 0;
+    answer->p_body      = NULL;
-
-    switch( query->i_type )
@@ -657 +660 @@
-                    strstr( psz_transport, "RAW/RAW/UDP" ) )
-                {
-
-
+
+
+
-                if( httpd_ClientIP( cl, ip ) == NULL )
-                {
@@ -669 +673 @@
-
-                msg_Dbg( p_vod, "HTTPD_MSG_SETUP: unicast ip=%s port=%d",
-
+ 
-
-                psz_session = httpd_MsgGet( query, "Session" );
@@ -696 +700 @@
-                answer->p_body = NULL;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else /* TODO  strstr( psz_transport, "interleaved" ) ) */
@@ -706 +724 @@
-                answer->p_body = NULL;
-            }
+
-            if( !psz_playnow )
-                break;
@@ -716 +735 @@
-
-            /* for now only multicast so easy */
-
-
-
-
+
+
+
+
+
+
+
-
-            if( !psz_session )
@@ -865 +887 @@
-    if( answer == NULL || query == NULL ) return VLC_SUCCESS;
-
-Info
+Dbg
-
-    answer->i_proto   = HTTPD_PROTO_RTSP;
-    answer->i_version = query->i_version;
-    answer->i_type    = HTTPD_MSG_ANSWER;
+    answer->i_body    = 0;
+    answer->p_body      = NULL;
-
-    switch( query->i_type )
@@ -931 +955 @@
-                answer->p_body = NULL;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else /* TODO  strstr( psz_transport, "interleaved" ) ) */
@@ -941 +981 @@
-                answer->p_body = NULL;
-            }
+
-            if( !psz_playnow )
-                break;
@@ -969 +1010 @@
-            }
-
-
-
-
-
+
+
+
+
+
+
+
-            break;
-