Commit 4abef78f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Inline net_ListenTCP

parent 2a1f0c46
......@@ -74,12 +74,15 @@ int net_Socket (vlc_object_t *obj, int family, int socktype, int proto);
#define net_OpenTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __net_ConnectTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
int *net_Listen (vlc_object_t *p_this, const char *psz_host, int i_port,
int family, int socktype, int protocol);
VLC_EXPORT( int *, net_Listen, (vlc_object_t *p_this, const char *psz_host, int i_port,
int family, int socktype, int protocol) );
VLC_EXPORT( int, net_ListenSingle, (vlc_object_t *p_this, const char *psz_host, int i_port, int family, int socktype, int protocol) );
#define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
static inline int *__net_ListenTCP ( vlc_object_t *obj, const char *host, int port)
{
return net_Listen (obj, host, port, AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP);
}
#define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
......@@ -89,7 +92,7 @@ VLC_EXPORT( int, __net_ConnectDgram, ( vlc_object_t *p_this, const char *psz_hos
static inline int net_ConnectUDP (vlc_object_t *obj, const char *host, int port, int hlim)
{
return net_ConnectDgram (obj, host, port, hlim, 0);
return net_ConnectDgram (obj, host, port, hlim, IPPROTO_UDP);
}
static inline int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port)
......
......@@ -259,18 +259,6 @@ next_ai: /* failure */
}
/*****************************************************************************
* __net_ListenTCP:
*****************************************************************************
* Open TCP passive "listening" socket(s)
* This function returns NULL in case of error.
*****************************************************************************/
int *__net_ListenTCP (vlc_object_t *p_this, const char *psz_host, int i_port)
{
return net_Listen (p_this, psz_host, i_port, AF_UNSPEC, SOCK_STREAM,
IPPROTO_TCP);
}
/*****************************************************************************
* __net_Accept:
*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment