- i_header_size = 9 + strlen( payload_type );
- sap_head = ( char * )malloc( i_header_size * sizeof( char ) );
-
- 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) );
-
- 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++;
+ msg_Warn( p_sout,"forcing SAP announcement");
+ }
+
+ p_session = sout_AnnounceSessionCreate();
+ p_session->psz_sdp = strdup( psz_sdp );
+ announce_Register( p_announce, p_session, p_method );
+
+ vlc_object_release( p_announce );
+ return p_session;
+}
+
+/**
+ * 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 )
+{
+ 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 );
+
+ vlc_object_release( p_announce );
+
+ return i_ret;
+}
+
+/**
+ * Create and initialize a session descriptor
+ *
+ * \return a new session descriptor
+ */
+session_descriptor_t * sout_AnnounceSessionCreate()
+{
+ session_descriptor_t *p_session;
+
+ p_session = (session_descriptor_t *)malloc( sizeof(session_descriptor_t));
+
+ if( p_session)
+ {
+ p_session->p_sap = NULL;
+ p_session->psz_sdp = NULL;
+ p_session->psz_name = NULL;
+ p_session->psz_uri = NULL;
+ p_session->i_port = 0;
+ p_session->psz_group = NULL;
+ }
+
+ return p_session;
+}
+
+/**
+ * Destroy a session descriptor and free all
+ *
+ * \param p_session the session to destroy
+ * \return Nothing
+ */
+void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
+{
+ if( p_session )
+ {
+ FREE( p_session->psz_name );
+ FREE( p_session->psz_group );
+ FREE( p_session->psz_uri );
+ FREE( p_session->psz_sdp );
+ free( p_session );
+ }
+}
+
+/**
+ * Create and initialize an announcement method structure
+ *
+ * \param i_type METHOD_TYPE_SAP or METHOD_TYPE_SLP
+ * \return a new announce_method structure
+ */
+announce_method_t * sout_AnnounceMethodCreate( int i_type )
+{
+ announce_method_t *p_method;
+
+ p_method = (announce_method_t *)malloc( sizeof(announce_method_t) );
+
+ if( p_method )
+ {
+ p_method->i_type = i_type;
+ if( i_type == METHOD_TYPE_SAP )
+ {
+ /* Default values */
+ p_method->psz_address = NULL;
+ p_method->i_ip_version = 4 ;
+ p_method->sz_ipv6_scope = '\0';
+ }
+ }
+ return p_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
+ */
+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 )
+ {
+ msg_Err( p_this, "out of memory" );
+ return NULL;
+ }
+
+ p_announce->p_sap = NULL;
+
+ vlc_object_attach( p_announce, p_this->p_vlc);
+
+
+ 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 )
+ {
+ p_announce->p_sap->b_die = VLC_TRUE;
+ /* Wait for the SAP thread to exit */
+ vlc_thread_join( p_announce->p_sap );
+ announce_SAPHandlerDestroy( p_announce->p_sap );
+ }
+
+ /* Free the structure */
+ vlc_object_destroy( p_announce );
+
+ return VLC_SUCCESS;
+}
+
+/* Register an announce */
+int announce_Register( announce_handler_t *p_announce,
+ session_descriptor_t *p_session,
+ announce_method_t *p_method )
+{
+
+ msg_Dbg( p_announce, "registering announce");
+ if( p_method->i_type == METHOD_TYPE_SAP )
+ {
+ /* 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, p_method );
+ }
+ else if( p_method->i_type == METHOD_TYPE_SLP )
+ {
+ msg_Dbg( p_announce, "SLP unsupported at the moment" );
+ return VLC_EGENERIC;
+ }
+ else
+ {
+ msg_Dbg( p_announce, "Announce type unsupported" );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;;
+}
+
+
+/* Unregister an announce */
+int announce_UnRegister( announce_handler_t *p_announce,
+ session_descriptor_t *p_session )
+{
+ msg_Dbg( p_announce, "unregistering announce" );
+ if( p_session->p_sap != NULL ) /* SAP Announce */
+ {
+ if( !p_announce->p_sap )
+ {
+ msg_Err( p_announce, "can't remove announce, no SAP handler");
+ return VLC_ENOOBJ;
+ }
+ p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
+ }
+ return VLC_SUCCESS;