/*****************************************************************************
* udp.c:
*****************************************************************************
- * Copyright (C) 2004-2006 the VideoLAN team
- * Copyright © 2006 Rémi Denis-Courmont
+ * Copyright (C) 2004-2006 VLC authors and VideoLAN
+ * Copyright © 2006-2007 Rémi Denis-Courmont
*
* $Id$
*
* Authors: Laurent Aimar <fenrir@videolan.org>
* Rémi Denis-Courmont <rem # videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.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 IP_ADD_MEMBERSHIP 5
# endif
# define EAFNOSUPPORT WSAEAFNOSUPPORT
-# define if_nametoindex( str ) atoi( str )
#else
# include <unistd.h>
# ifdef HAVE_NET_IF_H
# endif
#endif
+#ifdef HAVE_LINUX_DCCP_H
+# include <linux/dccp.h>
+# ifndef SOCK_DCCP /* provisional API */
+# define SOCK_DCCP 6
+# endif
+#endif
+
#ifndef SOL_IP
# define SOL_IP IPPROTO_IP
#endif
# 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
+
+#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_SetupDgramSocket( vlc_object_t *p_obj, int fd, const struct addrinfo *ptr )
+{
+#ifdef SO_REUSEPORT
+ setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, &(int){ 1 }, sizeof (int));
+#endif
+
+#ifdef SO_RCVBUF
+ /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s)
+ * to avoid packet loss caused in case of scheduling hiccups */
+ setsockopt (fd, SOL_SOCKET, SO_RCVBUF,
+ (void *)&(int){ 0x80000 }, sizeof (int));
+ setsockopt (fd, SOL_SOCKET, SO_SNDBUF,
+ (void *)&(int){ 0x80000 }, sizeof (int));
+#endif
+
+#if defined (WIN32) || defined (UNDER_CE)
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
+ && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
+ {
+ // This works for IPv4 too - don't worry!
+ 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( p_obj, "socket bind error (%m)" );
+ net_Close (fd);
+ return -1;
+ }
+ return fd;
+}
+
+/* */
+static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
+ int protocol)
+{
+ struct addrinfo hints, *res;
+
+ memset (&hints, 0, sizeof( hints ));
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = protocol;
+ hints.ai_flags = AI_PASSIVE;
+
+ if (host && !*host)
+ host = NULL;
+
+ msg_Dbg (obj, "net: opening %s datagram port %d",
+ host ? 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,
+ 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,
+ ptr->ai_protocol);
+ if (fd == -1)
+ {
+ msg_Dbg (obj, "socket error: %m");
+ continue;
+ }
+
+#ifdef IPV6_V6ONLY
+ /* Try dual-mode IPv6 if available. */
+ if (ptr->ai_family == AF_INET6)
+ setsockopt (fd, SOL_IPV6, IPV6_V6ONLY, &(int){ 0 }, sizeof (int));
+#endif
+ fd = net_SetupDgramSocket( obj, fd, ptr );
+ if( fd == -1 )
+ 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;
+ }
+
+ freeaddrinfo (res);
+ return val;
+}
+
static int net_SetMcastHopLimit( vlc_object_t *p_this,
int fd, int family, int hlim )
{
-#ifndef SYS_BEOS
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 */
switch( family )
{
+#ifdef IP_MULTICAST_TTL
case AF_INET:
proto = SOL_IP;
cmd = IP_MULTICAST_TTL;
break;
+#endif
#ifdef IPV6_MULTICAST_HOPS
case AF_INET6:
#endif
default:
- msg_Warn( p_this, "%s", strerror( EAFNOSUPPORT ) );
+ errno = EAFNOSUPPORT;
+ msg_Warn( p_this, "%m" );
return VLC_EGENERIC;
}
/* BSD compatibility */
unsigned char buf;
+ msg_Dbg( p_this, "cannot set hop limit (%d): %m", hlim );
buf = (unsigned char)(( hlim > 255 ) ? 255 : hlim);
if( setsockopt( fd, proto, cmd, &buf, sizeof( buf ) ) )
+ {
+ msg_Err( p_this, "cannot set hop limit (%d): %m", hlim );
return VLC_EGENERIC;
+ }
}
-#endif
+
return VLC_SUCCESS;
}
-static int net_SetMcastOutIface (int fd, int family, int scope)
+static int net_SetMcastOut (vlc_object_t *p_this, int fd, int family,
+ const char *iface)
{
+ int scope = if_nametoindex (iface);
+ if (scope == 0)
+ {
+ msg_Err (p_this, "invalid multicast interface: %s", iface);
+ return -1;
+ }
+
switch (family)
{
#ifdef IPV6_MULTICAST_IF
case AF_INET6:
- return setsockopt (fd, SOL_IPV6, IPV6_MULTICAST_IF,
- &scope, sizeof (scope));
+ if (setsockopt (fd, SOL_IPV6, IPV6_MULTICAST_IF,
+ &scope, sizeof (scope) == 0))
+ return 0;
#endif
#ifdef __linux__
case AF_INET:
{
struct ip_mreqn req = { .imr_ifindex = scope };
-
- return setsockopt (fd, SOL_IP, IP_MULTICAST_IF, &req,
- sizeof (req));
+ if (setsockopt (fd, SOL_IP, IP_MULTICAST_IF,
+ &req, sizeof (req)) == 0)
+ return 0;
}
#endif
+ default:
+ errno = EAFNOSUPPORT;
}
-
- errno = EAFNOSUPPORT;
+ msg_Err (p_this, "cannot force multicast interface %s: %m", iface);
return -1;
}
-static inline int net_SetMcastOutIPv4 (int fd, struct in_addr ipv4)
+static unsigned var_GetIfIndex (vlc_object_t *obj)
{
-#ifdef IP_MULTICAST_IF
- return setsockopt( fd, SOL_IP, IP_MULTICAST_IF, &ipv4, sizeof (ipv4));
-#else
- errno = EAFNOSUPPORT;
- return -1;
-#endif
+ char *ifname = var_InheritString (obj, "miface");
+ if (ifname == NULL)
+ return 0;
+
+ unsigned ifindex = if_nametoindex (ifname);
+ if (ifindex == 0)
+ msg_Err (obj, "invalid multicast interface: %s", ifname);
+ free (ifname);
+ return ifindex;
}
-static int net_SetMcastOut (vlc_object_t *p_this, int fd, int family,
- const char *iface, const char *addr)
+/**
+ * IP-agnostic multicast join,
+ * with fallback to old APIs, and fallback from SSM to ASM.
+ */
+static int
+net_SourceSubscribe (vlc_object_t *obj, int fd,
+ const struct sockaddr *src, socklen_t srclen,
+ const struct sockaddr *grp, socklen_t grplen)
{
- if (iface != NULL)
+#ifdef MCAST_JOIN_SOURCE_GROUP
+ /* Agnostic SSM multicast join */
+ int level;
+ struct group_source_req gsr;
+
+ memset (&gsr, 0, sizeof (gsr));
+ gsr.gsr_interface = var_GetIfIndex (obj);
+
+ switch (grp->sa_family)
{
- int scope = if_nametoindex (iface);
- if (scope == 0)
+#ifdef AF_INET6
+ case AF_INET6:
{
- msg_Err (p_this, "%s: invalid interface for multicast", iface);
- return -1;
+ const struct sockaddr_in6 *g6 = (const struct sockaddr_in6 *)grp;
+
+ level = SOL_IPV6;
+ assert (grplen >= sizeof (struct sockaddr_in6));
+ if (g6->sin6_scope_id != 0)
+ gsr.gsr_interface = g6->sin6_scope_id;
+ break;
}
+#endif
+ case AF_INET:
+ level = SOL_IP;
+ break;
+ default:
+ errno = EAFNOSUPPORT;
+ return -1;
+ }
- if (net_SetMcastOutIface (fd, family, scope) == 0)
- return 0;
+ assert (grplen <= sizeof (gsr.gsr_group));
+ memcpy (&gsr.gsr_source, src, srclen);
+ assert (srclen <= sizeof (gsr.gsr_source));
+ memcpy (&gsr.gsr_group, grp, grplen);
+ if (setsockopt (fd, level, MCAST_JOIN_SOURCE_GROUP,
+ &gsr, sizeof (gsr)) == 0)
+ return 0;
- msg_Err (p_this, "%s: %s", iface, net_strerror (net_errno));
+#else
+ if (src->sa_family != grp->sa_family)
+ {
+ errno = EAFNOSUPPORT;
+ return -1;
}
- if (addr != NULL)
+ switch (grp->sa_family)
{
- if (family == AF_INET)
+# ifdef IP_ADD_SOURCE_MEMBERSHIP
+ /* IPv4-specific API */
+ case AF_INET:
{
- struct in_addr ipv4;
- if (inet_pton (AF_INET, addr, &ipv4) <= 0)
- {
- msg_Err (p_this, "%s: invalid IPv4 address for multicast",
- addr);
- return -1;
- }
+ struct ip_mreq_source imr;
- if (net_SetMcastOutIPv4 (fd, ipv4) == 0)
+ memset (&imr, 0, sizeof (imr));
+ assert (grplen >= sizeof (struct sockaddr_in));
+ imr.imr_multiaddr = ((const struct sockaddr_in *)grp)->sin_addr;
+ assert (srclen >= sizeof (struct sockaddr_in));
+ imr.imr_sourceaddr = ((const struct sockaddr_in *)src)->sin_addr;
+ if (setsockopt (fd, SOL_IP, IP_ADD_SOURCE_MEMBERSHIP,
+ &imr, sizeof (imr)) == 0)
return 0;
-
- msg_Err (p_this, "%s: %s", addr, net_strerror (net_errno));
+ break;
}
+# endif
+ default:
+ errno = EAFNOSUPPORT;
}
- return -1;
+#endif
+ msg_Err (obj, "cannot join source multicast group: %m");
+ msg_Warn (obj, "trying ASM instead of SSM...");
+ return net_Subscribe (obj, fd, grp, grplen);
}
-int net_Subscribe (vlc_object_t *obj, int fd, const struct sockaddr *addr,
- socklen_t addrlen)
+int net_Subscribe (vlc_object_t *obj, int fd,
+ const struct sockaddr *grp, socklen_t grplen)
{
- switch (addr->sa_family)
- {
-#ifdef IP_ADD_MEMBERSHIP
- case AF_INET:
- {
- const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
- if (addrlen < sizeof (*v4))
- return -1;
-
- struct ip_mreq imr;
- memset (&imr, 0, sizeof (imr));
- memcpy (&imr.imr_multiaddr, &v4->sin_addr, 4);
+#ifdef MCAST_JOIN_GROUP
+ /* Agnostic SSM multicast join */
+ int level;
+ struct group_req gr;
- /* FIXME: should use a different option for in and out */
- char *iif = var_CreateGetString (obj, "miface-addr");
- if (iif != NULL)
- {
- if ((iif[0] != '\0') &&
- (inet_pton (AF_INET, iif, &imr.imr_interface) <= 0))
- {
- msg_Err (obj, "invalid multicast interface address %s",
- iif);
- free (iif);
- return -1;
- }
- free (iif);
- }
+ memset (&gr, 0, sizeof (gr));
+ gr.gr_interface = var_GetIfIndex (obj);
- msg_Dbg (obj, "IP_ADD_MEMBERSHIP multicast request");
+ switch (grp->sa_family)
+ {
+#ifdef AF_INET6
+ case AF_INET6:
+ {
+ const struct sockaddr_in6 *g6 = (const struct sockaddr_in6 *)grp;
- if (setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr,
- sizeof (imr)))
- {
- msg_Err (obj, "cannot join IPv4 multicast group (%s)",
- net_strerror (net_errno));
- return -1;
- }
- return 0;
+ level = SOL_IPV6;
+ assert (grplen >= sizeof (struct sockaddr_in6));
+ if (g6->sin6_scope_id != 0)
+ gr.gr_interface = g6->sin6_scope_id;
+ break;
}
#endif
+ case AF_INET:
+ level = SOL_IP;
+ break;
+ default:
+ errno = EAFNOSUPPORT;
+ return -1;
+ }
+
+ assert (grplen <= sizeof (gr.gr_group));
+ memcpy (&gr.gr_group, grp, grplen);
+ if (setsockopt (fd, level, MCAST_JOIN_GROUP, &gr, sizeof (gr)) == 0)
+ return 0;
-#ifdef IPV6_JOIN_GROUP
+#else
+ switch (grp->sa_family)
+ {
+# ifdef IPV6_JOIN_GROUP
case AF_INET6:
{
- const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
- if (addrlen < sizeof (*v6))
- return -1;
+ struct ipv6_mreq ipv6mr;
+ const struct sockaddr_in6 *g6 = (const struct sockaddr_in6 *)grp;
+
+ memset (&ipv6mr, 0, sizeof (ipv6mr));
+ assert (grplen >= sizeof (struct sockaddr_in6));
+ ipv6mr.ipv6mr_multiaddr = g6->sin6_addr;
+ ipv6mr.ipv6mr_interface = g6->sin6_scope_id;
+ if (!setsockopt (fd, SOL_IPV6, IPV6_JOIN_GROUP,
+ &ipv6mr, sizeof (ipv6mr)))
+ return 0;
+ break;
+ }
+# endif
+# ifdef IP_ADD_MEMBERSHIP
+ case AF_INET:
+ {
+ struct ip_mreq imr;
- struct ipv6_mreq imr;
memset (&imr, 0, sizeof (imr));
- imr.ipv6mr_interface = v6->sin6_scope_id;
- memcpy (&imr.ipv6mr_multiaddr, &v6->sin6_addr, 16);
-
- msg_Dbg (obj, "IPV6_JOIN_GROUP multicast request");
-
- if (setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &imr,
- sizeof (imr)))
- {
- msg_Err (obj, "cannot join IPv6 multicast group (%s)",
- net_strerror (net_errno));
- return -1;
- }
-
- return 0;
+ assert (grplen >= sizeof (struct sockaddr_in));
+ imr.imr_multiaddr = ((const struct sockaddr_in *)grp)->sin_addr;
+ if (setsockopt (fd, SOL_IP, IP_ADD_MEMBERSHIP,
+ &imr, sizeof (imr)) == 0)
+ return 0;
+ break;
}
-#endif
+# endif
+ default:
+ errno = EAFNOSUPPORT;
}
- msg_Err (obj, "Multicast not supported");
+#endif
+ msg_Err (obj, "cannot join multicast group: %m");
return -1;
}
-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) }) )
return setsockopt( fd, level, cmd, &(int){ dscp }, sizeof (int));
}
-
+#undef net_ConnectDgram
/*****************************************************************************
- * __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;
- vlc_bool_t b_unreach = VLC_FALSE;
-
- if( i_port == 0 )
- i_port = 1234; /* historical VLC thing */
+ bool b_unreach = false;
- if( i_hlim < 1 )
- i_hlim = var_CreateGetInteger( p_this, "ttl" );
+ if( i_hlim < 0 )
+ i_hlim = var_InheritInteger( p_this, "ttl" );
memset( &hints, 0, sizeof( hints ) );
hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = proto;
- msg_Dbg( p_this, "net: connecting to %s port %d", psz_host, i_port );
+ msg_Dbg( p_this, "net: connecting to [%s]:%d", psz_host, i_port );
i_val = vlc_getaddrinfo( p_this, psz_host, i_port, &hints, &res );
if( i_val )
{
- msg_Err( p_this, "cannot resolve %s port %d : %s", psz_host, i_port,
- vlc_gai_strerror( i_val ) );
+ msg_Err( p_this, "cannot resolve [%s]:%d : %s", psz_host, i_port,
+ gai_strerror( i_val ) );
return -1;
}
if (fd == -1)
continue;
-#if !defined( SYS_BEOS )
/* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s)
* to avoid packet loss caused by scheduling problems */
setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0x80000 }, sizeof (int));
/* Allow broadcast sending */
setsockopt (fd, SOL_SOCKET, SO_BROADCAST, &(int){ 1 }, sizeof (int));
-#endif
- if( i_hlim > 0 )
+ if( i_hlim >= 0 )
net_SetMcastHopLimit( p_this, fd, ptr->ai_family, i_hlim );
- str = var_CreateGetString (p_this, "miface");
- if (str != NULL)
- {
- if (*str)
- net_SetMcastOut (p_this, fd, ptr->ai_family, str, NULL);
- free (str);
- }
-
- str = var_CreateGetString (p_this, "miface-addr");
+ str = var_InheritString (p_this, "miface");
if (str != NULL)
{
- if (*str)
- net_SetMcastOut (p_this, fd, ptr->ai_family, NULL, str);
+ net_SetMcastOut (p_this, fd, ptr->ai_family, str);
free (str);
}
- net_SetDSCP (fd, var_CreateGetInteger (p_this, "dscp"));
+ net_SetDSCP (fd, var_InheritInteger (p_this, "dscp"));
if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) == 0 )
{
#else
if( errno == ENETUNREACH )
#endif
- b_unreach = VLC_TRUE;
+ b_unreach = true;
else
{
- msg_Warn( p_this, "%s port %d : %s", psz_host, i_port,
- strerror( errno ) );
+ msg_Warn( p_this, "%s port %d : %m", psz_host, i_port);
net_Close( fd );
continue;
}
}
- vlc_freeaddrinfo( res );
+ freeaddrinfo( res );
if( i_handle == -1 )
{
return i_handle;
}
-
+#undef net_OpenDgram
/*****************************************************************************
- * __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 *p_this, 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 protocol )
{
- vlc_value_t v4, v6;
- void *private;
- network_socket_t sock;
- module_t *p_network = NULL;
+ if ((psz_server == NULL) || (psz_server[0] == '\0'))
+ return net_ListenSingle (obj, psz_bind, i_bind, 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;
- if (((psz_bind == NULL) || (psz_bind[0] == '\0')) && (i_bind == 0))
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = protocol;
+
+ val = vlc_getaddrinfo (obj, psz_server, i_server, &hints, &rem);
+ if (val)
{
- msg_Warn (p_this,
- "Obsolete net_OpenUDP with no local endpoint; "
- "Use net_ConnectUDP instead");
- return net_ConnectUDP (p_this, psz_server, i_server, -1);
+ msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
+ gai_strerror (val));
+ return -1;
}
- if (((psz_server == NULL) || (psz_server[0] == '\0')) && (i_server == 0))
+ hints.ai_flags = AI_PASSIVE;
+ val = vlc_getaddrinfo (obj, psz_bind, i_bind, &hints, &loc);
+ if (val)
{
- msg_Warn (p_this,
- "Obsolete net_OpenUDP with no remote endpoint; "
- "Use net_ListenUDP instead");
- return net_ListenUDP1 (p_this, psz_bind, i_bind);
+ msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
+ gai_strerror (val));
+ freeaddrinfo (rem);
+ return -1;
}
- if( psz_server == NULL ) psz_server = "";
- if( psz_bind == NULL ) psz_bind = "";
+ val = -1;
+ 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);
+ if (fd == -1)
+ continue; // usually, address family not supported
- /* Prepare the network_socket_t structure */
- sock.psz_bind_addr = psz_bind;
- sock.i_bind_port = i_bind;
- sock.psz_server_addr = psz_server;
- sock.i_server_port = i_server;
- sock.i_ttl = 0;
- sock.v6only = 0;
- sock.i_handle = -1;
+ fd = net_SetupDgramSocket( obj, fd, ptr );
+ if( fd == -1 )
+ continue;
- msg_Dbg( p_this, "net: connecting to '[%s]:%d@[%s]:%d'",
- psz_server, i_server, psz_bind, i_bind );
+ 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)
+ ? net_SourceSubscribe (obj, fd,
+ ptr2->ai_addr, ptr2->ai_addrlen,
+ ptr->ai_addr, ptr->ai_addrlen)
+ : connect (fd, ptr2->ai_addr, ptr2->ai_addrlen))
+ {
+ msg_Err (obj, "cannot connect to %s port %d: %m",
+ psz_server, i_server);
+ continue;
+ }
+ val = fd;
+ break;
+ }
- /* Check if we have force ipv4 or ipv6 */
- var_Create( p_this, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_this, "ipv4", &v4 );
- var_Create( p_this, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_this, "ipv6", &v6 );
+ if (val != -1)
+ break;
- if( !v4.b_bool )
- {
- if( v6.b_bool )
- sock.v6only = 1;
-
- /* try IPv6 first (unless IPv4 forced) */
- private = p_this->p_private;
- p_this->p_private = (void*)&sock;
- p_network = module_Need( p_this, "network", "ipv6", VLC_TRUE );
-
- if( p_network != NULL )
- module_Unneed( p_this, p_network );
-
- p_this->p_private = private;
-
- /*
- * Check if the IP stack can receive IPv4 packets on IPv6 sockets.
- * If yes, then it is better to use the IPv6 socket.
- * Otherwise, if we also get an IPv4, we have to choose, so we use
- * IPv4 only.
- */
- if( ( sock.i_handle != -1 ) && ( ( sock.v6only == 0 ) || v6.b_bool ) )
- return sock.i_handle;
+ net_Close (fd);
}
- if( !v6.b_bool )
- {
- int fd6 = sock.i_handle;
+ freeaddrinfo (rem);
+ freeaddrinfo (loc);
+ return val;
+}
- /* also try IPv4 (unless IPv6 forced) */
- private = p_this->p_private;
- p_this->p_private = (void*)&sock;
- p_network = module_Need( p_this, "network", "ipv4", VLC_TRUE );
- if( p_network != NULL )
- module_Unneed( p_this, p_network );
+/**
+ * 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;
- p_this->p_private = private;
+ if (getsockopt (fd, SOL_SOCKET, SO_TYPE,
+ &type, &(socklen_t){ sizeof (type) }))
+ return VLC_EGENERIC;
- if( fd6 != -1 )
- {
- if( sock.i_handle != -1 )
- {
- msg_Warn( p_this, "net: lame IPv6/IPv4 dual-stack present, "
- "using only IPv4." );
- net_Close( fd6 );
- }
+ switch (type)
+ {
+#ifdef UDPLITE_RECV_CSCOV
+ case SOCK_DGRAM: /* UDP-Lite */
+ if (sendcov == -1)
+ sendcov = 0;
else
- sock.i_handle = fd6;
- }
- }
+ 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( sock.i_handle == -1 )
- msg_Dbg( p_this, "net: connection to '[%s]:%d@[%s]:%d' failed",
- psz_server, i_server, psz_bind, i_bind );
+ 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
+ }
+#if !defined( UDPLITE_RECV_CSCOV ) && !defined( DCCP_SOCKOPT_SEND_CSCOV )
+ VLC_UNUSED(sendcov);
+ VLC_UNUSED(recvcov);
+#endif
- return sock.i_handle;
+ return VLC_EGENERIC;
}