/*****************************************************************************
- * announce.c : Session announcement
+ * announce.c : announce handler
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
- * Laurent Aimar <fenrir@via.ecp.fr>
- * Eric Petit <titer@videolan.org>
+ * 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 <string.h> /* strerror() */
#include <vlc/vlc.h>
+#include <vlc_sout.h>
+#include "stream_output.h"
-#include <vlc/sout.h>
-#undef DEBUG_BUFFER
+/****************************************************************************
+ * Sout-side functions
+ ****************************************************************************/
-#include <announce.h>
-#include <network.h>
+/**
+ * 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 )
+{
+ int i_ret;
+ announce_handler_t *p_announce = (announce_handler_t*)
+ vlc_object_find( p_sout,
+ VLC_OBJECT_ANNOUNCE,
+ FIND_ANYWHERE );
-#define SAP_ADDR "224.2.127.254"
-#define SAP_PORT 9875
+ if( !p_announce )
+ {
+ 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" );
+ }
-/*****************************************************************************
- * sout_SAPNew: Creates a SAP Session
- *****************************************************************************/
-sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , char * psz_name_arg )
+ i_ret = announce_Register( p_announce, p_session, p_method );
+ vlc_object_release( p_announce );
+
+ return i_ret;
+}
+
+/**
+ * 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 )
{
- sap_session_t *p_new;
- module_t *p_network;
- network_socket_t socket_desc;
- char psz_network[12];
- struct sockaddr_in addr;
- int ttl=15;
-
- p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
-
- sprintf ( p_new->psz_url , "%s" , psz_url_arg );
- sprintf ( p_new->psz_name , "%s" , psz_name_arg );
-
- msg_Dbg (p_sout , "Creating SAP Socket" );
-
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = SAP_ADDR;
- socket_desc.i_bind_port = SAP_PORT;
- socket_desc.psz_server_addr = "";
- socket_desc.i_server_port = 0;
- socket_desc.i_handle = 0;
-
- sprintf ( psz_network,"ipv4" );
-
- p_sout->p_private=(void*) &socket_desc;
-
- if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
+ 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, "no announce handler found, creating one" );
+ p_announce = announce_HandlerCreate( p_sout );
+ if( !p_announce )
{
- msg_Warn( p_sout, "failed to open a connection (udp)" );
+ msg_Err( p_sout, "Creation failed" );
+ return NULL;
}
+ vlc_object_yield( p_announce );
+ }
+
+ if( p_method->i_type != METHOD_TYPE_SAP )
+ {
+ msg_Warn( p_sout, "forcing SAP announcement");
+ }
- module_Unneed( p_sout, p_network );
-
- p_new->socket = socket_desc.i_handle;
-
- memset( &addr , 0 , sizeof(addr) );
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = inet_addr(SAP_ADDR);
- addr.sin_port = htons( SAP_PORT );
-
- setsockopt( p_new->socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl) );
-
- p_new->addr=(struct sockaddr_in)addr;
-
- return(p_new);
+ 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 );
+
+ vlc_object_release( p_announce );
+ return p_session;
}
-/*****************************************************************************
- * sout_SAPDelete: Deletes a SAP Session
- *****************************************************************************/
-void sout_SAPDelete( sap_session_t * p_this )
+/**
+ * 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 )
{
- shutdown(p_this->socket,0);
- free(p_this);
-}
+ 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 );
-/*****************************************************************************
- * sout_SAPSend: Sends a SAP packet
- *****************************************************************************/
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this )
-{
- char sap_msg[2048];
- char *user="VideoLAN";
- char *machine="VideoLAN";
- char *site="VideoLAN";
- int i_send_result;
-
- if(p_this->sendnow == 24)
- {
- sprintf(sap_msg," ***øv=0 \n\
- o=%s 3247692199 3247895918 IN IP4 %s \n\
- s=%s\n\
- u=%s \n\
- t=3247691400 3250117800 \n\
- a=type:test \n\
- m=audio 1234 udp 14 \n\
- c=IN IP4 %s/15 \n\
- xxxxxxxxxxxxxxxxxxxxx \n ",user,machine,p_this->psz_name,site,p_this->psz_url);
-
- i_send_result = sendto( p_this->socket , sap_msg , strlen(sap_msg) , 0 , (struct sockaddr *)&p_this->addr , sizeof(p_this->addr) );
-
- if(i_send_result == -1)
- {
- msg_Warn(p_sout , "SAP Send failed on socket %i. " , p_this->socket );
- perror("send");
- }
- p_this->sendnow=0;
+ vlc_object_release( p_announce );
+
+ return i_ret;
+}
+
+/**
+ * Create and initialize a session descriptor
+ *
+ * \return a new session descriptor
+ */
+session_descriptor_t * sout_AnnounceSessionCreate(void)
+{
+ 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 )
+ {
+ FREENULL( p_session->psz_name );
+ FREENULL( p_session->psz_group );
+ FREENULL( p_session->psz_uri );
+ FREENULL( p_session->psz_sdp );
+ free( p_session );
+ }
+}
+
+/**
+ * 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;
+}
+
+/************************************************************************
+ * 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 )
+{
+ announce_handler_t *p_announce;
+
+ p_announce = vlc_object_create( p_this, VLC_OBJECT_ANNOUNCE );
+
+ if( !p_announce )
+ {
+ msg_Err( p_this, "out of memory" );
+ return NULL;
+ }
+
+ p_announce->p_sap = NULL;
+ vlc_object_attach( p_announce, p_this->p_libvlc);
+
+ return p_announce;
+}
+
+/**
+ * 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 )
+{
+
+ 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;
+}
+
+/* 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 )
+ {
+ sap_handler_t *p_sap = announce_SAPHandlerCreate( p_announce );
+ msg_Dbg( p_announce, "creating SAP announce handler");
+ if( !p_sap )
+ {
+ 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;;
+}
+
+
+/* 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_Err( p_announce, "can't remove announce, no SAP handler");
+ return VLC_ENOOBJ;
+ }
+ p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
}
- p_this->sendnow++;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff