Changeset 2815e99445ba576d06e3688df81db6ae59732b13

Timestamp:

03/02/08 20:01:43 (6 months ago)

Author:

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

git-committer:

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

git-parent:

[f8c4e779ab99f83ab0494a2ce3a2a9960dafcbf4]

git-author:

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

Message:

Set the DCCP service code properly.

Assume RTP converys video (which is fine for MPEG-TS), as we cannot
know if it's only audio anyway.

Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

Files:

• modules/access/udp.c (modified) (1 diff)
• src/network/io.c (modified) (2 diffs)

modules/access/udp.c

@@ -233 +233 @@
-        case IPPROTO_DCCP:
-#ifdef SOCK_DCCP
+            var_Create( p_access, "dccp-service", VLC_VAR_STRING );
+            var_SetString( p_access, "dccp-service", "RTPV" );
-            p_sys->fd = net_Connect( p_access, psz_server_addr, i_server_port,
-                                     SOCK_DCCP, IPPROTO_DCCP );

src/network/io.c

@@ -69 +69 @@
-#endif
-
+#ifdef HAVE_LINUX_DCCP_H
+/* TODO: use glibc instead of linux-kernel headers */
+# include <linux/dccp.h>
+# define SOL_DCCP 269
+#endif
+
-extern int rootwrap_bind (int family, int socktype, int protocol,
-                          const struct sockaddr *addr, size_t alen);
@@ -117 +123 @@
-        setsockopt (fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
-                    &(int){ PROTECTION_LEVEL_UNRESTRICTED }, sizeof (int));
+#endif
+
+#ifdef DCCP_SOCKOPT_SERVICE
+    char *dccps = var_CreateGetNonEmptyString (p_this, "dccp-service");
+    if (dccps != NULL)
+    {
+        setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE, dccps,
+                    (strlen (dccps) + 3) & ~3);
+        free (dccps);
+    }
-#endif
-