Changeset e943c0003a271fce0c342fea521cdd7e2e5e3b27

Timestamp:

09/09/07 22:13:17 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[bd598bbab08a0c207c931f3deac82b649fd8f6ca]

git-author:

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

Message:

Remove UDP-Lite support from access_output_udp.
If someone wants to have it in there, it should probably rather be done
using a dedicated shortcut rather than a boolean configuration.

Files:

• modules/access_output/udp.c (modified) (8 diffs)

modules/access_output/udp.c

@@ -50 +50 @@
-#include <vlc_network.h>
-
-#if defined (HAVE_NETINET_UDPLITE_H)
-# include <netinet/udplite.h>
-#elif defined (__linux__)
-# define UDPLITE_SEND_CSCOV     10
-# define UDPLITE_RECV_CSCOV     11
-#endif
-
-#ifndef IPPROTO_UDPLITE
-# define IPPROTO_UDPLITE 136 /* from IANA */
-#endif
-#ifndef SOL_UDPLITE
-# define SOL_UDPLITE IPPROTO_UDPLITE
-#endif
-
-#define MAX_EMPTY_BLOCKS 200
-
@@ -99 +85 @@
-#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
-                               "automatically.")
-#define UDPLITE_TEXT N_("UDP-Lite")
-#define UDPLITE_LONGTEXT N_("Use UDP-Lite/IP instead of normal UDP/IP")
-#define CSCOV_TEXT N_("Checksum coverage")
-#define CSCOV_LONGTEXT N_("Payload bytes covered by layer-4 checksum")
-
-vlc_module_begin();
@@ -116 +98 @@
-    add_bool( SOUT_CFG_PREFIX "auto-mcast", VLC_FALSE, NULL, AUTO_MCAST_TEXT,
-              AUTO_MCAST_LONGTEXT, VLC_TRUE );
-    add_bool( SOUT_CFG_PREFIX "udplite", VLC_FALSE, NULL, UDPLITE_TEXT, UDPLITE_LONGTEXT, VLC_TRUE );
-    add_integer( SOUT_CFG_PREFIX "cscov", 12, NULL, CSCOV_TEXT, CSCOV_LONGTEXT, VLC_TRUE );
-
-    set_capability( "sout access", 100 );
@@ -132 +112 @@
-    "caching",
-    "group",
-    "lite",
-    "cscov",
-    NULL
-};
@@ -192 +170 @@
-
-    char                *psz_dst_addr = NULL;
-
-
+
-
-    int                 i_handle;
@@ -216 +193 @@
-    }
-    p_access->p_sys = p_sys;
-
-    if (var_GetBool (p_access, SOUT_CFG_PREFIX"lite"))
-    {
-        protoname = "UDP-Lite";
-        proto = IPPROTO_UDPLITE;
-    }
-
-    i_dst_port = DEFAULT_PORT;
@@ -262 +233 @@
-    p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
-
-
+
+
-    free (psz_dst_addr);
-
-    if( i_handle == -1 )
-    {
-%s socket", protoname
+raw UDP socket"
-         vlc_object_destroy (p_sys->p_thread);
-         free (p_sys);
@@ -293 +265 @@
-    p_sys->p_thread->i_handle = i_handle;
-    shutdown( i_handle, SHUT_RD );
-
-    int cscov = var_GetInteger (p_access, SOUT_CFG_PREFIX"cscov");
-    if (cscov)
-    {
-        switch (proto)
-        {
-#ifdef UDPLITE_SEND_CSCOV
-            case IPPROTO_UDPLITE:
-                cscov += 8;
-                setsockopt (i_handle, SOL_UDPLITE, UDPLITE_SEND_CSCOV,
-                            &(int){ cscov }, sizeof (cscov));
-                break;
-#endif
-#ifdef DCCP_SOCKOPT_RECV_CSCOV
-            /* FIXME: ^^is this the right name ? */
-            /* FIXME: is this inherited by accept() ? */
-            case IPPROTO_DCCP:
-                cscov = ((cscov + 3) >> 2) + 1;
-                if (cscov > 15)
-                    break; /* out of DCCP cscov range */
-                setsockopt (i_handle, SOL_DCCP, DCCP_SOCKOPT_RECV_CSCOV,
-                            &(int){ cscov }, sizeof (cscov));
-                break;
-#endif
-        }
-    }
-
-    p_sys->p_thread->i_caching =