That was meant for DCCP and UDP-Lite but it shouldn't be needed.
int i_port, int protocol)
{
struct addrinfo hints, *res;
- int socktype = SOCK_DGRAM;
-
- switch( protocol )
- {
- case IPPROTO_TCP:
- socktype = SOCK_STREAM;
- break;
- case 33: /* DCCP */
-#ifdef __linux__
-# ifndef SOCK_DCCP
-# define SOCK_DCCP 6
-# endif
- socktype = SOCK_DCCP;
-#endif
- break;
- }
memset (&hints, 0, sizeof( hints ));
- /* Since we use port numbers rather than service names, the socket type
- * does not really matter. */
- hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = protocol;
hints.ai_flags = AI_PASSIVE;
msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port);
for (struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next)
{
- int fd = net_Socket (p_this, ptr->ai_family, socktype, protocol);
+ int fd = net_Socket (p_this, ptr->ai_family, ptr->ai_socktype,
+ ptr->ai_protocol);
if (fd == -1)
{
msg_Dbg (p_this, "socket error: %m");
{
net_Close (fd);
#if !defined(WIN32) && !defined(UNDER_CE)
- fd = rootwrap_bind (ptr->ai_family, socktype,
- protocol ? protocol : ptr->ai_protocol,
+ fd = rootwrap_bind (ptr->ai_family, ptr->ai_socktype,
+ ptr->ai_protocol,
ptr->ai_addr, ptr->ai_addrlen);
if (fd != -1)
{
}
/* Listen */
- switch (socktype)
+ switch (ptr->ai_socktype)
{
case SOCK_STREAM:
case SOCK_RDM:
return -1;
memset( &hints, 0, sizeof( hints ) );
- hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = proto;
psz_socks = var_CreateGetNonEmptyString( p_this, "socks" );
if( psz_socks != NULL )
for( ptr = res; ptr != NULL; ptr = ptr->ai_next )
{
int fd = net_Socket( p_this, ptr->ai_family,
- type ? type : ptr->ai_socktype,
- proto ? proto : ptr->ai_protocol );
+ ptr->ai_socktype, ptr->ai_protocol );
if( fd == -1 )
{
msg_Dbg( p_this, "socket error: %m" );
/* v4 only support ipv4 */
memset (&hints, 0, sizeof (hints));
hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) )
return VLC_EGENERIC;
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)
for (const struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next)
{
int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
- protocol ? protocol : ptr->ai_protocol);
+ ptr->ai_protocol);
if (fd == -1)
{
msg_Dbg (obj, "socket error: %m");
memset( &hints, 0, sizeof( hints ) );
hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = proto;
msg_Dbg( p_this, "net: connecting to [%s]:%d", psz_host, i_port );
{
char *str;
int fd = net_Socket (p_this, ptr->ai_family, ptr->ai_socktype,
- proto ? proto : ptr->ai_protocol);
+ ptr->ai_protocol);
if (fd == -1)
continue;
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)
for (struct addrinfo *ptr = loc; ptr != NULL; ptr = ptr->ai_next)
{
int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
- protocol ? protocol : ptr->ai_protocol);
+ ptr->ai_protocol);
if (fd == -1)
continue; // usually, address family not supported