net_SetCSCov: sets checksum coverages of a socket

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 020af68075a38b0b8449a6d06d75d33f011ed1e0..96bbe3c85c9de226faa8c4599f45701086663bf5 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -116,6 +116,8 @@ VLC_EXPORT( void, net_ListenClose, ( int *fd ) );
 int net_Subscribe (vlc_object_t *obj, int fd, const struct sockaddr *addr,
                    socklen_t addrlen);
 
+VLC_EXPORT( int, net_SetCSCov, ( int fd, int sendcov, int recvcov ) );
+
 /* Functions to read from or write to the networking layer */
 struct virtual_socket_t
 {

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 8586d75dbc34ac1c5510fba646046907b8558345..2a3959a0fa817e34e439013c8b719148fd24bf7e 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -22,6 +22,7 @@ vlc_b64_encode
 __net_Connect
 __net_ConnectDgram
 __net_OpenDgram
+net_SetCSCov
 vlc_module_set
 vlc_submodule_create
 libvlc_InternalCleanup

diff --git a/src/network/udp.c b/src/network/udp.c
index 6874ee21d3b04ac6ae148e427d9338efff4eb961..a7aa0b3e396fc70ab601c2a0293cf4a6865ea369 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -60,7 +60,34 @@
 # define SOL_IPV6 IPPROTO_IPV6
 #endif
 #ifndef IPPROTO_IPV6
-# define IPPROTO_IPV6 41
+# define IPPROTO_IPV6 41 /* IANA */
+#endif
+#ifndef SOL_DCCP
+# define SOL_DCCP IPPROTO_DCCP
+#endif
+#ifndef IPPROTO_DCCP
+# define IPPROTO_DCCP 33 /* IANA */
+#endif
+#ifndef SOL_UDPLITE
+# define SOL_UDPLITE IPPROTO_UDPLITE
+#endif
+#ifndef IPPROTO_UDPLITE
+# define IPPROTO_UDPLITE 136 /* IANA */
+#endif
+
+#ifdef __linux__
+# include <linux/dccp.h>
+# ifndef SOCK_DCCP /* provisional API */
+#  define SOCK_DCCP 6
+# endif
+#endif
+
+#if defined (HAVE_NETINET_UDPLITE_H)
+# include <netinet/udplite.h>
+#elif defined (__linux__)
+/* still missing from glibc 2.6 */
+# define UDPLITE_SEND_CSCOV     10
+# define UDPLITE_RECV_CSCOV     11
 #endif
 
 extern int net_Socket( vlc_object_t *p_this, int i_family, int i_socktype,
@@ -802,3 +829,65 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
     return val;
 }
 
+
+/**
+ * net_SetCSCov:
+ * Sets the send and receive checksum coverage of a socket:
+ * @param fd socket
+ * @param sendcov payload coverage of sent packets (bytes), -1 for full
+ * @param recvcov minimum payload coverage of received packets, -1 for full
+ */
+int net_SetCSCov (int fd, int sendcov, int recvcov)
+{
+    int type;
+
+    if (getsockopt (fd, SOL_SOCKET, SO_TYPE,
+                    &type, &(socklen_t){ sizeof (type) }))
+        return VLC_EGENERIC;
+
+    switch (type)
+    {
+#ifdef UDPLITE_RECV_CSCOV
+        case SOCK_DGRAM: /* UDP-Lite */
+            if (sendcov == -1)
+                sendcov = 0;
+            else
+                sendcov += 8; /* partial */
+            if (setsockopt (fd, SOL_UDPLITE, UDPLITE_SEND_CSCOV, &sendcov,
+                            sizeof (sendcov)))
+                return VLC_EGENERIC;
+
+            if (recvcov == -1)
+                recvcov = 0;
+            else
+                recvcov += 8;
+            if (setsockopt (fd, SOL_UDPLITE, UDPLITE_RECV_CSCOV,
+                            &recvcov, sizeof (recvcov)))
+                return VLC_EGENERIC;
+
+            return VLC_SUCCESS;
+#endif
+#ifdef DCCP_SOCKOPT_SEND_CSCOV
+        case SOCK_DCCP: /* DCCP and its ill-named socket type */
+            if ((sendcov == -1) || (sendcov > 56))
+                sendcov = 0;
+            else
+                sendcov = (sendcov + 3) / 4;
+            if (setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_SEND_CSCOV,
+                            &sendcov, sizeof (sendcov)))
+                return VLC_EGENERIC;
+
+            if ((sendcov == -1) || (sendcov > 56))
+                sendcov = 0;
+            else
+                sendcov = (sendcov + 3) / 4;
+            if (setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_RECV_CSCOV,
+                            &recvcov, sizeof (recvcov)))
+                return VLC_EGENERIC;
+
+            return VLC_SUCCESS;
+#endif
+    }
+
+    return VLC_EGENERIC;
+}