X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fannounce.c;h=37e3300b7ca981086681fff8cd9870200019de2b;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=2b88f4eae52c06cc33cbbcbaa7a069761f9d759b;hpb=5cc5eba266f423eaf13bdae36ea2d031bdcd9d3a;p=vlc diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c index 2b88f4eae5..37e3300b7c 100644 --- a/src/stream_output/announce.c +++ b/src/stream_output/announce.c @@ -1,10 +1,10 @@ /***************************************************************************** - * announce.c : Session announcement + * announce.c : announce handler ***************************************************************************** - * Copyright (C) 2002 VideoLAN + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * - * Authors: Clément Stenac - * Damien Lucas + * Authors: Clément Stenac * * 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 @@ -18,382 +18,132 @@ * * 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 /* free() */ -#include /* sprintf() */ -#include /* strerror() */ - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef WIN32 -# include -# include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif -#else -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#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 +#include +#include +#include "stream_output.h" +#include "libvlc.h" -#define SAP_IPV6_ADDR_1 "FF0" -#define SAP_IPV6_ADDR_2 "::2:7FFE" +#include -#define DEFAULT_PORT "1234" +struct announce_method_t +{ +} sap_method; /**************************************************************************** - * Split : split a string into two parts: the one which is before the delim - * and the one which is after. - * NULL is returned if delim is not found + * Sout-side functions ****************************************************************************/ -static char * split( char *psz_in, char *psz_out1, char *psz_out2, char delim) +static void sap_destroy (vlc_object_t *p_this) { - unsigned int i_count = 0; /* pos in input string */ - unsigned int i_pos1 = 0; /* pos in out2 string */ - unsigned int i_pos2 = 0; - char *psz_cur; /* store the pos of the first delim found */ - - /* Skip spaces at the beginning */ - while( psz_in[i_count] == ' ' ) - { - i_count++; - } - - if( psz_in[i_count] == '\0' ) - { - return NULL; - } - - /* Look for delim */ - while( psz_in[i_count] && psz_in[i_count] != delim ) - { - psz_out1[i_pos1] = psz_in[i_count]; - i_count++; - i_pos1++; - } - /* Mark the end of out1 */ - psz_out1[i_pos1] = '\0'; - - if( psz_in[i_count] == '\0' ) - { - return NULL; - } - - /* store pos of the first delim */ - psz_cur = psz_in + i_count; - - /* skip all delim and all spaces */ - while( psz_in[i_count] == ' ' || psz_in[i_count] == delim ) - { - i_count++; - } - - if( psz_in[i_count] == '\0' ) - { - return psz_cur; - } + libvlc_priv (p_this->p_libvlc)->p_sap = NULL; +} - /* Store the second string */ - while( psz_in[i_count] ) - { - psz_out2[i_pos2] = psz_in[i_count]; - i_pos2++; - i_count++; - } - psz_out2[i_pos2] = '\0'; +#undef sout_AnnounceRegisterSDP - return psz_cur; -} +static vlc_mutex_t sap_mutex = VLC_STATIC_MUTEX; -/***************************************************************************** - * sout_SAPNew: Creates a SAP Session - *****************************************************************************/ -sap_session_t * sout_SAPNew ( sout_instance_t *p_sout, char * psz_url_arg, - char * psz_name_arg, int ip_version, - char * psz_v6_scope ) +/** + * Registers a new session with the announce handler, using a pregenerated SDP + * + * \param obj a VLC object + * \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( vlc_object_t *obj, const char *psz_sdp, + const char *psz_dst, announce_method_t *p_method ) { - sap_session_t *p_sap; /* The SAP structure */ - module_t *p_network; /* Network module */ - network_socket_t socket_desc; /* Socket descriptor */ - char *sap_ipv6_addr = NULL; /* IPv6 built address */ - char *psz_eol; /* Used to parse IPv6 URIs */ - int i_port; /* Port in numerical format */ + assert (p_method == &sap_method); + (void) p_method; - /* Allocate the SAP structure */ - p_sap = (sap_session_t *) malloc( sizeof ( sap_session_t ) ) ; - if ( !p_sap ) - { - msg_Err( p_sout, "out of memory" ); + session_descriptor_t *p_session = calloc( 1, sizeof (*p_session) ); + if( !p_session ) return NULL; - } - /* Fill the information in the structure */ - if( strstr( psz_url_arg, "[" ) ) - { - /* We have an IPv6 address. Do not use ':' as the port separator */ - psz_eol = strchr( psz_url_arg, ']' ); - if( !psz_eol ) - { - msg_Warn( p_sout, "no matching ], unable to parse URI"); - return NULL; - } + p_session->psz_sdp = strdup( psz_sdp ); - if( !psz_eol++ ) - { - sprintf( p_sap->psz_url, "%s", psz_url_arg ); - sprintf( p_sap->psz_port, "%s", DEFAULT_PORT ); - } - else - { - *psz_eol = '\0'; - sprintf( p_sap->psz_url, "%s", psz_url_arg ); - psz_eol++; - if( psz_eol ) - { - sprintf( p_sap->psz_port, "%s", psz_eol ); - } - } - } - else + /* GRUIK. We should not convert back-and-forth from string to numbers */ + struct addrinfo *res; + if (vlc_getaddrinfo (obj, psz_dst, 0, NULL, &res) == 0) { - split( psz_url_arg, p_sap->psz_url, p_sap->psz_port, ':' ); + if (res->ai_addrlen <= sizeof (p_session->addr)) + memcpy (&p_session->addr, res->ai_addr, + p_session->addrlen = res->ai_addrlen); + freeaddrinfo (res); } - /* Check if we have a port */ - if( !strlen( p_sap->psz_port ) ) + vlc_mutex_lock (&sap_mutex); + sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap; + if (p_sap == NULL) { - sprintf( p_sap->psz_port, "%s", DEFAULT_PORT ); - } - - /* Make sure our port is valid and atoi it */ - i_port = atoi( p_sap->psz_port ); - - if( !i_port ) - { - sprintf( p_sap->psz_port, "%s", DEFAULT_PORT ); + p_sap = SAP_Create (VLC_OBJECT (obj->p_libvlc)); + libvlc_priv (obj->p_libvlc)->p_sap = p_sap; + vlc_object_set_destructor ((vlc_object_t *)p_sap, sap_destroy); } else - { - sprintf( p_sap->psz_port, "%i", i_port ); - } - - /* The name that we send */ - sprintf( p_sap->psz_name, "%s", psz_name_arg ); + vlc_object_hold ((vlc_object_t *)p_sap); + vlc_mutex_unlock (&sap_mutex); - p_sap->i_ip_version = ip_version; + if (p_sap == NULL) + goto error; - /* Only "6" triggers IPv6. IPv4 is default */ - if( ip_version != 6 ) - { - 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 */ - p_sout->p_private = (void*) &socket_desc; - if( !( p_network = module_Need( p_sout, "network", "ipv4" ) ) ) - { - msg_Warn( p_sout, "failed to open a connection (udp)" ); - return NULL; - } - module_Unneed( p_sout, p_network ); - - p_sap->i_socket = socket_desc.i_handle; - if( p_sap->i_socket < 0 ) - { - msg_Warn( p_sout, "unable to initialize SAP" ); - return NULL; - } - } - 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, "out of memory" ); - return NULL; - } - sprintf( sap_ipv6_addr, "%s%c%s", - SAP_IPV6_ADDR_1, psz_v6_scope[0], SAP_IPV6_ADDR_2 ); + msg_Dbg (obj, "adding SAP session"); + SAP_Add (p_sap, p_session ); + return p_session; - /* 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; +error: + free (p_session->psz_sdp); + free (p_session); + return NULL; +} - /* Call the network module */ - p_sout->p_private = (void *) &socket_desc; - if( !( p_network = module_Need( p_sout, "network", "ipv6" ) ) ) - { - msg_Warn( p_sout, "failed to open a connection (udp)" ); - return NULL; - } - module_Unneed( p_sout, p_network ); +#undef sout_AnnounceUnRegister +/** + * Unregisters an existing session + * + * \param obj a VLC object + * \param p_session the session descriptor + * \return VLC_SUCCESS or an error + */ +int sout_AnnounceUnRegister( vlc_object_t *obj, + session_descriptor_t *p_session ) +{ + sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap; - p_sap->i_socket = socket_desc.i_handle; - if( p_sap->i_socket <= 0 ) - { - msg_Warn( p_sout, "unable to initialize SAP" ); - return NULL; - } + msg_Dbg (obj, "removing SAP session"); + SAP_Del (p_sap, p_session); - /* Free what we allocated */ - if( sap_ipv6_addr ) - { - free( sap_ipv6_addr ); - } - } + vlc_mutex_lock (&sap_mutex); + vlc_object_release ((vlc_object_t *)p_sap); + vlc_mutex_unlock (&sap_mutex); - msg_Dbg( p_sout, "SAP initialization complete" ); + free (p_session->psz_sdp); + free (p_session); - return p_sap; + return 0; } -/***************************************************************************** - * sout_SAPDelete: Deletes a SAP Session - *****************************************************************************/ -void sout_SAPDelete( sout_instance_t *p_sout, sap_session_t * p_sap ) +/** + * \return the SAP announce method + */ +announce_method_t * sout_SAPMethod (void) { - int i_ret; - -#if defined( UNDER_CE ) - i_ret = CloseHandle( (HANDLE)p_sap->i_socket ); -#elif defined( WIN32 ) - i_ret = closesocket( p_sap->i_socket ); -#else - i_ret = close( p_sap->i_socket ); -#endif - - if( i_ret ) - { - msg_Err( p_sout, "unable to close SAP socket" ); - } - - free( p_sap ); + return &sap_method; } -/***************************************************************************** - * sout_SAPSend: Sends a SAP packet - *****************************************************************************/ -void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_sap ) +void sout_MethodRelease (announce_method_t *m) { - char psz_msg[1000]; /* SDP content */ - char *psz_head; /* SAP header */ - char *psz_send; /* What we send */ - char *psz_type = "application/sdp"; - int i_header_size; /* SAP header size */ - int i_msg_size; /* SDP content size */ - int i_size; /* Total size */ - int i_ret = 0; - - /* We send a packet every 24 calls to the function */ - if( p_sap->i_calls++ < 24 ) - { - return; - } - - i_header_size = 8 + strlen( psz_type ) + 1; - psz_head = (char *) malloc( i_header_size * sizeof( char ) ); - - if( ! psz_head ) - { - msg_Err( p_sout, "out of memory" ); - return; - } - - /* Create the SAP headers */ - psz_head[0] = 0x20; /* Means IPv4, not encrypted, not compressed */ - psz_head[1] = 0x00; /* No authentification */ - psz_head[2] = 0x42; /* Version */ - psz_head[3] = 0x12; /* Version */ - - psz_head[4] = 0x01; /* Source IP FIXME: we should get the real address */ - psz_head[5] = 0x02; /* idem */ - psz_head[6] = 0x03; /* idem */ - psz_head[7] = 0x04; /* idem */ - - strncpy( psz_head + 8, psz_type, 15 ); - psz_head[ i_header_size-1 ] = '\0'; - - /* Create the SDP content */ - /* Do not add spaces at beginning of the lines ! */ - sprintf( psz_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_sap->psz_name, p_sap->psz_port, p_sap->psz_url ); - - i_msg_size = strlen( psz_msg ); - i_size = i_msg_size + i_header_size; - - /* Create the message */ - psz_send = (char *) malloc( i_size*sizeof(char) ); - if( !psz_send ) - { - msg_Err( p_sout, "out of memory" ); - return; - } - - memcpy( psz_send, psz_head, i_header_size ); - memcpy( psz_send + i_header_size, psz_msg, i_msg_size ); - - if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */ - { - if( p_sap->i_ip_version == 6 ) - { - i_ret = send( p_sap->i_socket, psz_send, i_size, 0 ); - } - else - { - i_ret = send( p_sap->i_socket, psz_send, i_size, 0 ); - } - } - - if( i_ret <= 0 ) - { - msg_Warn( p_sout, "SAP send failed on socket %i (%s)", - p_sap->i_socket, strerror(errno) ); - } - - p_sap->i_calls = 0; - - /* Free what we allocated */ - free( psz_send ); - free( psz_head ); + assert (m == &sap_method); } -