* Stream output now support IPv6 SAP announces

* Code cleanup in SAP

NEWS

-$Id: NEWS,v 1.53 2003/06/22 18:07:23 gbazin Exp $
+$Id: NEWS,v 1.54 2003/06/23 11:41:25 zorglub Exp $
 
 Changes between 0.5.3 and 0.6.0:
 ---------------------------------
@@ -36,7 +36,7 @@ Stream output:
  * New stream output scheme. It is now possible to build a chain of stream outputs allowing for instance to stream and display some content at the same time.
  * The stream output now allows to transcode content on the fly.
  * Fixed major bug that prevented streaming mpeg 1/2 video with pulldown content.
- * SAP (Session Announcement Protocol) support.
+ * SAP/SDP announcing support. (both IPv4 and IPv6)
 
 Miscellaneous:
  * New reset option for the preferences
@@ -44,6 +44,7 @@ Miscellaneous:
  * New video chroma conversion module using ffmpeg
  * Added a Gentoo ebuild to the distribution
  * Added a new smaller subtitles font (now the default) + scripts to generate your own
+ * SAP/SDP IPv6 support
 
 UNIX ports:
  * Basic support for the X11 Xinerama extension.

include/announce.h

@@ -2,11 +2,9 @@
  * announce.h : Session announcement
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: announce.h,v 1.3 2003/06/12 11:37:48 zorglub Exp $
+ * $Id: announce.h,v 1.4 2003/06/23 11:41:26 zorglub Exp $
  *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
- *          Laurent Aimar <fenrir@via.ecp.fr>
- *          Eric Petit <titer@videolan.org>
+ * Authors: Clment Stenac <zorglub@via.ecp.fr>
  *
  * 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
@@ -56,6 +54,8 @@ struct sap_session_t
         unsigned int socket;
         unsigned int sendnow;
         struct sockaddr_in addr;
+        struct sockaddr_in6 addr6;
+        int i_ip_version;
 };
 
 
@@ -63,6 +63,6 @@ struct sap_session_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_EXPORT( sap_session_t *,            sout_SAPNew,         ( sout_instance_t *,char * , char * , char * ) );
-VLC_EXPORT( void,            sout_SAPSend,        ( sout_instance_t *,sap_session_t * ) );
+VLC_EXPORT( sap_session_t *,            sout_SAPNew,         ( sout_instance_t *,char * , char * , char * ,int , char *) );
+VLC_EXPORT( void,            sout_SAPSend,        ( sout_instance_t *,sap_session_t *) );
 VLC_EXPORT( void,            sout_SAPDelete,      ( sout_instance_t *,sap_session_t * ) );

modules/stream_out/standard.c

@@ -2,7 +2,7 @@
  * standard.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.4 2003/06/12 11:37:48 zorglub Exp $
+ * $Id: standard.c,v 1.5 2003/06/23 11:41:26 zorglub Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -32,6 +32,8 @@
 #include <vlc/sout.h>
 #include <announce.h>
 
+#define DEFAULT_IPV6_SCOPE "8"
+
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
@@ -69,12 +71,14 @@ static int Open( vlc_object_t *p_this )
     sout_instance_t     *p_sout = p_stream->p_sout;
     sout_stream_sys_t   *p_sys = malloc( sizeof( sout_stream_sys_t) );
 
-    char                *psz_mux    = sout_cfg_find_value( p_stream->p_cfg, "mux" );
-    char                *psz_access = sout_cfg_find_value( p_stream->p_cfg, "access" );
-    char                *psz_url    = sout_cfg_find_value( p_stream->p_cfg, "url" );
-
+    char   *psz_mux      = sout_cfg_find_value( p_stream->p_cfg, "mux" );
+    char   *psz_access   = sout_cfg_find_value( p_stream->p_cfg, "access" );
+    char   *psz_url      = sout_cfg_find_value( p_stream->p_cfg, "url" );
+    char   *psz_ipv      = sout_cfg_find_value( p_stream->p_cfg, "sap_ipv" );
+    char   *psz_v6_scope = sout_cfg_find_value( p_stream->p_cfg, "sap_v6scope");
     sout_cfg_t          *p_sap_cfg  = sout_cfg_find( p_stream->p_cfg, "sap" );
 
