X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_network.h;h=5b5cec175d269563d646029a762f7691e821baee;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=9506ef5af46a519225a4f39e6d0bea8f2e112615;hpb=851b8a430e99148da397d24dd8ad75afbf05ea2d;p=vlc diff --git a/include/vlc_network.h b/include/vlc_network.h index 9506ef5af4..5b5cec175d 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -47,7 +47,7 @@ # define net_errno (WSAGetLastError()) extern const char *net_strerror( int val ); # ifndef IPV6_V6ONLY -# define IPV6_V6ONLY FIXME_FIXME_FIXME +# define IPV6_V6ONLY 27 # endif #else # if HAVE_SYS_SOCKET_H @@ -113,10 +113,11 @@ static inline int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port) VLC_EXPORT( void, net_ListenClose, ( int *fd ) ); -VLC_EXPORT( int, net_SetDSCP, ( int fd, uint8_t dscp ) ); int net_Subscribe (vlc_object_t *obj, int fd, const struct sockaddr *addr, socklen_t addrlen); +VLC_EXPORT( int, net_SetCSCov, ( int fd, int sendcov, int recvcov ) ); + /* Functions to read from or write to the networking layer */ struct virtual_socket_t { @@ -151,7 +152,7 @@ VLC_EXPORT (int, inet_pton, (int af, const char *src, void *dst) ); #ifndef HAVE_INET_NTOP #ifdef WIN32 /* only in core, so no need for C++ extern "C" */ -VLC_EXPORT (const char *, inet_ntop, (int af, const void *src, +VLC_EXPORT (const char *, inet_ntop, (int af, const void *src, char *dst, socklen_t cnt) ); #endif #endif @@ -276,7 +277,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) #ifdef IN_MULTICAST case AF_INET: { - struct sockaddr_in *v4 = (struct sockaddr_in *)addr; + const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr; if ((size_t)len < sizeof (*v4)) return VLC_FALSE; return IN_MULTICAST (ntohl (v4->sin_addr.s_addr)) != 0; @@ -286,7 +287,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) #ifdef IN6_IS_ADDR_MULTICAST case AF_INET6: { - struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr; + const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr; if ((size_t)len < sizeof (*v6)) return VLC_FALSE; return IN6_IS_ADDR_MULTICAST (&v6->sin6_addr) != 0; @@ -369,11 +370,11 @@ static inline void net_SetPort (struct sockaddr *addr, uint16_t port) #ifdef AF_INET6 case AF_INET6: ((struct sockaddr_in6 *)addr)->sin6_port = port; - break; + break; #endif case AF_INET: ((struct sockaddr_in *)addr)->sin_port = port; - break; + break; } } # ifdef __cplusplus