/*****************************************************************************
- * announce.c : Session announcement
+ * announce.c : announce handler
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2007 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.
*****************************************************************************/
/*****************************************************************************
* 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 "libvlc.h"
-#include <vlc/sout.h>
-#undef DEBUG_BUFFER
+#include <assert.h>
-#include <announce.h>
-#include <network.h>
+struct announce_method_t
+{
+} sap_method;
-#define SAP_ADDR "224.2.127.254"
-#define SAP_PORT 9875
+/****************************************************************************
+ * Sout-side functions
+ ****************************************************************************/
-/*****************************************************************************
- * sout_SAPNew: Creates a SAP Session
- *****************************************************************************/
-sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , char * psz_name_arg )
+static void sap_destroy (vlc_object_t *p_this)
{
- 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 ) ) )
- {
- msg_Warn( p_sout, "failed to open a connection (udp)" );
- }
-
- 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);
+ libvlc_priv (p_this->p_libvlc)->p_sap = NULL;
}
-/*****************************************************************************
- * sout_SAPDelete: Deletes a SAP Session
- *****************************************************************************/
-void sout_SAPDelete( sap_session_t * p_this )
+#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 )
{
- shutdown(p_this->socket,0);
- free(p_this);
-}
+ assert (p_method == &sap_method);
+ (void) p_method;
-/*****************************************************************************
- * 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;
+ session_descriptor_t *p_session = calloc( 1, sizeof (*p_session) );
+ if( !p_session )
+ return NULL;
+
+ p_session->psz_sdp = strdup( psz_sdp );
+
+ /* 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)
+ {
+ if (res->ai_addrlen <= sizeof (p_session->addr))
+ memcpy (&p_session->addr, res->ai_addr,
+ p_session->addrlen = res->ai_addrlen);
+ freeaddrinfo (res);
}
- p_this->sendnow++;
+
+ 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
+ vlc_object_hold ((vlc_object_t *)p_sap);
+ vlc_mutex_unlock (&sap_mutex);
+
+ if (p_sap == NULL)
+ goto error;
+
+ msg_Dbg (obj, "adding SAP session");
+ SAP_Add (p_sap, p_session );
+ return p_session;
+
+error:
+ free (p_session->psz_sdp);
+ free (p_session);
+ return NULL;
+}
+
+#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;
+
+ msg_Dbg (obj, "removing SAP session");
+ SAP_Del (p_sap, p_session);
+
+ vlc_mutex_lock (&sap_mutex);
+ vlc_object_release ((vlc_object_t *)p_sap);
+ vlc_mutex_unlock (&sap_mutex);
+
+ free (p_session->psz_sdp);
+ free (p_session);
+
+ return 0;
+}
+
+/**
+ * \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);
}
projects / vlc / blobdiff