- 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++;
+ if (res->ai_addrlen <= sizeof (p_session->addr))
+ memcpy (&p_session->addr, res->ai_addr,
+ p_session->addrlen = res->ai_addrlen);
+ freeaddrinfo (res);
+ }
+
+ 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);