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));
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;
if (i_val)
{
msg_Err (p_this, "Cannot resolve %s port %d : %s", psz_host, i_port,
- vlc_gai_strerror (i_val));
+ gai_strerror (i_val));
return NULL;
}
net_Close (fd);
}
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
if (sockv != NULL)
sockv[sockc] = -1;
switch (WSAGetLastError ())
{
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;