Changeset e2a501e94652979c9a078b1996aa15adf1a66174

Timestamp:

24/09/07 17:44:15 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1190648655 +0000

git-parent:

[839d6e8b7b9f29dbcc85ea0dba79737b88af353b]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1190648655 +0000

Message:

Factor out RTSP control URL writing so it can be re-used

Files:

• modules/stream_out/rtsp.c (modified) (2 diffs)

modules/stream_out/rtsp.c

@@ -340 +340 @@
-    char psz_sesbuf[17];
-    const char *psz_session = NULL, *psz;
+    char control[sizeof("rtsp://[]:12345") + NI_MAXNUMERICHOST
+                  + strlen( rtsp->psz_path )];
-
-    if( answer == NULL || query == NULL || cl == NULL )
-        return VLC_SUCCESS;
+    else
+    {
+        /* Build self-referential control URL */
+        char ip[NI_MAXNUMERICHOST], *ptr;
+
+        httpd_ServerIP( cl, ip );
+        ptr = strchr( ip, '%' );
+        if( ptr != NULL )
+            *ptr = '\0';
+
+        if( strchr( ip, ':' ) != NULL )
+            sprintf( control, "rtsp://[%s]:%u%s", ip, rtsp->port,
+                     rtsp->psz_path );
+        else
+            sprintf( control, "rtsp://%s:%u%s", ip, rtsp->port,
+                     rtsp->psz_path );
+    }
-
-    /* */
@@ -368 +387 @@
-            }
-
-            char ip[NI_MAXNUMERICHOST], *ptr;
-            char control[sizeof("rtsp://[]:12345") + sizeof( ip )
-                            + strlen( rtsp->psz_path )];
-
-            /* Build self-referential URL */
-            httpd_ServerIP( cl, ip );
-            ptr = strchr( ip, '%' );
-            if( ptr != NULL )
-                *ptr = '\0';
-
-            if( strchr( ip, ':' ) != NULL )
-                sprintf( control, "rtsp://[%s]:%u%s", ip, rtsp->port,
-                         rtsp->psz_path );
-            else
-                sprintf( control, "rtsp://%s:%u%s", ip, rtsp->port,
-                         rtsp->psz_path );
-
-            ptr = SDPGenerate( rtsp->owner, control );
-
-            answer->i_status = 200;
-            httpd_MsgAdd( answer, "Content-Type",  "%s", "application/sdp" );
-            httpd_MsgAdd( answer, "Content-Base",  "%s", control );
-
-
+
+
+
+
+
-            break;
-        }