- 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 );
-
- 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 = sendto( p_this->socket , sap_send ,
- i_size , 0 ,
- (struct sockaddr *)&p_this->addr6,
- sizeof(p_this->addr6) );
- }
- else
- {
- 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;
-
- /* Free what we allocated */
- if(sap_send) free(sap_send);
- if(sap_head) free(sap_head);
- }
-
- p_this->sendnow++;
+ 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 );
+ }
+ else
+ {
+ msg_Err( p_announce, "announce type unsupported" );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
+
+/* Unregister an announce */
+static int announce_UnRegister( announce_handler_t *p_announce,
+ session_descriptor_t *p_session )
+{
+ msg_Dbg( p_announce, "unregistering announce" );
+ if( p_announce->p_sap )
+ p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
+ return VLC_SUCCESS;