+    
     char                *psz_sap = NULL;
 
     char                *psz_port = "1234";
@@ -83,9 +87,12 @@ static int Open( vlc_object_t *p_this )
     
     sout_access_out_t *p_access;
     sout_mux_t        *p_mux;    
-   
+  
    p_sys->b_sap=0;
    /* SAP is only valid for UDP or RTP streaming */
+  if( psz_access == NULL )
+          psz_access="udp";
+   
    if(p_sap_cfg && (strstr(psz_access,"udp") || strstr( psz_access ,  "rtp" )))
    {
         msg_Info( p_this, "SAP Enabled");
@@ -99,6 +106,13 @@ static int Open( vlc_object_t *p_this )
                 psz_sap = strdup ( psz_url );
         }        
    }
+   
+   /* Get SAP IP version to use */
+   if(psz_ipv == NULL)
+           psz_ipv = "4";
+   if(psz_v6_scope == NULL)
+           psz_v6_scope= DEFAULT_IPV6_SCOPE;
+   
    msg_Dbg( p_this, "creating `%s/%s://%s'",
              psz_access, psz_mux, psz_url );
        
@@ -127,8 +141,8 @@ static int Open( vlc_object_t *p_this )
     /*  *** Create the SAP Session structure *** */
     if(p_sys->b_sap)
     {        
-        msg_Dbg( p_sout , "Creating SAP" );
-        p_sap = sout_SAPNew( p_sout , psz_url , psz_port , psz_sap );
+        msg_Dbg( p_sout , "Creating SAP with IPv%i",atoi(psz_ipv) );
+        p_sap = sout_SAPNew( p_sout , psz_url , psz_port , psz_sap, atoi(psz_ipv), psz_v6_scope );
         if(!p_sap)
         {
                 msg_Err( p_sout,"Unable to initialize SAP. SAP disabled");
@@ -163,7 +177,7 @@ static void Close( vlc_object_t * p_this )
     sout_access_out_t *p_access = p_sys->p_mux->p_access;
 
     if(p_sys -> b_sap)
-          sout_SAPDelete( p_this ,p_sys->p_sap ); 
+          sout_SAPDelete( (sout_instance_t *)p_this ,p_sys->p_sap ); 
 
     sout_MuxDelete( p_sys->p_mux );
     sout_AccessOutDelete( p_access );

src/stream_output/announce.c

@@ -28,6 +28,8 @@
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                            /* strerror() */
 
+#include <unistd.h>
+
 #include <vlc/vlc.h>
 
 #include <vlc/sout.h>
@@ -36,59 +38,163 @@
 #include <announce.h>
 #include <network.h>
 
-#define SAP_ADDR "224.2.127.254" /* Standard port and address for SAP */
+#define SAP_IPV4_ADDR "224.2.127.254" /* Standard port and address for SAP */
 #define SAP_PORT 9875
 
+#define SAP_IPV6_ADDR_1 "FF0"
+#define SAP_IPV6_ADDR_2 "::2:7FFE"
+
 /*****************************************************************************
  * sout_SAPNew: Creates a SAP Session
  *****************************************************************************/
-sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , char *psz_port_arg , char * psz_name_arg )
+sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , 
+                char * psz_url_arg , char *psz_port_arg , 
+                char * psz_name_arg, int ip_version, 
+                char * psz_v6_scope )
 {
-        sap_session_t           *p_new;
-        module_t                *p_network;
-        network_socket_t        socket_desc;
-        char                    psz_network[12];       
-        struct                  sockaddr_in addr;
-              
-        p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
+      
+    sap_session_t       *p_new; /* The SAP structure */
+    module_t            *p_network; /* Network module */
+    network_socket_t    socket_desc; /* Socket descriptor */
+    char                psz_network[6]; /* IPv4 or IPv6 */
+    struct              sockaddr_in addr; /* IPv4 connection structure */
+    struct              sockaddr_in6 addr6;/* IPv6 connection structure */
+    char                *sap_ipv6_addr=NULL; /* IPv6 built address */     
+    void                *net_ipv6_addr=NULL; /* IPv6 address in net-format */
+    int                 i_status=0;  /* Problems on system calls*/
+    
+    /* Allocate the SAP structure */ 
+    p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
+    if ( !p_new )
+    {
+        msg_Err( p_sout, "No memory left" );        
+        return NULL;
+    }
+                
+    /* Fill the information in the structure */
+    sprintf ( p_new->psz_url , "%s" , psz_url_arg );
+    sprintf ( p_new->psz_name , "%s" , psz_name_arg );
+    /* Port is not implemented in sout */
+    sprintf ( p_new->psz_port, "%s" , psz_port_arg );
 
-        if ( !p_new )
-                return NULL;
+    p_new->i_ip_version = ip_version;
+                        
+    /* Only "6" triggers IPv6. IPv4 is default */
+    if(ip_version != 6)
+    {
+        msg_Dbg( p_sout , "Creating IPv4 SAP socket" );
+        
+        /* Fill the socket descriptor */
+        socket_desc.i_type            = NETWORK_UDP;
+        socket_desc.psz_bind_addr     = "";
+        socket_desc.i_bind_port       = 0;
+        socket_desc.psz_server_addr   = SAP_IPV4_ADDR;
+        socket_desc.i_server_port     = SAP_PORT;
+        socket_desc.i_handle          = 0;
+       
+        /* Call the network module */ 
+        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;
+        if(p_new->socket <= 0 )
+        {
+            msg_Warn( p_sout, "Unable to initialize SAP" );
+            return NULL;
+        }
         
-        sprintf ( p_new->psz_url , "%s" , psz_url_arg );
-        sprintf ( p_new->psz_name , "%s" , psz_name_arg );
-        sprintf ( p_new->psz_port, "%s" , psz_port_arg ); /* Not implemented in SO */
+        /* Fill the sockaddr_in structure */ 
+        memset( &addr , 0 , sizeof(addr) );
+        addr.sin_family      = AF_INET;
+        addr.sin_addr.s_addr = inet_addr(SAP_IPV4_ADDR);
+        addr.sin_port        = htons( SAP_PORT );
+        p_new->addr = addr;
+    }
+    else
+    {
+        msg_Dbg(p_sout , "Creating IPv6 SAP socket with scope %s" 
+                        , psz_v6_scope );
+
+        /* Initialize and build the IPv6 address to broadcast to */
+        sap_ipv6_addr = (char *)malloc(28*sizeof(char));
+        if ( !sap_ipv6_addr )
+        {
+            msg_Err( p_sout, "No memory left" );        
+            return NULL;
+        }
+        sprintf(sap_ipv6_addr,"%s%c%s",
+                         SAP_IPV6_ADDR_1,
+                         psz_v6_scope[0],
+                         SAP_IPV6_ADDR_2); 
+
+        /* Convert it to network format */
+        net_ipv6_addr = (struct in6_addr *)malloc( sizeof(struct in6_addr) );
+        if ( !net_ipv6_addr )
+        {
+            msg_Err( p_sout, "No memory left" );        
+            return NULL;
+        }
         
-        msg_Dbg (p_sout , "Creating SAP Socket" );
+        i_status         = inet_pton(AF_INET6,sap_ipv6_addr,net_ipv6_addr);
+        if(i_status < 0 )
+        {
+           msg_Warn(p_sout,"Unable to convert address to network format");
+           return NULL;
+        }
+        else if(i_status == 0)
+        {
+            msg_Warn(p_sout,"Adresse de diffusion SAP invalide"); 
+            return NULL;
+        }
         
+        /* Fill the socket descriptor */
         socket_desc.i_type        = NETWORK_UDP;
-        socket_desc.psz_bind_addr = "";
+        socket_desc.psz_bind_addr = ""; 
         socket_desc.i_bind_port   = 0;
-        socket_desc.psz_server_addr   = SAP_ADDR;
+        socket_desc.psz_server_addr = sap_ipv6_addr;
         socket_desc.i_server_port     = SAP_PORT;
         socket_desc.i_handle          = 0;
+            
+        sprintf ( psz_network, "ipv6" ); 
         
-        sprintf ( psz_network, "ipv4" ); 
-
+        /* Call the network module */
         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 );
-    
-        p_new->addr = addr;
-    
-        return(p_new);
+        if(p_new->socket <= 0 )
+        {
+             msg_Warn( p_sout, "Unable to initialize SAP" );
+             return NULL;
+         }
+                
+        /* Fill the sockaddr_in structure */
+        memset( &addr6 , 0 , sizeof(addr6) );
+        addr6.sin6_family      = AF_INET6;
+        memcpy( &addr6.sin6_addr.s6_addr , net_ipv6_addr ,
+                   sizeof(addr6.sin6_addr.s6_addr) );
+            
+        addr6.sin6_port        = htons( SAP_PORT );
+        p_new->addr6 = addr6;
+
+        /* Free what we allocated */
+        if( sap_ipv6_addr ) free(sap_ipv6_addr);
+        if( net_ipv6_addr ) free(net_ipv6_addr);
+    }
+            
+    msg_Dbg (p_sout,"SAP initialization complete");
+  
+    return(p_new);
 }
 
 /*****************************************************************************
@@ -98,49 +204,54 @@ void sout_SAPDelete( sout_instance_t *p_sout , sap_session_t * p_this )
 {
         if( close(p_this->socket) )
                 msg_Err ( p_sout, "Unable to close SAP socket");
-        if( p_this ) free(p_this);        
+        
+        if( p_this ) free( p_this );        
 }       
 
 /*****************************************************************************
  * sout_SAPSend: Sends a SAP packet 
  *****************************************************************************/
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this )
-{ 
-      char *sap_head;
-      char sap_msg[1000];
-      char *sap_send;
-      char *payload_type="application/sdp";
-      int i_send_result;
-      int i;
-      int i_header_size;
-      int i_msg_size;
-      int i_size;
-     
+void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this)
+{
+        
+    char *sap_head;                         /* SAP header */
+    char sap_msg[1000];                     /* SDP content */
+    char *sap_send;                         /* What we send */
+    char *payload_type="application/sdp";   
+    int i_send_result=0;                    /* Result of send */
+    int i;
+    int i_header_size;                      /* SAP header size */
+    int i_msg_size;                         /* SDP content size */
+    int i_size;                             /* Total size */
+    
+    /* We send a packet every 24 calls to the function */
     if( p_this->sendnow == 24 )
     {
-          i_header_size = 9 + strlen( payload_type );
-          sap_head = ( char * )malloc( i_header_size * sizeof( char ) );
+        i_header_size = 9 + strlen( payload_type );
+        sap_head = ( char * )malloc( i_header_size * sizeof( char ) );
         
-          if( ! sap_head )         
-          {
-                  msg_Err( p_sout , "No memory left");
-                  return;
-          }       
+        if( ! sap_head )         
+        {
+            msg_Warn( p_sout , "No memory left");
+            return;
+        }       
          
-          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 */
+        /* 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 */
+        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'; 
+        strncpy( sap_head+8 , payload_type , 15 );
+        sap_head[ i_header_size-1 ] = '\0'; 
        
-           /* Do not add spaces at beginning of the lines ! */  
+        /* 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\
@@ -150,40 +261,58 @@ 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;
+       i_msg_size = strlen( sap_msg );     
+       i_size = i_msg_size + i_header_size;
      
-     sap_send = ( char* )malloc( i_size*sizeof(char) ); 
-        
-      if(! sap_send)
-      {
-             msg_Err( p_sout ,  "No memory left") ;
-             return;
-      }
+       /* 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++)
-      {
+       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];
-     }
+       
+       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 */     
+      {
+          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_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 );
+      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 = 0;
+       
+       /* Free what we allocated */
+       if(sap_send) free(sap_send);
+       if(sap_head) free(sap_head);
    }
+    
    p_this->sendnow++;  
 }