X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fsap.c;h=49b1c9f9feb7ab484f038401365d2a4b0f240665;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=a6ce5c2d44ed7cdc449a784f7ac35e9f1051f723;hpb=704c851d5819430877a20496a9940d142defcb28;p=vlc diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c index a6ce5c2d44..49b1c9f9fe 100644 --- a/src/stream_output/sap.c +++ b/src/stream_output/sap.c @@ -1,7 +1,7 @@ /***************************************************************************** * sap.c : SAP announce handler ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -26,17 +26,24 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include /* free() */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* tolower(), isxdigit() */ +#include -#include +#include +#include +#include -#include "network.h" -#include "charset.h" +#include "stream_output.h" +#include "libvlc.h" /* SAP is always on that port */ #define SAP_PORT 9875 @@ -58,27 +65,37 @@ struct sap_address_t { char *psz_address; - char psz_machine[NI_MAXNUMERICHOST]; + struct sockaddr_storage orig; + socklen_t origlen; int i_rfd; /* Read socket */ int i_wfd; /* Write socket */ /* Used for flow control */ mtime_t t1; - vlc_bool_t b_enabled; - vlc_bool_t b_ready; + bool b_enabled; + bool b_ready; int i_interval; int i_buff; int i_limit; }; +/* A SAP session descriptor, enqueued in the SAP handler queue */ +struct sap_session_t { + uint8_t *psz_data; + unsigned i_length; + sap_address_t *p_address; + session_descriptor_t *p_sd; + + /* Last and next send */ + mtime_t i_last; + mtime_t i_next; +}; + /***************************************************************************** * Local prototypes *****************************************************************************/ static void RunThread( vlc_object_t *p_this); -static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ); -static char *SDPGenerate( sap_handler_t *p_sap, - const session_descriptor_t *p_session, - const sap_address_t *p_addr ); +static int ComputeRate( sap_address_t *p_address ); static int announce_SendSAPAnnounce( sap_handler_t *p_sap, sap_session_t *p_session ); @@ -90,6 +107,8 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, static int announce_SAPAnnounceDel( sap_handler_t *p_sap, session_descriptor_t *p_session ); +static void announce_SAPHandlerDestructor( vlc_object_t *p_this ); + /** * Create the SAP handler @@ -101,15 +120,12 @@ sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce ) { sap_handler_t *p_sap; - p_sap = vlc_object_create( p_announce, sizeof( sap_handler_t ) ); - + p_sap = vlc_custom_create( VLC_OBJECT(p_announce), sizeof( sap_handler_t ), + VLC_OBJECT_ANNOUNCE, "announce" ); if( !p_sap ) - { - msg_Err( p_announce, "out of memory" ); return NULL; - } - vlc_mutex_init( p_sap, &p_sap->object_lock ); + p_sap->psz_object_name = strdup( "sap announcer" ); p_sap->pf_add = announce_SAPAnnounceAdd; p_sap->pf_del = announce_SAPAnnounceDel; @@ -121,32 +137,29 @@ sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce ) p_sap->b_control = config_GetInt( p_sap, "sap-flow-control"); if( vlc_thread_create( p_sap, "sap handler", RunThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_LOW, false ) ) { msg_Dbg( p_announce, "unable to spawn SAP handler thread"); - free( p_sap ); + vlc_object_release( p_sap ); return NULL; - }; + } + + vlc_object_set_destructor( p_sap, announce_SAPHandlerDestructor ); + msg_Dbg( p_announce, "thread created, %i sessions", p_sap->i_sessions); + return p_sap; } -/** - * Destroy the SAP handler - * \param p_this the SAP Handler to destroy - * \return nothing - */ -void announce_SAPHandlerDestroy( sap_handler_t *p_sap ) +static void announce_SAPHandlerDestructor( vlc_object_t * p_this ) { + sap_handler_t *p_sap = (sap_handler_t *)p_this; int i; - vlc_mutex_destroy( &p_sap->object_lock ); - /* Free the remaining sessions */ for( i = 0 ; i< p_sap->i_sessions ; i++) { sap_session_t *p_session = p_sap->pp_sessions[i]; - FREENULL( p_session->psz_sdp ); FREENULL( p_session->psz_data ); REMOVE_ELEM( p_sap->pp_sessions, p_sap->i_sessions , i ); FREENULL( p_session ); @@ -168,9 +181,6 @@ void announce_SAPHandlerDestroy( sap_handler_t *p_sap ) REMOVE_ELEM( p_sap->pp_addresses, p_sap->i_addresses, i ); FREENULL( p_address ); } - - /* Free the structure */ - vlc_object_destroy( p_sap ); } /** @@ -188,19 +198,19 @@ static void RunThread( vlc_object_t *p_this) int i; /* If needed, get the rate info */ - if( p_sap->b_control == VLC_TRUE ) + if( p_sap->b_control == true ) { for( i = 0 ; i< p_sap->i_addresses ; i++) { - if( p_sap->pp_addresses[i]->b_enabled == VLC_TRUE ) + if( p_sap->pp_addresses[i]->b_enabled == true ) { - CalculateRate( p_sap, p_sap->pp_addresses[i] ); + ComputeRate( p_sap->pp_addresses[i] ); } } } /* Find the session to announce */ - vlc_mutex_lock( &p_sap->object_lock ); + vlc_object_lock( p_sap ); if( p_sap->i_sessions > p_sap->i_current_session + 1) { p_sap->i_current_session++; @@ -211,16 +221,16 @@ static void RunThread( vlc_object_t *p_this) } else { - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); msleep( SAP_IDLE ); continue; } p_session = p_sap->pp_sessions[p_sap->i_current_session]; - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); /* And announce it */ - if( p_session->p_address->b_enabled == VLC_TRUE && - p_session->p_address->b_ready == VLC_TRUE ) + if( p_session->p_address->b_enabled == true && + p_session->p_address->b_ready == true ) { announce_SendSAPAnnounce( p_sap, p_session ); } @@ -233,54 +243,27 @@ static void RunThread( vlc_object_t *p_this) static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, session_descriptor_t *p_session ) { - int i_header_size, i; - char *psz_head, psz_addr[NI_MAXNUMERICHOST]; - vlc_bool_t b_ipv6 = VLC_FALSE; + int i; + char psz_addr[NI_MAXNUMERICHOST]; + bool b_ipv6 = false, b_ssm = false; sap_session_t *p_sap_session; mtime_t i_hash; - struct addrinfo hints, *res; struct sockaddr_storage addr; socklen_t addrlen; - vlc_mutex_lock( &p_sap->object_lock ); - - if( p_session->psz_uri == NULL ) + vlc_object_lock( p_sap ); + addrlen = p_session->addrlen; + if ((addrlen == 0) || (addrlen > sizeof (addr))) { - vlc_mutex_unlock( &p_sap->object_lock ); - msg_Err( p_sap, "*FIXME* unexpected NULL URI for SAP announce" ); - msg_Err( p_sap, "This should not happen. VLC needs fixing." ); + vlc_object_unlock( p_sap ); + msg_Err( p_sap, "No/invalid address specified for SAP announce" ); return VLC_EGENERIC; } /* Determine SAP multicast address automatically */ - memset( &hints, 0, sizeof( hints ) ); - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_NUMERICHOST; - - i = vlc_getaddrinfo( (vlc_object_t *)p_sap, p_session->psz_uri, 0, - &hints, &res ); - if( i ) - { - vlc_mutex_unlock( &p_sap->object_lock ); - msg_Err( p_sap, "Invalid URI for SAP announce: %s: %s", - p_session->psz_uri, vlc_gai_strerror( i ) ); - return VLC_EGENERIC; - } + memcpy (&addr, &p_session->addr, addrlen); - addrlen = res->ai_addrlen; - if ((unsigned)addrlen > sizeof (addr)) - { - vlc_mutex_unlock( &p_sap->object_lock ); - vlc_freeaddrinfo( res ); - msg_Err( p_sap, "Unsupported address family of size %d > %u", - res->ai_addrlen, (unsigned) sizeof( addr ) ); - return VLC_EGENERIC; - } - - memcpy (&addr, res->ai_addr, addrlen); - vlc_freeaddrinfo (res); - - switch( addr.ss_family ) + switch( p_session->addr.ss_family ) { #if defined (HAVE_INET_PTON) || defined (WIN32) case AF_INET6: @@ -291,13 +274,18 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 ); if( IN6_IS_ADDR_MULTICAST( a6 ) ) - /* force flags to zero, preserve scope */ + { + /* SSM <=> ff3x::/32 */ + b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000; + + /* force flags to zero, preserve scope */ a6->s6_addr[1] &= 0xf; + } else /* Unicast IPv6 - assume global scope */ memcpy( a6->s6_addr, "\xff\x0e", 2 ); - b_ipv6 = VLC_TRUE; + b_ipv6 = true; break; } #endif @@ -324,13 +312,17 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, ipv4 = 0; else /* other addresses => 224.2.127.254 */ + { + /* SSM: 232.0.0.0/8 */ + b_ssm = (ipv4 >> 24) == 232; ipv4 = 0xe0027ffe; + } if( ipv4 == 0 ) { msg_Err( p_sap, "Out-of-scope multicast address " - "not supported by SAP: %s", p_session->psz_uri ); - vlc_mutex_unlock( &p_sap->object_lock ); + "not supported by SAP" ); + vlc_object_unlock( p_sap ); return VLC_EGENERIC; } @@ -339,7 +331,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, } default: - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); msg_Err( p_sap, "Address family %d not supported by SAP", addr.ss_family ); return VLC_EGENERIC; @@ -350,7 +342,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, if( i ) { - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); msg_Err( p_sap, "%s", vlc_gai_strerror( i ) ); return VLC_EGENERIC; } @@ -359,6 +351,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, /* XXX: Check for dupes */ p_sap_session = (sap_session_t*)malloc(sizeof(sap_session_t)); + p_sap_session->p_sd = p_session; p_sap_session->p_address = NULL; /* Add the address to the buffer */ @@ -377,40 +370,34 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, malloc( sizeof(sap_address_t) ); if( !p_address ) { - msg_Err( p_sap, "out of memory" ); + vlc_object_unlock( p_sap ); return VLC_ENOMEM; } p_address->psz_address = strdup( psz_addr ); - p_address->i_wfd = net_ConnectUDP( p_sap, psz_addr, SAP_PORT, 255 ); + p_address->i_wfd = net_ConnectUDP( VLC_OBJECT(p_sap), psz_addr, SAP_PORT, 255 ); if( p_address->i_wfd != -1 ) { - char *ptr; - - net_StopRecv( p_address->i_wfd ); - net_GetSockAddress( p_address->i_wfd, p_address->psz_machine, - NULL ); - - /* removes scope if present */ - ptr = strchr( p_address->psz_machine, '%' ); - if( ptr != NULL ) - *ptr = '\0'; + shutdown( p_address->i_wfd, SHUT_RD ); + p_address->origlen = sizeof (p_address->orig); + getsockname (p_address->i_wfd, (struct sockaddr *)&p_address->orig, + &p_address->origlen); } - if( p_sap->b_control == VLC_TRUE ) + if( p_sap->b_control == true ) { - p_address->i_rfd = net_ListenUDP1( p_sap, psz_addr, SAP_PORT ); + p_address->i_rfd = net_ListenUDP1( (vlc_object_t*)p_sap, psz_addr, SAP_PORT ); if( p_address->i_rfd != -1 ) - net_StopSend( p_address->i_rfd ); + shutdown( p_address->i_rfd, SHUT_WR ); p_address->i_buff = 0; - p_address->b_enabled = VLC_TRUE; - p_address->b_ready = VLC_FALSE; + p_address->b_enabled = true; + p_address->b_ready = false; p_address->i_limit = 10000; /* 10000 bps */ p_address->t1 = 0; } else { - p_address->b_enabled = VLC_TRUE; - p_address->b_ready = VLC_TRUE; + p_address->b_enabled = true; + p_address->b_ready = true; p_address->i_interval = config_GetInt( p_sap,"sap-interval"); p_address->i_rfd = -1; } @@ -419,7 +406,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, && p_sap->b_control ) ) { msg_Warn( p_sap, "disabling address" ); - p_address->b_enabled = VLC_FALSE; + p_address->b_enabled = false; } INSERT_ELEM( p_sap->pp_addresses, @@ -429,68 +416,81 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, p_sap_session->p_address = p_address; } + memcpy (&p_session->orig, &p_sap_session->p_address->orig, + p_session->origlen = p_sap_session->p_address->origlen); - /* Build the SAP Headers */ - i_header_size = ( b_ipv6 ? 16 : 4 ) + 20; - psz_head = (char *) malloc( i_header_size * sizeof( char ) ); - if( psz_head == NULL ) + size_t headsize = 20; + switch (p_session->orig.ss_family) { - msg_Err( p_sap, "out of memory" ); +#ifdef AF_INET6 + case AF_INET6: + headsize += 16; + break; +#endif + case AF_INET: + headsize += 4; + break; + default: + msg_Err( p_sap, "Address family %d not supported by SAP", + addr.ss_family ); + vlc_object_unlock( p_sap ); + return VLC_EGENERIC; + } + + /* If needed, build the SDP */ + assert( p_session->psz_sdp != NULL ); + + p_sap_session->i_last = 0; + p_sap_session->i_length = headsize + strlen (p_session->psz_sdp); + p_sap_session->psz_data = malloc (p_sap_session->i_length + 1); + if (p_sap_session->psz_data == NULL) + { + free (p_session->psz_sdp); + vlc_object_unlock( p_sap ); return VLC_ENOMEM; } + /* Build the SAP Headers */ + uint8_t *psz_head = p_sap_session->psz_data; + /* SAPv1, not encrypted, not compressed */ - psz_head[0] = b_ipv6 ? 0x30 : 0x20; + psz_head[0] = 0x20; psz_head[1] = 0x00; /* No authentification length */ i_hash = mdate(); - psz_head[2] = (i_hash & 0xFF00) >> 8; /* Msg id hash */ - psz_head[3] = (i_hash & 0xFF); /* Msg id hash 2 */ + psz_head[2] = i_hash >> 8; /* Msg id hash */ + psz_head[3] = i_hash; /* Msg id hash 2 */ -#if defined (HAVE_INET_PTON) || defined (WIN32) - if( b_ipv6 ) + headsize = 4; + switch (p_session->orig.ss_family) { - inet_pton( AF_INET6, /* can't fail */ - p_sap_session->p_address->psz_machine, - psz_head + 4 ); - } - else +#ifdef AF_INET6 + case AF_INET6: + { + struct in6_addr *a6 = + &((struct sockaddr_in6 *)&p_session->orig)->sin6_addr; + memcpy (psz_head + headsize, a6, 16); + psz_head[0] |= 0x10; /* IPv6 flag */ + headsize += 16; + break; + } #endif - { - inet_pton( AF_INET, /* can't fail */ - p_sap_session->p_address->psz_machine, - psz_head + 4 ); - } - - memcpy( psz_head + (b_ipv6 ? 20 : 8), "application/sdp", 15 ); - - /* If needed, build the SDP */ - if( p_session->psz_sdp == NULL ) - { - p_session->psz_sdp = SDPGenerate( p_sap, p_session, - p_sap_session->p_address ); - if( p_session->psz_sdp == NULL ) + case AF_INET: { - vlc_mutex_unlock( &p_sap->object_lock ); - return VLC_ENOMEM; + uint32_t ipv4 = + (((struct sockaddr_in *)&p_session->orig)->sin_addr.s_addr); + memcpy (psz_head + headsize, &ipv4, 4); + headsize += 4; + break; } - } - - p_sap_session->psz_sdp = strdup( p_session->psz_sdp ); - p_sap_session->i_last = 0; - psz_head[ i_header_size-1 ] = '\0'; - p_sap_session->i_length = i_header_size + strlen( p_sap_session->psz_sdp); + } - p_sap_session->psz_data = (uint8_t *)malloc( sizeof(char)* - p_sap_session->i_length ); + memcpy (psz_head + headsize, "application/sdp", 16); + headsize += 16; /* Build the final message */ - memcpy( p_sap_session->psz_data, psz_head, i_header_size ); - memcpy( p_sap_session->psz_data+i_header_size, p_sap_session->psz_sdp, - strlen( p_sap_session->psz_sdp) ); - - free( psz_head ); + strcpy( (char *)psz_head + headsize, p_session->psz_sdp); /* Enqueue the announce */ INSERT_ELEM( p_sap->pp_sessions, @@ -500,10 +500,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, msg_Dbg( p_sap,"%i addresses, %i sessions", p_sap->i_addresses,p_sap->i_sessions); - /* Remember the SAP session for later deletion */ - p_session->p_sap = p_sap_session; - - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); return VLC_SUCCESS; } @@ -513,22 +510,23 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, session_descriptor_t *p_session ) { int i; - vlc_mutex_lock( &p_sap->object_lock ); + vlc_object_lock( p_sap ); - msg_Dbg( p_sap,"removing SAP announce %p",p_session->p_sap); + msg_Dbg( p_sap, "removing session %p from SAP", p_session); /* Dequeue the announce */ for( i = 0; i< p_sap->i_sessions; i++) { - if( p_session->p_sap == p_sap->pp_sessions[i] ) + if( p_session == p_sap->pp_sessions[i]->p_sd ) { + free( p_session->psz_sdp ); + sap_session_t *p_mysession = p_sap->pp_sessions[i]; REMOVE_ELEM( p_sap->pp_sessions, p_sap->i_sessions, i ); - FREENULL( p_session->p_sap->psz_sdp ); - FREENULL( p_session->p_sap->psz_data ); - free( p_session->p_sap ); + free( p_mysession->psz_data ); + free( p_mysession ); break; } } @@ -539,7 +537,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, msg_Dbg( p_sap,"%i announcements remaining", p_sap->i_sessions ); - vlc_mutex_unlock( &p_sap->object_lock ); + vlc_object_unlock( p_sap ); return VLC_SUCCESS; } @@ -575,81 +573,13 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, p_session->i_next = p_session->i_last + p_session->p_address->i_interval*1000000; } - else - { - return VLC_SUCCESS; - } return VLC_SUCCESS; } -static char *SDPGenerate( sap_handler_t *p_sap, - const session_descriptor_t *p_session, - const sap_address_t *p_addr ) -{ - int64_t i_sdp_id = mdate(); - int i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff); - char *psz_group, *psz_name, psz_uribuf[NI_MAXNUMERICHOST], *psz_uri, - *psz_sdp; - char ipv; - - psz_group = p_session->psz_group; - psz_name = p_session->psz_name; - - /* FIXME: really check that psz_uri is a real IP address - * FIXME: make a common function to obtain a canonical IP address */ - ipv = ( strchr( p_session->psz_uri, ':' ) != NULL) ? '6' : '4'; - if( *p_session->psz_uri == '[' ) - { - char *ptr; - - strlcpy( psz_uribuf, p_session->psz_uri + 1, sizeof( psz_uribuf ) ); - ptr = strchr( psz_uribuf, '%' ); - if( ptr != NULL) - *ptr = '\0'; - ptr = strchr( psz_uribuf, ']' ); - if( ptr != NULL) - *ptr = '\0'; - psz_uri = psz_uribuf; - } - else - psz_uri = p_session->psz_uri; - - /* see the lists in modules/stream_out/rtp.c for compliance stuff */ - if( asprintf( &psz_sdp, - "v=0\r\n" - "o=- "I64Fd" %d IN IP%c %s\r\n" - "s=%s\r\n" - "c=IN IP%c %s/%d\r\n" - "t=0 0\r\n" - "a=tool:"PACKAGE_STRING"\r\n" - "a=recvonly\r\n" - "a=type:broadcast\n" - "a=source-filter: incl IN IP%c * %s\r\n" - "m=video %d %s %d\r\n" - "%s%s%s", - i_sdp_id, i_sdp_version, - ipv, p_addr->psz_machine, - psz_name, ipv, psz_uri, - /* FIXME: 1 is IPv4 default TTL, not that of IPv6 */ - p_session->i_ttl ?: (config_GetInt( p_sap, "ttl" ) ?: 1), - ipv, psz_uri, - p_session->i_port, - p_session->b_rtp ? "RTP/AVP" : "udp", - p_session->i_payload, - psz_group ? "a=x-plgroup:" : "", - psz_group ? psz_group : "", psz_group ? "\r\n" : "" ) == -1 ) - return NULL; - - msg_Dbg( p_sap, "Generated SDP (%i bytes):\n%s", strlen(psz_sdp), - psz_sdp ); - return psz_sdp; -} - -static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) +static int ComputeRate( sap_address_t *p_address ) { - int i_read; uint8_t buffer[SAP_MAX_BUFFER]; - int i_tot = 0; + ssize_t i_tot = 0; mtime_t i_temp; int i_rate; @@ -658,13 +588,14 @@ static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) p_address->t1 = mdate(); return VLC_SUCCESS; } - do + for (;;) { /* Might be too slow if we have huge data */ - i_read = net_ReadNonBlock( p_sap, p_address->i_rfd, NULL, buffer, - SAP_MAX_BUFFER, 0 ); + ssize_t i_read = recv( p_address->i_rfd, buffer, SAP_MAX_BUFFER, 0 ); + if (i_read == -1) + break; i_tot += i_read; - } while( i_read > 0 ); + } i_temp = mdate(); @@ -693,7 +624,7 @@ static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) p_address->psz_address,SAP_PORT, i_rate, p_address->i_interval ); #endif - p_address->b_ready = VLC_TRUE; + p_address->b_ready = true; p_address->t1 = i_temp; p_address->i_buff = 0;