X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fudp.c;h=f063e2ffbbfd5a39b395117e87216ed9b0c24d15;hb=1a582db112f0d898f93bdcc618e06d75ff8f2410;hp=0bd13a7fac8b94e8b269239e847228658aea2486;hpb=851b8a430e99148da397d24dd8ad75afbf05ea2d;p=vlc diff --git a/src/network/udp.c b/src/network/udp.c index 0bd13a7fac..f063e2ffbb 100644 --- a/src/network/udp.c +++ b/src/network/udp.c @@ -27,8 +27,11 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include @@ -54,6 +57,13 @@ # endif #endif +#ifdef HAVE_LINUX_DCCP_H +# include +# ifndef SOCK_DCCP /* provisional API */ +# define SOCK_DCCP 6 +# endif +#endif + #ifndef SOL_IP # define SOL_IP IPPROTO_IP #endif @@ -61,12 +71,73 @@ # 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 +#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 family, int protocol) { @@ -98,7 +169,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port, protocol ?: ptr->ai_protocol); if (fd == -1) { - msg_Dbg (obj, "socket error: %s", net_strerror (net_errno)); + msg_Dbg (obj, "socket error: %m"); continue; } @@ -115,26 +186,9 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port, } } - /* 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); + 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)) @@ -157,7 +211,7 @@ static int net_SetMcastHopLimit( vlc_object_t *p_this, { 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 */ @@ -178,7 +232,8 @@ static int net_SetMcastHopLimit( vlc_object_t *p_this, #endif default: - msg_Warn( p_this, "%s", strerror( EAFNOSUPPORT ) ); + errno = EAFNOSUPPORT; + msg_Warn( p_this, "%m" ); return VLC_EGENERIC; } @@ -248,7 +303,7 @@ static int net_SetMcastOut (vlc_object_t *p_this, int fd, int family, 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) @@ -266,7 +321,7 @@ static int net_SetMcastOut (vlc_object_t *p_this, int fd, int family, 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); } } @@ -295,17 +350,15 @@ net_IPv4Join (vlc_object_t *obj, int fd, 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) @@ -338,8 +391,7 @@ net_IPv4Join (vlc_object_t *obj, int fd, 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; } @@ -355,14 +407,13 @@ net_IPv6Join (vlc_object_t *obj, int fd, const struct sockaddr_in6 *src) 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; } @@ -402,18 +453,15 @@ net_SourceSubscribe (vlc_object_t *obj, int fd, { 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); } @@ -490,7 +538,7 @@ net_SourceSubscribe (vlc_object_t *obj, int fd, 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; @@ -528,8 +576,7 @@ net_SourceSubscribe (vlc_object_t *obj, int fd, #endif } - msg_Err (obj, "Multicast group join error (%s)", - net_strerror (net_errno)); + msg_Err (obj, "Multicast group join error (%m)"); if (src != NULL) { @@ -549,7 +596,7 @@ int net_Subscribe (vlc_object_t *obj, int fd, } -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) }) ) @@ -593,23 +640,20 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port, { 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; - 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; } @@ -632,22 +676,20 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port, 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); } @@ -665,11 +707,10 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port, #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; } @@ -710,7 +751,6 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, memset (&hints, 0, sizeof (hints)); hints.ai_family = family; hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_PASSIVE; val = vlc_getaddrinfo (obj, psz_server, i_server, &hints, &rem); if (val) @@ -720,6 +760,7 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, return -1; } + hints.ai_flags = AI_PASSIVE; val = vlc_getaddrinfo (obj, psz_bind, i_bind, &hints, &loc); if (val) { @@ -736,39 +777,9 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, 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) @@ -784,8 +795,8 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, 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; @@ -795,7 +806,7 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, if (val != -1) break; - close (fd); + net_Close (fd); } vlc_freeaddrinfo (rem); @@ -803,3 +814,69 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, 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 + } +#if !defined( UDPLITE_RECV_CSCOV ) && !defined( DCCP_SOCKOPT_SEND_CSCOV ) + VLC_UNUSED(sendcov); + VLC_UNUSED(recvcov); +#endif + + return VLC_EGENERIC; +}