extern int rootwrap_bind (int family, int socktype, int protocol,
const struct sockaddr *addr, size_t alen);
-int net_SetupSocket (int fd)
-{
-#if defined (WIN32) || defined (UNDER_CE)
- ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
-#else
- fcntl (fd, F_SETFD, FD_CLOEXEC);
- fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
-#endif
-
- setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int));
- return 0;
-}
-
-
int net_Socket (vlc_object_t *p_this, int family, int socktype,
int protocol)
{
- int fd;
-
-#ifdef SOCK_CLOEXEC
- fd = socket (family, socktype | SOCK_NONBLOCK | SOCK_CLOEXEC, protocol);
- if (fd == -1 && errno == EINVAL)
-#endif
+ int fd = vlc_socket (family, socktype, protocol, true);
+ if (fd == -1)
{
- fd = socket (family, socktype, protocol);
- if (fd == -1)
- {
- if (net_errno != EAFNOSUPPORT)
- msg_Err (p_this, "cannot create socket: %m");
- return -1;
- }
-#ifndef WIN32
- fcntl (fd, F_SETFD, FD_CLOEXEC);
- fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
-#else
- ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
-#endif
+ if (net_errno != EAFNOSUPPORT)
+ msg_Err (p_this, "cannot create socket: %m");
+ return -1;
}
setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int));
#ifdef DCCP_SOCKOPT_SERVICE
if (socktype == SOL_DCCP)
{
- char *dccps = var_CreateGetNonEmptyString (p_this, "dccp-service");
+ char *dccps = var_InheritString (p_this, "dccp-service");
if (dccps != NULL)
{
setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE, dccps,
int *net_Listen (vlc_object_t *p_this, const char *psz_host,
- int i_port, int protocol)
+ int i_port, int type, 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_socktype = type;
+ hints.ai_protocol = protocol;
hints.ai_flags = AI_PASSIVE;
- msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port);
+ msg_Dbg (p_this, "net: listening to %s port %d",
+ (psz_host != NULL) ? psz_host : "*", i_port);
int 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,
- vlc_gai_strerror (i_val));
+ msg_Err (p_this, "Cannot resolve %s port %d : %s",
+ (psz_host != NULL) ? psz_host : "", i_port,
+ gai_strerror (i_val));
return NULL;
}
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:
net_Close (fd);
}
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
if (sockv != NULL)
sockv[sockc] = -1;
return sockv;
}
-
+#undef net_Read
/*****************************************************************************
- * __net_Read:
+ * net_Read:
*****************************************************************************
* Reads from a network socket. Cancellation point.
* If waitall is true, then we repeat until we have read the right amount of
* object has been signaled.
*****************************************************************************/
ssize_t
-__net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
- void *restrict p_buf, size_t i_buflen, bool waitall)
+net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
+ void *restrict p_buf, size_t i_buflen, bool waitall)
{
size_t i_total = 0;
struct pollfd ufd[2] = {
assert (ufd[0].revents);
ssize_t n;
+#if defined(WIN32) || defined(UNDER_CE)
+ int error;
+#endif
if (vs != NULL)
{
int canc = vlc_savecancel ();
n = vs->pf_recv (vs->p_sys, p_buf, i_buflen);
+#if defined(WIN32) || defined(UNDER_CE)
+ /* We must read last error immediately, because vlc_restorecancel()
+ * access thread local storage, and TlsGetValue() will call
+ * SetLastError() to indicate that the function succeeded, thus
+ * overwriting the error code coming from pf_recv().
+ * WSAGetLastError is just an alias for GetLastError these days.
+ */
+ error = WSAGetLastError();
+#endif
vlc_restorecancel (canc);
}
else
{
#ifdef WIN32
n = recv (fd, p_buf, i_buflen, 0);
+ error = WSAGetLastError();
#else
n = read (fd, p_buf, i_buflen);
#endif
if (n == -1)
{
#if defined(WIN32) || defined(UNDER_CE)
- switch (WSAGetLastError ())
+ switch (error)
{
case WSAEWOULDBLOCK:
+ case WSAEINTR:
/* only happens with vs != NULL (TLS) - not really an error */
continue;
return -1;
}
-
-/* Write exact amount requested */
-ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
- const void *restrict p_data, size_t i_data )
+#undef net_Write
+/**
+ * Writes data to a file descriptor.
+ * This blocks until all data is written or an error occurs.
+ *
+ * This function is a cancellation point if p_vs is NULL.
+ * This function is not cancellation-safe if p_vs is not NULL.
+ *
+ * @return the total number of bytes written, or -1 if an error occurs
+ * before any data is written.
+ */
+ssize_t net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
+ const void *restrict p_data, size_t i_data )
{
size_t i_total = 0;
struct pollfd ufd[2] = {
{ .fd = vlc_object_waitpipe (p_this), .events = POLLIN },
};
- if (ufd[1].fd == -1)
+ if (unlikely(ufd[1].fd == -1))
+ {
+ vlc_testcancel ();
return -1;
+ }
while( i_data > 0 )
{
i_total += val;
}
+ if (unlikely(i_data == 0))
+ vlc_testcancel (); /* corner case */
+
if ((i_total > 0) || (i_data == 0))
return i_total;
return -1;
}
+#undef net_Gets
/**
* Reads a line from a file descriptor.
- * This function is not thread-safe; the same file descriptor cI/O annot be read
- * by another thread at the same time (although it can be written to).
+ * This function is not thread-safe; the same file descriptor I/O cannot be
+ * read by another thread at the same time (although it can be written to).
*
* @return nul-terminated heap-allocated string, or NULL on I/O error.
*/
-char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs )
+char *net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs )
{
char *psz_line = NULL, *ptr = NULL;
size_t i_line = 0, i_max = 0;
return psz_line;
}
+#undef net_Printf
ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
const char *psz_fmt, ... )
{
return i_ret;
}
-ssize_t __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
- const char *psz_fmt, va_list args )
+#undef net_vaPrintf
+ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
+ const char *psz_fmt, va_list args )
{
char *psz;
int i_ret;
int i_size = vasprintf( &psz, psz_fmt, args );
if( i_size == -1 )
return -1;
- i_ret = __net_Write( p_this, fd, p_vs, psz, i_size ) < i_size
+ i_ret = net_Write( p_this, fd, p_vs, psz, i_size ) < i_size
? -1 : i_size;
free( psz );
projects / vlc / blobdiff