forked from Minki/linux
a677a039be
This patch adds support for flag values which are ORed to the type passwd
to socket and socketpair. The additional code is minimal. The flag
values in this implementation can and must match the O_* flags. This
avoids overhead in the conversion.
The internal functions sock_alloc_fd and sock_map_fd get a new parameters
and all callers are changed.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#define PORT 57392
/* For Linux these must be the same. */
#define SOCK_CLOEXEC O_CLOEXEC
int
main (void)
{
int fd;
fd = socket (PF_INET, SOCK_STREAM, 0);
if (fd == -1)
{
puts ("socket(0) failed");
return 1;
}
int coe = fcntl (fd, F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if (coe & FD_CLOEXEC)
{
puts ("socket(0) set close-on-exec flag");
return 1;
}
close (fd);
fd = socket (PF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0);
if (fd == -1)
{
puts ("socket(SOCK_CLOEXEC) failed");
return 1;
}
coe = fcntl (fd, F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if ((coe & FD_CLOEXEC) == 0)
{
puts ("socket(SOCK_CLOEXEC) does not set close-on-exec flag");
return 1;
}
close (fd);
int fds[2];
if (socketpair (PF_UNIX, SOCK_STREAM, 0, fds) == -1)
{
puts ("socketpair(0) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
coe = fcntl (fds[i], F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if (coe & FD_CLOEXEC)
{
printf ("socketpair(0) set close-on-exec flag for fds[%d]\n", i);
return 1;
}
close (fds[i]);
}
if (socketpair (PF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, fds) == -1)
{
puts ("socketpair(SOCK_CLOEXEC) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
coe = fcntl (fds[i], F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if ((coe & FD_CLOEXEC) == 0)
{
printf ("socketpair(SOCK_CLOEXEC) does not set close-on-exec flag for fds[%d]\n", i);
return 1;
}
close (fds[i]);
}
puts ("OK");
return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
118 lines
3.4 KiB
C
118 lines
3.4 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1997, 1999, 2000, 2001 Ralf Baechle
|
|
* Copyright (C) 2000, 2001 Silicon Graphics, Inc.
|
|
*/
|
|
#ifndef _ASM_SOCKET_H
|
|
#define _ASM_SOCKET_H
|
|
|
|
#include <asm/sockios.h>
|
|
|
|
/*
|
|
* For setsockopt(2)
|
|
*
|
|
* This defines are ABI conformant as far as Linux supports these ...
|
|
*/
|
|
#define SOL_SOCKET 0xffff
|
|
|
|
#define SO_DEBUG 0x0001 /* Record debugging information. */
|
|
#define SO_REUSEADDR 0x0004 /* Allow reuse of local addresses. */
|
|
#define SO_KEEPALIVE 0x0008 /* Keep connections alive and send
|
|
SIGPIPE when they die. */
|
|
#define SO_DONTROUTE 0x0010 /* Don't do local routing. */
|
|
#define SO_BROADCAST 0x0020 /* Allow transmission of
|
|
broadcast messages. */
|
|
#define SO_LINGER 0x0080 /* Block on close of a reliable
|
|
socket to transmit pending data. */
|
|
#define SO_OOBINLINE 0x0100 /* Receive out-of-band data in-band. */
|
|
#if 0
|
|
To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */
|
|
#endif
|
|
|
|
#define SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */
|
|
#define SO_STYLE SO_TYPE /* Synonym */
|
|
#define SO_ERROR 0x1007 /* get error status and clear */
|
|
#define SO_SNDBUF 0x1001 /* Send buffer size. */
|
|
#define SO_RCVBUF 0x1002 /* Receive buffer. */
|
|
#define SO_SNDLOWAT 0x1003 /* send low-water mark */
|
|
#define SO_RCVLOWAT 0x1004 /* receive low-water mark */
|
|
#define SO_SNDTIMEO 0x1005 /* send timeout */
|
|
#define SO_RCVTIMEO 0x1006 /* receive timeout */
|
|
#define SO_ACCEPTCONN 0x1009
|
|
|
|
/* linux-specific, might as well be the same as on i386 */
|
|
#define SO_NO_CHECK 11
|
|
#define SO_PRIORITY 12
|
|
#define SO_BSDCOMPAT 14
|
|
|
|
#define SO_PASSCRED 17
|
|
#define SO_PEERCRED 18
|
|
|
|
/* Security levels - as per NRL IPv6 - don't actually do anything */
|
|
#define SO_SECURITY_AUTHENTICATION 22
|
|
#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
|
|
#define SO_SECURITY_ENCRYPTION_NETWORK 24
|
|
|
|
#define SO_BINDTODEVICE 25
|
|
|
|
/* Socket filtering */
|
|
#define SO_ATTACH_FILTER 26
|
|
#define SO_DETACH_FILTER 27
|
|
|
|
#define SO_PEERNAME 28
|
|
#define SO_TIMESTAMP 29
|
|
#define SCM_TIMESTAMP SO_TIMESTAMP
|
|
|
|
#define SO_PEERSEC 30
|
|
#define SO_SNDBUFFORCE 31
|
|
#define SO_RCVBUFFORCE 33
|
|
#define SO_PASSSEC 34
|
|
#define SO_TIMESTAMPNS 35
|
|
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
|
|
|
|
#define SO_MARK 36
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/** sock_type - Socket types
|
|
*
|
|
* Please notice that for binary compat reasons MIPS has to
|
|
* override the enum sock_type in include/linux/net.h, so
|
|
* we define ARCH_HAS_SOCKET_TYPES here.
|
|
*
|
|
* @SOCK_DGRAM - datagram (conn.less) socket
|
|
* @SOCK_STREAM - stream (connection) socket
|
|
* @SOCK_RAW - raw socket
|
|
* @SOCK_RDM - reliably-delivered message
|
|
* @SOCK_SEQPACKET - sequential packet socket
|
|
* @SOCK_PACKET - linux specific way of getting packets at the dev level.
|
|
* For writing rarp and other similar things on the user level.
|
|
*/
|
|
enum sock_type {
|
|
SOCK_DGRAM = 1,
|
|
SOCK_STREAM = 2,
|
|
SOCK_RAW = 3,
|
|
SOCK_RDM = 4,
|
|
SOCK_SEQPACKET = 5,
|
|
SOCK_DCCP = 6,
|
|
SOCK_PACKET = 10,
|
|
};
|
|
|
|
#define SOCK_MAX (SOCK_PACKET + 1)
|
|
/* Mask which covers at least up to SOCK_MASK-1. The
|
|
* * remaining bits are used as flags. */
|
|
#define SOCK_TYPE_MASK 0xf
|
|
|
|
/* Flags for socket, socketpair, paccept */
|
|
#define SOCK_CLOEXEC O_CLOEXEC
|
|
#define SOCK_NONBLOCK O_NONBLOCK
|
|
|
|
#define ARCH_HAS_SOCKET_TYPES 1
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_SOCKET_H */
|