84ed480ef7
Commit git-c38dbb9 inadvertently broke local MINIX3-on-MINIX3 builds, since its libc changes relied on VFS being upgraded already as well. As a result, after installing the new libc, networking ceased to work, leading to curl(1) failing later on in the build process. This patch introduces transitional code that is necessary for the build process to complete, after which it is obsolete again. Change-Id: I93bf29c01d228e3d7efc7b01befeff682954f54d
160 lines
2.9 KiB
C
160 lines
2.9 KiB
C
#include <sys/cdefs.h>
|
|
#include "namespace.h"
|
|
#include <lib.h>
|
|
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <net/netlib.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/ioc_net.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/un.h>
|
|
|
|
#define DEBUG 0
|
|
|
|
static int _uds_socketpair(int type, int protocol, int sv[2]);
|
|
|
|
/*
|
|
* Create a pair of connected sockets.
|
|
*/
|
|
static int
|
|
__socketpair(int domain, int type, int protocol, int sv[2])
|
|
{
|
|
message m;
|
|
|
|
memset(&m, 0, sizeof(m));
|
|
m.m_lc_vfs_socket.domain = domain;
|
|
m.m_lc_vfs_socket.type = type;
|
|
m.m_lc_vfs_socket.protocol = protocol;
|
|
|
|
if (_syscall(VFS_PROC_NR, VFS_SOCKETPAIR, &m) < 0)
|
|
return -1;
|
|
|
|
sv[0] = m.m_vfs_lc_fdpair.fd0;
|
|
sv[1] = m.m_vfs_lc_fdpair.fd1;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
socketpair(int domain, int type, int protocol, int sv[2])
|
|
{
|
|
int r;
|
|
|
|
r = __socketpair(domain, type, protocol, sv);
|
|
if (r != -1 || (errno != EAFNOSUPPORT && errno != ENOSYS))
|
|
return r;
|
|
|
|
#if DEBUG
|
|
fprintf(stderr, "socketpair: domain %d, type %d, protocol %d\n",
|
|
domain, type, protocol);
|
|
#endif
|
|
|
|
if (domain == AF_UNIX)
|
|
return _uds_socketpair(type, protocol, sv);
|
|
|
|
errno = EAFNOSUPPORT;
|
|
return -1;
|
|
}
|
|
|
|
static int _uds_socketpair(int type, int protocol, int sv[2])
|
|
{
|
|
dev_t dev;
|
|
int r, i;
|
|
struct stat sbuf;
|
|
|
|
if (type != SOCK_STREAM && type != SOCK_SEQPACKET) {
|
|
errno = EPROTOTYPE;
|
|
return -1;
|
|
}
|
|
|
|
if (protocol != 0)
|
|
{
|
|
#if DEBUG
|
|
fprintf(stderr, "socketpair(uds): bad protocol %d\n", protocol);
|
|
#endif
|
|
errno= EPROTONOSUPPORT;
|
|
return -1;
|
|
}
|
|
|
|
/* in this 'for' loop two unconnected sockets are created */
|
|
for (i = 0; i < 2; i++) {
|
|
sv[i]= open(UDS_DEVICE, O_RDWR);
|
|
if (sv[i] == -1) {
|
|
int open_errno = errno;
|
|
|
|
if (i == 1) {
|
|
/* if we failed to open() the 2nd
|
|
* socket, we need to close the 1st
|
|
*/
|
|
close(sv[0]);
|
|
errno = open_errno;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
/* set the type for the socket via ioctl
|
|
* (SOCK_STREAM, SOCK_SEQPACKET, etc)
|
|
*/
|
|
r= ioctl(sv[i], NWIOSUDSTYPE, &type);
|
|
if (r == -1) {
|
|
int ioctl_errno;
|
|
|
|
/* if that failed rollback socket creation */
|
|
ioctl_errno= errno;
|
|
close(sv[i]);
|
|
|
|
if (i == 1) {
|
|
/* if we just closed the 2nd socket, we
|
|
* need to close the 1st
|
|
*/
|
|
close(sv[0]);
|
|
}
|
|
|
|
/* return the error thrown by the call to ioctl */
|
|
errno= ioctl_errno;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
r= fstat(sv[1], &sbuf);
|
|
if (r == -1) {
|
|
int fstat_errno;
|
|
|
|
/* if that failed rollback socket creation */
|
|
fstat_errno= errno;
|
|
|
|
close(sv[0]);
|
|
close(sv[1]);
|
|
|
|
/* return the error thrown by the call to fstat */
|
|
errno= fstat_errno;
|
|
return -1;
|
|
}
|
|
|
|
dev = sbuf.st_rdev;
|
|
|
|
/* connect the sockets sv[0] and sv[1] */
|
|
r= ioctl(sv[0], NWIOSUDSPAIR, &dev);
|
|
if (r == -1) {
|
|
int ioctl_errno;
|
|
|
|
/* if that failed rollback socket creation */
|
|
ioctl_errno= errno;
|
|
|
|
close(sv[0]);
|
|
close(sv[1]);
|
|
|
|
/* return the error thrown by the call to ioctl */
|
|
errno= ioctl_errno;
|
|
return -1;
|
|
}
|
|
|
|
|
|
return 0;
|
|
}
|