/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <errno.h>
+#include <vlc_common.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <errno.h>
#include <vlc_network.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 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__)
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 family, int protocol)
{
memset (&hints, 0, sizeof( hints ));
hints.ai_family = family;
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 ?: "any", port);
+ 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,
- vlc_gai_strerror (val));
+ gai_strerror (val));
return -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);
+ ptr->ai_protocol);
if (fd == -1)
{
- msg_Dbg (obj, "socket error: %s", net_strerror (net_errno));
+ msg_Dbg (obj, "socket error: %m");
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))
+ /* If IPv6 was forced, set IPv6-only mode.
+ * If IPv4 was forced, do nothing extraordinary.
+ * If nothing was forced, try dual-mode IPv6. */
+ if (ptr->ai_family == AF_INET6)
{
- 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);
+ int on = (family == AF_INET6);
+ setsockopt (fd, SOL_IPV6, IPV6_V6ONLY, &on, sizeof (on));
}
- else
+ if (ptr->ai_family == AF_INET)
#endif
- if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
+ if (family == AF_UNSPEC && ptr->ai_next != NULL)
{
- msg_Err (obj, "socket bind error (%s)", net_strerror (net_errno));
- net_Close (fd);
- continue;
+ msg_Warn (obj, "ambiguous network protocol specification");
+ msg_Warn (obj, "please select IP version explicitly");
}
+ 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))
{
break;
}
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
return val;
}
#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;
+ }
}
return VLC_SUCCESS;
if (net_SetMcastOutIface (fd, family, scope) == 0)
return 0;
- msg_Err (p_this, "%s: %s", iface, net_strerror (net_errno));
+ msg_Err (p_this, "%s: %m", iface);
}
if (addr != NULL)
if (net_SetMcastOutIPv4 (fd, ipv4) == 0)
return 0;
- msg_Err (p_this, "%s: %s", addr, net_strerror (net_errno));
+ msg_Err (p_this, "%s: %m", addr);
}
}
socklen_t optlen;
/* Multicast interface IPv4 address */
- char *iface = var_CreateGetString (obj, "miface-addr");
- if (iface != NULL)
+ char *iface = var_CreateGetNonEmptyString (obj, "miface-addr");
+ if ((iface != NULL)
+ && (inet_pton (AF_INET, iface, &id) <= 0))
{
- if ((*iface)
- && (inet_pton (AF_INET, iface, &id) <= 0))
- {
- msg_Err (obj, "invalid multicast interface address %s", iface);
- free (iface);
- goto error;
- }
+ msg_Err (obj, "invalid multicast interface address %s", iface);
+ free (iface);
+ goto error;
}
+ free (iface);
memset (&opt, 0, sizeof (opt));
if (src != NULL)
error:
#endif
- msg_Err (obj, "cannot join IPv4 multicast group (%s)",
- net_strerror (net_errno));
+ msg_Err (obj, "cannot join IPv4 multicast group (%m)");
return -1;
}
msg_Dbg (obj, "IPV6_JOIN_GROUP multicast request");
- if (!setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &gr6, sizeof (gr6)))
+ if (!setsockopt (fd, SOL_IPV6, IPV6_JOIN_GROUP, &gr6, sizeof (gr6)))
return 0;
#else
errno = ENOSYS;
#endif
- msg_Err (obj, "cannot join IPv6 any-source multicast group (%s)",
- net_strerror (net_errno));
+ msg_Err (obj, "cannot join IPv6 any-source multicast group (%m)");
return -1;
}
{
int level, iid = 0;
- char *iface = var_CreateGetString (obj, "miface");
+ char *iface = var_CreateGetNonEmptyString (obj, "miface");
if (iface != NULL)
{
- if (*iface)
+ iid = if_nametoindex (iface);
+ if (iid == 0)
{
- iid = if_nametoindex (iface);
- if (iid == 0)
- {
- msg_Err (obj, "invalid multicast interface: %s", iface);
- free (iface);
- return -1;
- }
+ msg_Err (obj, "invalid multicast interface: %s", iface);
+ free (iface);
+ return -1;
}
free (iface);
}
#endif
}
- msg_Err (obj, "Multicast group join error (%s)",
- net_strerror (net_errno));
+ msg_Err (obj, "Multicast group join error (%m)");
if (src != NULL)
{
return setsockopt( fd, level, cmd, &(int){ dscp }, sizeof (int));
}
-
+#undef net_ConnectDgram
/*****************************************************************************
- * __net_ConnectDgram:
+ * net_ConnectDgram:
*****************************************************************************
* Open a datagram socket to send data to a defined destination, with an
* optional hop limit.
*****************************************************************************/
-int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
- int i_hlim, int proto )
+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;
+ bool b_unreach = false;
- if( i_port == 0 )
- i_port = 1234; /* historical VLC thing */
-
- if( i_hlim < 1 )
+ if( i_hlim < 0 )
i_hlim = var_CreateGetInteger( 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;
}
{
char *str;
int fd = net_Socket (p_this, ptr->ai_family, ptr->ai_socktype,
- proto ?: ptr->ai_protocol);
+ ptr->ai_protocol);
if (fd == -1)
continue;
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");
+ str = var_CreateGetNonEmptyString (p_this, "miface");
if (str != NULL)
{
- if (*str)
- net_SetMcastOut (p_this, fd, ptr->ai_family, str, NULL);
+ net_SetMcastOut (p_this, fd, ptr->ai_family, str, NULL);
free (str);
}
- str = var_CreateGetString (p_this, "miface-addr");
+ str = var_CreateGetNonEmptyString (p_this, "miface-addr");
if (str != NULL)
{
- if (*str)
- net_SetMcastOut (p_this, fd, ptr->ai_family, NULL, str);
+ net_SetMcastOut (p_this, fd, ptr->ai_family, NULL, str);
free (str);
}
#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_OpenDgram:
+ * net_OpenDgram:
*****************************************************************************
* OpenDgram a datagram socket and return a handle
*****************************************************************************/
-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 )
+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);
memset (&hints, 0, sizeof (hints));
hints.ai_family = family;
hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = protocol;
val = vlc_getaddrinfo (obj, psz_server, i_server, &hints, &rem);
if (val)
{
msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
- vlc_gai_strerror (val));
+ gai_strerror (val));
return -1;
}
if (val)
{
msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
- vlc_gai_strerror (val));
- vlc_freeaddrinfo (rem);
+ gai_strerror (val));
+ freeaddrinfo (rem);
return -1;
}
for (struct addrinfo *ptr = loc; ptr != NULL; ptr = ptr->ai_next)
{
int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
- protocol ?: ptr->ai_protocol);
+ ptr->ai_protocol);
if (fd == -1)
continue; // usually, address family not supported
-#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))
- {
- net_Close (fd);
+ fd = net_SetupDgramSocket( obj, fd, ptr );
+ if( fd == -1 )
continue;
- }
val = -1;
for (struct addrinfo *ptr2 = rem; ptr2 != NULL; ptr2 = ptr2->ai_next)
ptr->ai_addr, ptr->ai_addrlen)
: connect (fd, ptr2->ai_addr, ptr2->ai_addrlen))
{
- msg_Err (obj, "cannot connect to %s port %d: %s",
- psz_server, i_server, net_strerror (net_errno));
+ msg_Err (obj, "cannot connect to %s port %d: %m",
+ psz_server, i_server);
continue;
}
val = fd;
if (val != -1)
break;
- close (fd);
+ net_Close (fd);
}
- vlc_freeaddrinfo (rem);
- vlc_freeaddrinfo (loc);
+ freeaddrinfo (rem);
+ freeaddrinfo (loc);
return val;
}
return VLC_SUCCESS;
#endif
}
+#if !defined( UDPLITE_RECV_CSCOV ) && !defined( DCCP_SOCKOPT_SEND_CSCOV )
+ VLC_UNUSED(sendcov);
+ VLC_UNUSED(recvcov);
+#endif
return VLC_EGENERIC;
}
projects / vlc / blobdiff