/*****************************************************************************
- * announce.c : Session announcement
+ * announce.c : announce handler
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2007 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_sout.h>
+#include "stream_output.h"
-#include <vlc/sout.h>
-#undef DEBUG_BUFFER
+#include <assert.h>
-#include <announce.h>
-#include <network.h>
+/* Private functions for the announce handler */
+static announce_handler_t* announce_HandlerCreate( vlc_object_t *);
+static int announce_Register( announce_handler_t *p_announce,
+ session_descriptor_t *p_session,
+ announce_method_t *p_method );
+static int announce_UnRegister( announce_handler_t *p_announce,
+ session_descriptor_t *p_session );
-#define SAP_ADDR "224.2.127.254" /* Standard port and address for SAP */
-#define SAP_PORT 9875
+struct announce_method_t
+{
+} sap_method;
-/*****************************************************************************
- * 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 )
+/****************************************************************************
+ * Sout-side functions
+ ****************************************************************************/
+
+/**
+ * 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_dst session address (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_dst, 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;
-
- p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
-
- if ( !p_new )
- return NULL;
-
- sprintf ( p_new->psz_url , "%s" , psz_url_arg );
- sprintf ( p_new->psz_name , "%s" , psz_name_arg );
- sprintf ( p_new->psz_port, "%s" , psz_port_arg ); /* Not implemented in SO */
-
- msg_Dbg (p_sout , "Creating SAP Socket" );
-
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = "";
- socket_desc.i_bind_port = 0;
- socket_desc.psz_server_addr = SAP_ADDR;
- socket_desc.i_server_port = SAP_PORT;
- 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( VLC_OBJECT( 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 );
+ }
+
+ p_session = malloc( sizeof( *p_session ) );
+ memset( p_session, 0, sizeof( *p_session ) );
+ p_session->psz_sdp = strdup( psz_sdp );
- 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 );
-
- p_new->addr = addr;
-
- return(p_new);
+ /* GRUIK. We should not convert back-and-forth from string to numbers */
+ struct addrinfo *res;
+ if (vlc_getaddrinfo (VLC_OBJECT (p_sout), psz_dst, 0, NULL, &res) == 0)
+ {
+ if (res->ai_addrlen <= sizeof (p_session->addr))
+ memcpy (&p_session->addr, res->ai_addr,
+ p_session->addrlen = res->ai_addrlen);
+ vlc_freeaddrinfo (res);
+ }
+
+ 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( sout_instance_t *p_sout , 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 )
{
- if( close(p_this->socket) )
- msg_Err ( p_sout, "Unable to close SAP socket");
- if( p_this ) 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 );
+ if( i_ret == 0 )
+ free( p_session );
-/*****************************************************************************
- * sout_SAPSend: Sends a SAP packet
- *****************************************************************************/
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this )
-{
- char *sap_head;
- char sap_msg[1000];
- char *sap_send;
- char *payload_type="application/sdp";
- int i_send_result;
- int i;
- int i_header_size;
- int i_msg_size;
- int i_size;
-
- if( p_this->sendnow == 24 )
+ vlc_object_release( p_announce );
+
+ return i_ret;
+}
+
+/**
+ * \return the SAP announce method
+ */
+announce_method_t * sout_SAPMethod (void)
+{
+ return &sap_method;
+}
+
+void sout_MethodRelease (announce_method_t *m)
+{
+ assert (m == &sap_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
+ */
+static 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 )
+ 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 )
{
- i_header_size = 9 + strlen( payload_type );
- sap_head = ( char * )malloc( i_header_size * sizeof( char ) );
-
- if( ! sap_head )
- {
- msg_Err( p_sout , "No memory left");
- return;
- }
-
- 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';
-
- /* 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;
-
- sap_send = ( char* )malloc( i_size*sizeof(char) );
-
- if(! sap_send)
- {
- msg_Err( p_sout , "No memory left") ;
- return;
- }
-
- for(i=0 ; i<i_header_size ; i++)
- {
- sap_send[i] = sap_head[i];
- }
-
- for( ; i<i_size; i++)
- {
- sap_send[i] = sap_msg[i-i_header_size];
- }
-
- /* What we send is the SAP header and the SDP packet */
-
- if(i_size<1024) /* We mustn't send packets larger than 1024B */
- i_send_result = sendto( p_this->socket , sap_send , i_size , 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("sendto");
- }
- p_this->sendnow = 0;
- if(sap_send) free(sap_send);
- if(sap_head) free(sap_head);
- }
- p_this->sendnow++;
+ /* Exit the SAP */
+ vlc_object_release( p_announce->p_sap );
+ }
+
+ /* Free the structure */
+ vlc_object_release( p_announce );
+
+ return VLC_SUCCESS;
+}
+
+/* Register an announce */
+static int announce_Register( announce_handler_t *p_announce,
+ session_descriptor_t *p_session,
+ announce_method_t *p_method )
+{
+ if (p_method == NULL)
+ return VLC_EGENERIC;
+
+ msg_Dbg( p_announce, "registering announce");
+ if( p_method == &sap_method )
+ {
+ /* 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_Err( p_announce, "announce type unsupported" );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
+
+/* Unregister an announce */
+static int announce_UnRegister( announce_handler_t *p_announce,
+ session_descriptor_t *p_session )
+{
+ msg_Dbg( p_announce, "unregistering announce" );
+ if( p_announce->p_sap )
+ p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff