/*****************************************************************************
- * announce.c : Session announcement
+ * announce.c : announce handler
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
- * Authors: Clément Stenac <zorglub@via.ecp.fr>
- * Damien Lucas <nitrox@via.ecp.fr>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
#include <vlc/vlc.h>
+#include <vlc_sout.h>
+#include "stream_output.h"
-#include <vlc/sout.h>
-#undef DEBUG_BUFFER
-
-#include <announce.h>
-#include <network.h>
-
-#define SAP_IPV4_ADDR "224.2.127.254" /* Standard port and address for SAP */
-#define SAP_PORT 9875
+/****************************************************************************
+ * Sout-side functions
+ ****************************************************************************/
-#define SAP_IPV6_ADDR_1 "FF0"
-#define SAP_IPV6_ADDR_2 "::2:7FFE"
-
-/*****************************************************************************
- * sout_SAPNew: Creates a SAP Session
- *****************************************************************************/
-sap_session_t * sout_SAPNew ( sout_instance_t *p_sout ,
- char * psz_url_arg , char *psz_port_arg ,
- char * psz_name_arg, int ip_version,
- char * psz_v6_scope )
+/**
+ * Register a new session with the announce handler
+ *
+ * \param p_sout a sout instance structure
+ * \param p_session a session descriptor
+ * \param p_method an announce method descriptor
+ * \return VLC_SUCCESS or an error
+ */
+int sout_AnnounceRegister( sout_instance_t *p_sout,
+ session_descriptor_t *p_session,
+ announce_method_t *p_method )
{
- sap_session_t *p_new; /* The SAP structure */
- module_t *p_network; /* Network module */
- network_socket_t socket_desc; /* Socket descriptor */
- char psz_network[6]; /* IPv4 or IPv6 */
- char *sap_ipv6_addr=NULL; /* IPv6 built address */
-
- /* Allocate the SAP structure */
- p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
- if ( !p_new )
+ int i_ret;
+ announce_handler_t *p_announce = (announce_handler_t*)
+ vlc_object_find( p_sout,
+ VLC_OBJECT_ANNOUNCE,
+ FIND_ANYWHERE );
+
+ if( !p_announce )
{
- msg_Err( p_sout, "No memory left" );
- return NULL;
+ msg_Dbg( p_sout, "No announce handler found, creating one" );
+ p_announce = announce_HandlerCreate( p_sout );
+ if( !p_announce )
+ {
+ msg_Err( p_sout, "Creation failed" );
+ return VLC_ENOMEM;
+ }
+ vlc_object_yield( p_announce );
+ msg_Dbg( p_sout, "creation done" );
}
- /* Fill the information in the structure */
- sprintf ( p_new->psz_url , "%s" , psz_url_arg );
- sprintf ( p_new->psz_name , "%s" , psz_name_arg );
- /* Port is not implemented in sout */
- sprintf ( p_new->psz_port, "%s" , psz_port_arg );
+ i_ret = announce_Register( p_announce, p_session, p_method );
+ vlc_object_release( p_announce );
- p_new->i_ip_version = ip_version;
+ return i_ret;
+}
- /* Only "6" triggers IPv6. IPv4 is default */
- if( ip_version != 6 )
+/**
+ * Register a new session with the announce handler, using a pregenerated SDP
+ *
+ * \param p_sout a sout instance structure
+ * \param psz_sdp the SDP to register
+ * \param psz_uri session URI (needed for SAP address auto detection
+ * \param p_method an announce method descriptor
+ * \return the new session descriptor structure
+ */
+session_descriptor_t *sout_AnnounceRegisterSDP( sout_instance_t *p_sout,
+ const char *psz_sdp, const char *psz_uri,
+ announce_method_t *p_method )
+{
+ session_descriptor_t *p_session;
+ announce_handler_t *p_announce = (announce_handler_t*)
+ vlc_object_find( p_sout,
+ VLC_OBJECT_ANNOUNCE,
+ FIND_ANYWHERE );
+ if( !p_announce )
{
- msg_Dbg( p_sout , "Creating IPv4 SAP socket" );
-
- /* Fill the socket descriptor */
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = "";
- socket_desc.i_bind_port = 0;
- socket_desc.psz_server_addr = SAP_IPV4_ADDR;
- socket_desc.i_server_port = SAP_PORT;
- socket_desc.i_handle = 0;
-
- /* Call the network module */
- sprintf ( psz_network, "ipv4" );
- p_sout->p_private=(void*) &socket_desc;
- if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
- {
- msg_Warn( p_sout, "failed to open a connection (udp)" );
- return NULL;
- }
- module_Unneed( p_sout, p_network );
-
- p_new->socket = socket_desc.i_handle;
- if(p_new->socket <= 0 )
+ msg_Dbg( p_sout, "no announce handler found, creating one" );
+ p_announce = announce_HandlerCreate( p_sout );
+ if( !p_announce )
{
- msg_Warn( p_sout, "Unable to initialize SAP" );
+ msg_Err( p_sout, "Creation failed" );
return NULL;
}
+ vlc_object_yield( p_announce );
}
- else
- {
- msg_Dbg(p_sout , "Creating IPv6 SAP socket with scope %s"
- , psz_v6_scope );
- /* Initialize and build the IPv6 address to broadcast to */
- sap_ipv6_addr = (char *)malloc(28*sizeof(char));
- if ( !sap_ipv6_addr )
- {
- msg_Err( p_sout, "No memory left" );
- return NULL;
- }
- sprintf(sap_ipv6_addr,"%s%c%s",
- SAP_IPV6_ADDR_1,
- psz_v6_scope[0],
- SAP_IPV6_ADDR_2);
-
- /* Fill the socket descriptor */
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = "";
- socket_desc.i_bind_port = 0;
- socket_desc.psz_server_addr = sap_ipv6_addr;
- socket_desc.i_server_port = SAP_PORT;
- socket_desc.i_handle = 0;
-
- sprintf ( psz_network, "ipv6" );
-
- /* Call the network module */
- p_sout->p_private=(void*) &socket_desc;
- if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
- {
- msg_Warn( p_sout, "failed to open a connection (udp)" );
- return NULL;
- }
- module_Unneed( p_sout, p_network );
+ if( p_method->i_type != METHOD_TYPE_SAP )
+ {
+ msg_Warn( p_sout, "forcing SAP announcement");
+ }
- p_new->socket = socket_desc.i_handle;
+ p_session = sout_AnnounceSessionCreate();
+ p_session->psz_sdp = strdup( psz_sdp );
+ p_session->psz_uri = strdup( psz_uri );
+ announce_Register( p_announce, p_session, p_method );
- if(p_new->socket <= 0 )
- {
- msg_Warn( p_sout, "Unable to initialize SAP" );
- return NULL;
- }
+ vlc_object_release( p_announce );
+ return p_session;
+}
- /* Free what we allocated */
- if( sap_ipv6_addr ) free(sap_ipv6_addr);
+/**
+ * UnRegister an existing session
+ *
+ * \param p_sout a sout instance structure
+ * \param p_session the session descriptor
+ * \return VLC_SUCCESS or an error
+ */
+int sout_AnnounceUnRegister( sout_instance_t *p_sout,
+ session_descriptor_t *p_session )
+{
+ int i_ret;
+ announce_handler_t *p_announce = (announce_handler_t*)
+ vlc_object_find( p_sout,
+ VLC_OBJECT_ANNOUNCE,
+ FIND_ANYWHERE );
+ if( !p_announce )
+ {
+ msg_Dbg( p_sout, "unable to remove announce: no announce handler" );
+ return VLC_ENOOBJ;
}
+ i_ret = announce_UnRegister( p_announce, p_session );
- msg_Dbg (p_sout,"SAP initialization complete");
+ vlc_object_release( p_announce );
- return(p_new);
+ return i_ret;
}
-/*****************************************************************************
- * sout_SAPDelete: Deletes a SAP Session
- *****************************************************************************/
-void sout_SAPDelete( sout_instance_t *p_sout , sap_session_t * p_this )
+/**
+ * Create and initialize a session descriptor
+ *
+ * \return a new session descriptor
+ */
+session_descriptor_t * sout_AnnounceSessionCreate(void)
{
- if( close(p_this->socket) )
+ session_descriptor_t *p_session;
+
+ p_session = (session_descriptor_t *)malloc( sizeof(session_descriptor_t));
+ if (p_session == NULL)
+ return NULL;
+
+ memset (p_session, 0, sizeof (*p_session));
+ return p_session;
+}
+
+/**
+ * Destroy a session descriptor and free all
+ *
+ * \param p_session the session to destroy
+ * \return Nothing
+ */
+void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
+{
+ if( p_session )
{
- msg_Err ( p_sout, "Unable to close SAP socket");
+ FREENULL( p_session->psz_name );
+ FREENULL( p_session->psz_group );
+ FREENULL( p_session->psz_uri );
+ FREENULL( p_session->psz_sdp );
+ free( p_session );
}
+}
- if( p_this ) free( p_this );
+/**
+ * Create and initialize an announcement method structure
+ *
+ * \param i_type METHOD_TYPE_SAP
+ * \return a new announce_method structure
+ */
+announce_method_t * sout_AnnounceMethodCreate( int i_type )
+{
+ announce_method_t *p_method;
+
+ p_method = (announce_method_t *)malloc( sizeof(announce_method_t) );
+ if( p_method == NULL )
+ return NULL;
+
+ p_method->i_type = i_type;
+ return p_method;
}
-/*****************************************************************************
- * sout_SAPSend: Sends a SAP packet
- *****************************************************************************/
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this)
+/************************************************************************
+ * Announce handler functions (private)
+ ************************************************************************/
+
+/**
+ * Create the announce handler object
+ *
+ * \param p_this a vlc_object structure
+ * \return the new announce handler or NULL on error
+ */
+announce_handler_t *__announce_HandlerCreate( vlc_object_t *p_this )
{
- char *sap_head; /* SAP header */
- char sap_msg[1000]; /* SDP content */
- char *sap_send; /* What we send */
- char *payload_type="application/sdp";
- int i_send_result=0; /* Result of send */
- int i;
- int i_header_size; /* SAP header size */
- int i_msg_size; /* SDP content size */
- int i_size; /* Total size */
-
- /* We send a packet every 24 calls to the function */
- if( p_this->sendnow == 24 )
+ announce_handler_t *p_announce;
+
+ p_announce = vlc_object_create( p_this, VLC_OBJECT_ANNOUNCE );
+
+ if( !p_announce )
{
- i_header_size = 9 + strlen( payload_type );
- sap_head = ( char * )malloc( i_header_size * sizeof( char ) );
+ msg_Err( p_this, "out of memory" );
+ return NULL;
+ }
- if( ! sap_head )
- {
- msg_Warn( p_sout , "No memory left");
- return;
- }
+ p_announce->p_sap = NULL;
+ vlc_object_attach( p_announce, p_this->p_libvlc);
- /* Create the SAP headers */
- sap_head[0]=0x20; /* Means IPv4, not encrypted, not compressed */
- sap_head[1]=0x00; /* No authentification */
- sap_head[2]=0x42; /* Version */
- sap_head[3]=0x12; /* Version */
-
- sap_head[4]=0x01; /* Source IP FIXME: we should get the real address */
- sap_head[5]=0x02; /* idem */
- sap_head[6]=0x03; /* idem */
- sap_head[7]=0x04; /* idem */
-
- strncpy( sap_head+8 , payload_type , 15 );
- sap_head[ i_header_size-1 ] = '\0';
-
- /* Create the SDP content */
- /* Do not add spaces at beginning of the lines ! */
- sprintf( sap_msg, "v=0\n"
- "o=VideoLAN 3247692199 3247895918 IN IP4 VideoLAN\n"
- "s=%s\n"
- "u=VideoLAN\n"
- "t=0 0\n"
- "m=audio %s udp 14\n"
- "c=IN IP4 %s/15\n"
- "a=type:test\n",
- p_this->psz_name , p_this->psz_port , p_this->psz_url );
-
- i_msg_size = strlen( sap_msg );
- i_size = i_msg_size + i_header_size;
-
- /* Create the message */
- sap_send = ( char* )malloc( i_size*sizeof(char) );
- if( !sap_send )
- {
- msg_Err( p_sout , "No memory left") ;
- return;
- }
+ return p_announce;
+}
- for( i = 0 ; i < i_header_size ; i++ )
- {
- sap_send[i] = sap_head[i];
- }
+/**
+ * Destroy a announce handler object
+ *
+ * \param p_announce the announce handler to destroy
+ * \return VLC_SUCCESS or an error
+ */
+int announce_HandlerDestroy( announce_handler_t *p_announce )
+{
- for( ; i < i_size ; i++ )
- {
- sap_send[i] = sap_msg[i-i_header_size];
- }
+ if( p_announce->p_sap )
+ {
+ p_announce->p_sap->b_die = VLC_TRUE;
+ /* Wait for the SAP thread to exit */
+ vlc_thread_join( p_announce->p_sap );
+ announce_SAPHandlerDestroy( p_announce->p_sap );
+ }
+
+ /* Free the structure */
+ vlc_object_destroy( p_announce );
+
+ return VLC_SUCCESS;
+}
- if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */
+/* Register an announce */
+int announce_Register( announce_handler_t *p_announce,
+ session_descriptor_t *p_session,
+ announce_method_t *p_method )
+{
+
+ msg_Dbg( p_announce, "registering announce");
+ if( p_method->i_type == METHOD_TYPE_SAP )
+ {
+ /* Do we already have a SAP announce handler ? */
+ if( !p_announce->p_sap )
{
- if( p_this->i_ip_version == 6)
- {
- i_send_result = send( p_this->socket, sap_send, i_size, 0 );
- }
- else
+ sap_handler_t *p_sap = announce_SAPHandlerCreate( p_announce );
+ msg_Dbg( p_announce, "creating SAP announce handler");
+ if( !p_sap )
{
- i_send_result = send( p_this->socket, sap_send, i_size, 0 );
+ msg_Err( p_announce, "SAP handler creation failed" );
+ return VLC_ENOOBJ;
}
+ p_announce->p_sap = p_sap;
}
+ /* this will set p_session->p_sap for later deletion */
+ msg_Dbg( p_announce, "adding SAP session");
+ p_announce->p_sap->pf_add( p_announce->p_sap, p_session );
+ }
+ else
+ {
+ msg_Dbg( p_announce, "announce type unsupported" );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;;
+}
+
- if( i_send_result == -1 )
+/* Unregister an announce */
+int announce_UnRegister( announce_handler_t *p_announce,
+ session_descriptor_t *p_session )
+{
+ msg_Dbg( p_announce, "unregistering announce" );
+ if( p_session->p_sap != NULL ) /* SAP Announce */
+ {
+ if( !p_announce->p_sap )
{
- msg_Warn(p_sout, "SAP send failed on socket %i", p_this->socket );
- perror("sendto");
+ msg_Err( p_announce, "can't remove announce, no SAP handler");
+ return VLC_ENOOBJ;
}
-
- p_this->sendnow = 0;
-
- /* Free what we allocated */
- if(sap_send) free(sap_send);
- if(sap_head) free(sap_head);
+ p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
}
-
- p_this->sendnow++;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff