X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fannounce.c;h=37e3300b7ca981086681fff8cd9870200019de2b;hb=b93670e1dce5ba4bebc66db8d78864d865672b68;hp=304d2215580c4a7ad20c7a81ac6ed3429e0e1ee5;hpb=e25e47662420fc69da94bd54e36cc09fd8379dec;p=vlc diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c index 304d221558..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,321 +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() */ - -#ifdef HAVE_UNISTD_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#include - -#include -#undef DEBUG_BUFFER +#include +#include +#include "stream_output.h" +#include "libvlc.h" -#include -#include +#include -#define SAP_IPV4_ADDR "224.2.127.254" /* Standard port and address for SAP */ -#define SAP_PORT 9875 - -#define SAP_IPV6_ADDR_1 "FF0" -#define SAP_IPV6_ADDR_2 "::2:7FFE" +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 *p_in, char *p_out1, char *p_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 *p_cur; /*store the pos of the first delim found */ - - /*skip spaces at the beginning*/ - while(p_in[i_count] == ' ' && i_count < strlen(p_in)) - { - i_count++; - } - if(i_count == strlen(p_in)) - return NULL; - - /*Look for delim*/ - while(p_in[i_count] != delim && i_count < strlen(p_in)) - { - p_out1[i_pos1] = p_in[i_count]; - i_count++; - i_pos1++; - } - /* Mark the end of out1 */ - p_out1[i_pos1] = 0; - - if(i_count == strlen(p_in)) - return NULL; - - /*store pos of the first delim*/ - p_cur = &p_in[i_count]; - - - - /*skip all delim and all spaces*/ - while((p_in[i_count] == ' ' || p_in[i_count] == delim) && i_count < strlen(p_in)) - { - i_count++; - } - - if(i_count == strlen(p_in)) - return p_cur; - - /*Store the second string*/ - while(i_count < strlen(p_in)) - { - p_out2[i_pos2] = p_in[i_count]; - i_pos2++; - i_count++; - } - p_out2[i_pos2] = 0; - - return p_cur; + libvlc_priv (p_this->p_libvlc)->p_sap = NULL; } -/***************************************************************************** - * 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 ) +#undef sout_AnnounceRegisterSDP + +static vlc_mutex_t sap_mutex = VLC_STATIC_MUTEX; + +/** + * 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_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 */ + assert (p_method == &sap_method); + (void) p_method; - /* Allocate the SAP structure */ - p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ; - if ( !p_new ) - { - msg_Err( p_sout, "No memory left" ); + session_descriptor_t *p_session = calloc( 1, sizeof (*p_session) ); + if( !p_session ) return NULL; - } - - /* Fill the information in the structure */ - split(psz_url_arg,p_new->psz_url,p_new->psz_port,':'); - // 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 ); + p_session->psz_sdp = strdup( psz_sdp ); - p_new->i_ip_version = ip_version; - - /* Only "6" triggers IPv6. IPv4 is default */ - if( ip_version != 6 ) + /* 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) { - 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 ); + if (res->ai_addrlen <= sizeof (p_session->addr)) + memcpy (&p_session->addr, res->ai_addr, + p_session->addrlen = res->ai_addrlen); + freeaddrinfo (res); + } - p_new->socket = socket_desc.i_handle; - if(p_new->socket <= 0 ) - { - msg_Warn( p_sout, "Unable to initialize SAP" ); - return NULL; - } + vlc_mutex_lock (&sap_mutex); + sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap; + if (p_sap == NULL) + { + 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 - { - 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); + vlc_object_hold ((vlc_object_t *)p_sap); + vlc_mutex_unlock (&sap_mutex); - /* 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; + if (p_sap == NULL) + goto error; - sprintf ( psz_network, "ipv6" ); + msg_Dbg (obj, "adding SAP session"); + SAP_Add (p_sap, p_session ); + return p_session; - /* 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 ); +error: + free (p_session->psz_sdp); + free (p_session); + return NULL; +} - p_new->socket = socket_desc.i_handle; +#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; - if(p_new->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_new); + return 0; } -/***************************************************************************** - * sout_SAPDelete: Deletes a SAP Session - *****************************************************************************/ -void sout_SAPDelete( sout_instance_t *p_sout , sap_session_t * p_this ) +/** + * \return the SAP announce method + */ +announce_method_t * sout_SAPMethod (void) { - if( close(p_this->socket) ) - { - msg_Err ( p_sout, "Unable to close SAP socket"); - } - - if( p_this ) free( p_this ); + return &sap_method; } -/***************************************************************************** - * sout_SAPSend: Sends a SAP packet - *****************************************************************************/ -void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this) +void sout_MethodRelease (announce_method_t *m) { - 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 ) - { - i_header_size = 9 + strlen( payload_type ); - sap_head = ( char * )malloc( i_header_size * sizeof( char ) ); - - if( ! sap_head ) - { - msg_Warn( p_sout , "No memory left"); - return; - } - - /* 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 ); - - fprintf(stderr,"Sending : <%s>\n",sap_msg); - 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; - } - - 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]; - } - - if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */ - { - if( p_this->i_ip_version == 6) - { - i_send_result = send( p_this->socket, sap_send, i_size, 0 ); - } - else - { - i_send_result = send( p_this->socket, sap_send, i_size, 0 ); - } - } - - if( i_send_result == -1 ) - { - msg_Warn(p_sout, "SAP send failed on socket %i", p_this->socket ); - perror("sendto"); - } - - p_this->sendnow = 0; - - /* Free what we allocated */ - if(sap_send) free(sap_send); - if(sap_head) free(sap_head); - } - - p_this->sendnow++; + assert (m == &sap_method); }