Changeset e2dedca13cdfff43592c0fc5065446f11d248307

Timestamp:

31/05/05 21:48:21 (4 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1117568901 +0000

git-parent:

[1d8cad44a85cb72173d9e00eb21802f3c7bfc363]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1117568901 +0000

Message:

- hopefuly fix sending of SAP announces over IPv6
- automatically select SAP multicast address (closes #141)
- some clean up

Files:

• include/stream_output.h (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (2 diffs)
• modules/stream_out/standard.c (modified) (5 diffs)
• src/stream_output/announce.c (modified) (1 diff)
• src/stream_output/sap.c (modified) (9 diffs)

include/stream_output.h

@@ -260 +260 @@
-
-    /* For SAP */
-    int i_ip_version;
-    char *psz_address; /* If we use a custom address */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/* A SAP session descriptor, enqueued in the SAP handler queue */

modules/stream_out/rtp.c

@@ -1235 +1235 @@
-    sout_stream_sys_t *p_sys = p_stream->p_sys;
-    sout_instance_t   *p_sout = p_stream->p_sout;
+    /* FIXME: use sout_AnnounceMethodCreate */
-    announce_method_t *p_method = (announce_method_t *)
-                                  malloc(sizeof(announce_method_t));
@@ -1247 +1248 @@
-    p_method->i_type = METHOD_TYPE_SAP;
-    p_method->psz_address = NULL; /* FIXME */
-    p_method->i_ip_version = 4; /* FIXME ! */
-
-    if( p_sys->i_es > 0 && p_sys->psz_sdp && *p_sys->psz_sdp )

modules/stream_out/standard.c

@@ -64 +64 @@
-#define SAP_LONGTEXT N_("Announce this session with SAP")
-
-#define SAPv6_TEXT N_("SAP IPv6 announcing")
-#define SAPv6_LONGTEXT N_("Use IPv6 to announce this session with SAP")
-
-#define SLP_TEXT N_("SLP announcing")
-#define SLP_LONGTEXT N_("Announce this session with SLP")
@@ -96 +93 @@
-    add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT,
-                                        VLC_TRUE );
-
-
+
-
-    add_bool( SOUT_CFG_PREFIX "slp", 0, NULL, SLP_TEXT, SLP_LONGTEXT, VLC_TRUE );
@@ -110 +106 @@
-static const char *ppsz_sout_options[] = {
-    "access", "mux", "url",
-
-
+
-};
-
-#define DEFAULT_IPV6_SCOPE '8'
-#define DEFAULT_PORT 1234
-
@@ -350 +344 @@
-        free( val.psz_string );
-
-        var_Get( p_stream, SOUT_CFG_PREFIX "sap-ipv6", &val );
-        p_method->i_ip_version = val.b_bool ? 6 : 4;
-
-        /* Now, parse the URL to extract host and port */
-        vlc_UrlParse( &url, psz_url , 0);
@@ -370 +361 @@
-
-            sout_AnnounceRegister( p_sout, p_session, p_method );
-
-            /* FIXME: Free p_method */
-
-            p_stream->p_sys->p_session = p_session;
-        }
-        vlc_UrlClean( &url );
-
+        /* FIXME: Free p_method */
-        if( p_method->psz_address) free( p_method->psz_address );
-        free( p_method );

src/stream_output/announce.c

@@ -205 +205 @@
-        p_method->i_type = i_type;
-        if( i_type == METHOD_TYPE_SAP )
-
-
+
-            p_method->psz_address = NULL;
-            p_method->i_ip_version = 4 ;
-            p_method->sz_ipv6_scope = '\0';
-        }
-    }
-    return p_method;

src/stream_output/sap.c

@@ -2 +2 @@
- * sap.c : SAP announce handler
- *****************************************************************************
-4
+5
- * $Id$
- *
@@ -28 +28 @@
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
+#include <ctype.h>                                  /* tolower(), isxdigit() */
-
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
-
-
+
+
+
+
+
+
+
+
+
+
-#include "charset.h"
-
-#define SAP_IPV4_ADDR "224.2.127.254" /* Standard port and address for SAP
+/* SAP is always on that port
-#define SAP_PORT 9875
-
-#define SAP_IPV6_ADDR_1 "FF0"
-#define SAP_IPV6_ADDR_2 "::2:7FFE"
-
-#define DEFAULT_IPV6_SCOPE '8'
-
-#define DEFAULT_PORT "1234"
-
-#undef EXTRA_DEBUG
+
+/* SAP Specific structures */
+
+/* 100ms */
+#define SAP_IDLE ((mtime_t)(0.100*CLOCK_FREQ))
+#define SAP_MAX_BUFFER 65534
+#define MIN_INTERVAL 2
+#define MAX_INTERVAL 300
+
+/* A SAP announce address. For each of these, we run the
+ * control flow algorithm */
+struct sap_address_t
+{
+    char *psz_address;
+    int i_port;
+    int i_rfd; /* Read socket */
+    int i_wfd; /* Write socket */
+
+    /* Used for flow control */
+    mtime_t t1;
+    vlc_bool_t b_enabled;
+    vlc_bool_t b_ready;
+    int i_interval;
+    int i_buff;
+    int i_limit;
+};
-
-/*****************************************************************************
@@ -228 +259 @@
-    int i_header_size;
-    char *psz_head;
-
+, b_ipv6
-    sap_session_t *p_sap_session;
-    mtime_t i_hash;
@@ -244 +275 @@
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-
+
+
+
+
+
-            }
-            else
-
-
-
-
-
-
+
+
-        }
-        else
-        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* XXX: Check for dupes */
@@ -297 +381 @@
-        }
-        p_address->psz_address = strdup( p_method->psz_address );
-        p_address->i_ip_version = p_method->i_ip_version;
-        p_address->i_port  =  9875;
-        p_address->i_wfd = net_OpenUDP( p_sap, "", 0,
@@ -337 +420 @@
-
-    /* Build the SAP Headers */
-p_method->i_ip_version == 
+b_ipv
-    psz_head = (char *) malloc( i_header_size * sizeof( char ) );
-    if( ! psz_head )
@@ -352 +435 @@
-    psz_head[3] = (i_hash & 0xFF);        /* Msg id hash 2 */
-
-p_method->i_ip_version == 
+b_ipv
-    {
-        /* in_addr_t ip_server = inet_addr( ip ); */
@@ -499 +582 @@
-    int     i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff);
-    char *psz_group, *psz_name;
+    char ipv;
-
-    psz_group = convert_to_utf8( p_sap, p_session->psz_group );
-    psz_name = convert_to_utf8( p_sap, p_session->psz_name );
+
+    ipv = ( strchr( p_session->psz_uri, ':' )  != NULL) ? '6' : '4';
-
-    /* see the lists in modules/stream_out/rtp.c for compliance stuff */
@@ -529 +615 @@
-                            "s=%s\r\n"
-                            "t=0 0\r\n"
-4
+%c
-                            "m=video %d udp %d\r\n"
-                            "a=tool:"PACKAGE_STRING"\r\n"
-                            "a=type:broadcast\r\n",
-                            i_sdp_id, i_sdp_version,
-
+ ipv,
-                            p_session->psz_uri, p_session->i_ttl,
-                            p_session->i_port, p_session->i_payload );