* udp.c:
*****************************************************************************
* Copyright (C) 2004-2006 the VideoLAN team
- * Copyright © 2006 Rémi Denis-Courmont
+ * Copyright © 2006-2007 Rémi Denis-Courmont
*
* $Id$
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
#include <errno.h>
-#include <assert.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
-#include "network.h"
+#include <vlc_network.h>
#ifdef WIN32
# if defined(UNDER_CE)
# 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,
int i_protocol );
+static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
+ int family, int protocol)
+{
+ struct addrinfo hints, *res;
+
+ memset (&hints, 0, sizeof( hints ));
+ hints.ai_family = family;
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_flags = AI_PASSIVE;
+
+ if (host && !*host)
+ host = NULL;
+
+ msg_Dbg (obj, "net: opening %s datagram port %d", host ?: "any", port);
+
+ int val = vlc_getaddrinfo (obj, host, port, &hints, &res);
+ if (val)
+ {
+ msg_Err (obj, "Cannot resolve %s port %d : %s", host, port,
+ vlc_gai_strerror (val));
+ return -1;
+ }
+
+ val = -1;
+
+ for (const struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next)
+ {
+ int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
+ protocol ?: ptr->ai_protocol);
+ if (fd == -1)
+ {
+ msg_Dbg (obj, "socket error: %s", net_strerror (net_errno));
+ continue;
+ }
+
+ if (ptr->ai_next != NULL)
+ {
+#ifdef IPV6_V6ONLY
+ if ((ptr->ai_family != AF_INET6)
+ || setsockopt (fd, SOL_IPV6, IPV6_V6ONLY, &(int){ 0 },
+ sizeof (int)))
+#endif
+ {
+ msg_Err (obj, "Multiple network protocols present");
+ msg_Err (obj, "Please select network protocol manually");
+ }
+ }
+
+ /* Bind the socket */
+#if defined (WIN32) || defined (UNDER_CE)
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
+ && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
+ {
+ struct sockaddr_in6 dumb =
+ {
+ .sin6_family = ptr->ai_addr->sa_family,
+ .sin6_port = ((struct sockaddr_in *)(ptr->ai_addr))->sin_port
+ };
+ bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen);
+ }
+ else
+#endif
+ if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
+ {
+ msg_Err (obj, "socket bind error (%s)", net_strerror (net_errno));
+ net_Close (fd);
+ continue;
+ }
+
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
+ && net_Subscribe (obj, fd, ptr->ai_addr, ptr->ai_addrlen))
+ {
+ net_Close (fd);
+ continue;
+ }
+
+ val = fd;
+ break;
+ }
+
+ vlc_freeaddrinfo (res);
+ return val;
+}
-/*
- * XXX: I am too lazy to put all these dual functions in “next generation”
- * network plugins.
- */
static int net_SetMcastHopLimit( vlc_object_t *p_this,
int fd, int family, int hlim )
{
int proto, cmd;
- /* There is some confusion in the world whether IP_MULTICAST_TTL
+ /* There is some confusion in the world whether IP_MULTICAST_TTL
* takes a byte or an int as an argument.
* BSD seems to indicate byte so we are going with that and use
* int as a fallback to be safe */
# endif
} opt;
int cmd;
- struct in_addr id;
+ struct in_addr id = { .s_addr = INADDR_ANY };
socklen_t optlen;
/* Multicast interface IPv4 address */
*/
# warning Your C headers are out-of-date. Please update.
-/* Most (all?) Mingw32 versions in use are yet to pick up Vista stuff */
+# define MCAST_JOIN_GROUP 41
+struct group_req
+{
+ ULONG gr_interface;
+ struct sockaddr_storage gr_group;
+};
+
# define MCAST_JOIN_SOURCE_GROUP 45 /* from <ws2ipdef.h> */
struct group_source_req
{
struct sockaddr_storage gsr_group;
struct sockaddr_storage gsr_source;
};
-# endif
+#endif
/**
* IP-agnostic multicast join,
#ifdef AF_INET6
case AF_INET6:
level = SOL_IPV6;
- if ((src != NULL)
- && memcmp (&((const struct sockaddr_in6 *)src)->sin6_addr,
- &in6addr_any, sizeof (in6addr_any)) == 0)
- src = NULL;
-
- if (((const struct sockaddr_in6 *)src)->sin6_scope_id)
- iid = ((const struct sockaddr_in6 *)src)->sin6_scope_id;
+ if (((const struct sockaddr_in6 *)grp)->sin6_scope_id)
+ iid = ((const struct sockaddr_in6 *)grp)->sin6_scope_id;
break;
#endif
case AF_INET:
level = SOL_IP;
- if ((src != NULL)
- && ((const struct sockaddr_in *)src)->sin_addr.s_addr
- == INADDR_ANY)
- src = NULL;
break;
default:
return -1;
}
+ if (src != NULL)
+ switch (src->sa_family)
+ {
+#ifdef AF_INET6
+ case AF_INET6:
+ if (memcmp (&((const struct sockaddr_in6 *)src)->sin6_addr,
+ &in6addr_any, sizeof (in6addr_any)) == 0)
+ src = NULL;
+ break;
+#endif
+
+ case AF_INET:
+ if (((const struct sockaddr_in *)src)->sin_addr.s_addr
+ == INADDR_ANY)
+ src = NULL;
+ break;
+ }
+
+
/* Agnostic ASM/SSM multicast join */
#ifdef MCAST_JOIN_SOURCE_GROUP
union
msg_Dbg (obj, "Multicast %sgroup join request", src ? "source " : "");
- if (setsockopt (fd, level,
+ if (setsockopt (fd, level,
src ? MCAST_JOIN_SOURCE_GROUP : MCAST_JOIN_GROUP,
(void *)&opt, optlen) == 0)
return 0;
|| ((src != NULL) && (srclen < sizeof (struct sockaddr_in6))))
return -1;
- /* We don't provide IPv6-specific SSM at the moment.
- * It seems all the OSes with IPv6 SSM have the new API anyway. */
+ /* IPv6-specific SSM API does not exist. So if we're here
+ * it means IPv6 SSM is not supported on this OS and we
+ * directly fallback to ASM */
if (net_IPv6Join (obj, fd, (const struct sockaddr_in6 *)grp) == 0)
return 0;
}
-int net_SetDSCP( int fd, uint8_t dscp )
+static int net_SetDSCP( int fd, uint8_t dscp )
{
struct sockaddr_storage addr;
if( getsockname( fd, (struct sockaddr *)&addr, &(socklen_t){ sizeof (addr) }) )
/*****************************************************************************
- * __net_ConnectUDP:
+ * __net_ConnectDgram:
*****************************************************************************
- * Open a UDP socket to send data to a defined destination, with an optional
- * hop limit.
+ * Open a datagram socket to send data to a defined destination, with an
+ * optional hop limit.
*****************************************************************************/
-int __net_ConnectUDP( vlc_object_t *p_this, const char *psz_host, int i_port,
- int i_hlim )
+int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
+ int i_hlim, int proto )
{
struct addrinfo hints, *res, *ptr;
int i_val, i_handle = -1;
{
char *str;
int fd = net_Socket (p_this, ptr->ai_family, ptr->ai_socktype,
- ptr->ai_protocol);
+ proto ?: ptr->ai_protocol);
if (fd == -1)
continue;
/*****************************************************************************
- * __net_OpenUDP:
+ * __net_OpenDgram:
*****************************************************************************
- * Open a UDP connection and return a handle
+ * OpenDgram a datagram socket and return a handle
*****************************************************************************/
-int __net_OpenUDP( vlc_object_t *obj, const char *psz_bind, int i_bind,
- const char *psz_server, int i_server )
+int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
+ const char *psz_server, int i_server,
+ int family, int protocol )
{
+ if ((psz_server == NULL) || (psz_server[0] == '\0'))
+ return net_ListenSingle (obj, psz_bind, i_bind, family, protocol);
+
+ msg_Dbg (obj, "net: connecting to [%s]:%d from [%s]:%d",
+ psz_server, i_server, psz_bind, i_bind);
+
struct addrinfo hints, *loc, *rem;
int val;
- msg_Dbg( obj, "net: connecting to '[%s]:%d@[%s]:%d'",
- psz_server, i_server, psz_bind, i_bind );
-
memset (&hints, 0, sizeof (hints));
+ hints.ai_family = family;
hints.ai_socktype = SOCK_DGRAM;
- hints.ai_protocol = IPPROTO_UDP;
- hints.ai_flags = AI_PASSIVE;
val = vlc_getaddrinfo (obj, psz_server, i_server, &hints, &rem);
if (val)
return -1;
}
+ hints.ai_flags = AI_PASSIVE;
val = vlc_getaddrinfo (obj, psz_bind, i_bind, &hints, &loc);
if (val)
{
for (struct addrinfo *ptr = loc; ptr != NULL; ptr = ptr->ai_next)
{
int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
- ptr->ai_protocol);
+ protocol ?: ptr->ai_protocol);
if (fd == -1)
continue; // usually, address family not supported
continue;
}
- struct addrinfo *ptr2;
- for (ptr2 = rem; ptr2 != NULL; ptr2 = ptr2->ai_next)
+ val = -1;
+ for (struct addrinfo *ptr2 = rem; ptr2 != NULL; ptr2 = ptr2->ai_next)
{
if ((ptr2->ai_family != ptr->ai_family)
|| (ptr2->ai_socktype != ptr->ai_socktype)
|| (ptr2->ai_protocol != ptr->ai_protocol))
continue;
- if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen))
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
+ ? net_SourceSubscribe (obj, fd,
+ ptr2->ai_addr, ptr2->ai_addrlen,
+ ptr->ai_addr, ptr->ai_addrlen)
+ : connect (fd, ptr2->ai_addr, ptr2->ai_addrlen))
{
- if (net_SourceSubscribe (obj, fd,
- ptr2->ai_addr, ptr2->ai_addrlen,
- ptr->ai_addr, ptr->ai_addrlen) == 0)
- break;
- }
- else
- {
- if (connect (fd, ptr2->ai_addr, ptr2->ai_addrlen) == 0)
- break;
+ msg_Err (obj, "cannot connect to %s port %d: %s",
+ psz_server, i_server, net_strerror (net_errno));
+ continue;
}
+ val = fd;
+ break;
}
- if (ptr2 == NULL)
- {
- msg_Err (obj, "cannot connect to %s port %d: %s",
- psz_server, i_server, net_strerror (net_errno));
- close (fd);
- continue;
- }
+ if (val != -1)
+ break;
- return fd;
+ close (fd);
}
- return -1;
+ vlc_freeaddrinfo (rem);
+ vlc_freeaddrinfo (loc);
+ 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 ((recvcov == -1) || (recvcov > 56))
+ recvcov = 0;
+ else
+ recvcov = (recvcov + 3) / 4;
+ if (setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_RECV_CSCOV,
+ &recvcov, sizeof (recvcov)))
+ return VLC_EGENERIC;
+
+ return VLC_SUCCESS;
+#endif
+ }
+
+ return VLC_EGENERIC;
}
projects / vlc / blobdiff