/*****************************************************************************
* io.c: network I/O functions
*****************************************************************************
- * Copyright (C) 2004-2005, 2007 the VideoLAN team
+ * Copyright (C) 2004-2005, 2007 VLC authors and VideoLAN
* Copyright © 2005-2006 Rémi Denis-Courmont
* $Id$
*
* Rémi Denis-Courmont <rem # videolan.org>
* Christophe Mutricy <xtophe at videolan dot org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <errno.h>
#include <assert.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
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;
memset (&hints, 0, sizeof( hints ));
+ 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;
}
net_Close (fd);
}
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
if (sockv != NULL)
sockv[sockc] = -1;
while (i_buflen > 0)
{
- ufd[0].revents = ufd[1].revents = 0;
-
if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0)
{
if (errno != EINTR)
continue;
}
-#ifndef POLLRDHUP /* This is nice but non-portable */
-# define POLLRDHUP 0
-#endif
if (i_total > 0)
{
/* Errors (-1) and EOF (0) will be returned on next call,
* otherwise we'd "hide" the error from the caller, which is a
* bad idea™. */
- if (ufd[0].revents & (POLLERR|POLLNVAL|POLLRDHUP))
+ if (ufd[0].revents & (POLLERR|POLLNVAL))
break;
if (ufd[1].revents)
break;
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;
}
#undef net_Write
-/* Write exact amount requested */
+/**
+ * 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 )
{
{ .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;
#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.
*/
projects / vlc / blobdiff