Changeset c88f8414bc19e430d4f7dc2ff704b7e6568434fb

Timestamp:

06/15/08 13:13:23 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213528403 +0300

git-parent:

[66bffcc5a3b8544635d4bfbe261ef381d577502a]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213528275 +0300

Message:

RTMP output: restore listen/accept and remove ENOSYS connect

Revert "Remove non-sensical connect->listen transition"
This reverts commit e1b146414f8b85755fb917bbac941367fb3c4e15

Files:

• modules/access_output/rtmp.c (modified) (4 diffs)

modules/access_output/rtmp.c

@@ -42 +42 @@
- *****************************************************************************/
-
-
-
-
+
+
+
+
-
-static int  Open ( vlc_object_t * );
@@ -59 +60 @@
-    add_shortcut( "rtmp" );
-    set_callbacks( Open, Close );
+    add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT,
+              RTMP_CONNECT_LONGTEXT, false );
-vlc_module_end();
-
@@ -178 +181 @@
-    p_sys->p_thread->result_play = 1;
-    p_sys->p_thread->result_stop = 0;
+    p_sys->p_thread->fd = -1;
-
-    /* Open connection */
-
-
+
+
+
+
+
+
+
+
-        goto error2;
+    }
+    else
+    {
+        int *p_fd_listen;
+
+        p_sys->active = 0;
+        p_fd_listen = net_ListenTCP( p_access, p_sys->p_thread->url.psz_host,
+                                     p_sys->p_thread->url.i_port );
+        if( p_fd_listen == NULL )
+        {
+            msg_Warn( p_access, "cannot listen to %s port %i",
+                      p_sys->p_thread->url.psz_host,
+                      p_sys->p_thread->url.i_port );
+            goto error2;
+        }
+
+        do
+            p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen, -1 );
+        while( p_sys->p_thread->fd == -1 );
+        net_ListenClose( p_fd_listen );
+
+        if( rtmp_handshake_passive( p_this, p_sys->p_thread->fd ) < 0 )
+        {
+            msg_Err( p_access, "handshake passive failed");
+            goto error2;
+        }
+    }
-
-    if( vlc_thread_create( p_sys->p_thread, "rtmp control thread", ThreadControl,
@@ -212 +249 @@
-    free( p_sys->p_thread->psz_media );
-
-
+
+
-error:
-    vlc_object_detach( p_sys->p_thread );