/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <errno.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 HAVE_LINUX_DCCP_H
-# 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__)
protocol ?: ptr->ai_protocol);
if (fd == -1)
{
- msg_Dbg (obj, "socket error: %s", net_strerror (net_errno));
+ msg_Dbg (obj, "socket error: %m");
continue;
}
#endif
if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
{
- msg_Err (obj, "socket bind error (%s)", net_strerror (net_errno));
+ msg_Err (obj, "socket bind error (%m)");
net_Close (fd);
continue;
}
#endif
default:
- msg_Warn( p_this, "%s", strerror( EAFNOSUPPORT ) );
+ errno = EAFNOSUPPORT;
+ msg_Warn( p_this, "%m" );
return VLC_EGENERIC;
}
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)
{
{
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" );
memset( &hints, 0, sizeof( hints ) );
hints.ai_socktype = SOCK_DGRAM;
- 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,
+ msg_Err( p_this, "cannot resolve [%s]:%d : %s", psz_host, i_port,
vlc_gai_strerror( i_val ) );
return -1;
}
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;
}
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;
return VLC_SUCCESS;
#endif
}
+#if !defined( UDPLITE_RECV_CSCOV ) && !defined( DCCP_SOCKOPT_SEND_CSCOV )
+ VLC_UNUSED(sendcov);
+ VLC_UNUSED(recvcov);
+#endif
return VLC_EGENERIC;
}