Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.75.4.1 retrieving revision 1.114 diff -u -p -r1.75.4.1 -r1.114 --- src/sys/sys/socket.h 2006/06/21 15:12:03 1.75.4.1 +++ src/sys/sys/socket.h 2015/01/24 17:15:22 1.114 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.75.4.1 2006/06/21 15:12:03 yamt Exp $ */ +/* $NetBSD: socket.h,v 1.114 2015/01/24 17:15:22 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -97,6 +97,7 @@ typedef _BSD_SSIZE_T_ ssize_t; #endif #include +#include /* * Socket types. @@ -107,6 +108,11 @@ typedef _BSD_SSIZE_T_ ssize_t; #define SOCK_RDM 4 /* reliably-delivered message */ #define SOCK_SEQPACKET 5 /* sequenced packet stream */ +#define SOCK_CLOEXEC 0x10000000 /* set close on exec on socket */ +#define SOCK_NONBLOCK 0x20000000 /* set non blocking i/o socket */ +#define SOCK_NOSIGPIPE 0x40000000 /* don't send sigpipe */ +#define SOCK_FLAGS_MASK 0xf0000000 /* flags mask */ + /* * Option flags per-socket. */ @@ -120,7 +126,10 @@ typedef _BSD_SSIZE_T_ ssize_t; #define SO_LINGER 0x0080 /* linger on close if data present */ #define SO_OOBINLINE 0x0100 /* leave received OOB data in line */ #define SO_REUSEPORT 0x0200 /* allow local address & port reuse */ -#define SO_TIMESTAMP 0x0400 /* timestamp received dgram traffic */ +/* SO_OTIMESTAMP 0x0400 */ +#define SO_NOSIGPIPE 0x0800 /* no SIGPIPE from EPIPE */ +#define SO_ACCEPTFILTER 0x1000 /* there is an accept filter */ +#define SO_TIMESTAMP 0x2000 /* timestamp received dgram traffic */ /* @@ -130,12 +139,18 @@ typedef _BSD_SSIZE_T_ ssize_t; #define SO_RCVBUF 0x1002 /* receive buffer size */ #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 */ +/* SO_OSNDTIMEO 0x1005 */ +/* SO_ORCVTIMEO 0x1006 */ #define SO_ERROR 0x1007 /* get error status and clear */ #define SO_TYPE 0x1008 /* get socket type */ #define SO_OVERFLOWED 0x1009 /* datagrams: return packets dropped */ +#define SO_NOHEADER 0x100a /* user supplies no header to kernel; + * kernel removes header and supplies + * payload + */ +#define SO_SNDTIMEO 0x100b /* send timeout */ +#define SO_RCVTIMEO 0x100c /* receive timeout */ /* * Structure used for manipulating linger option. */ @@ -144,6 +159,11 @@ struct linger { int l_linger; /* linger time in seconds */ }; +struct accept_filter_arg { + char af_name[16]; + char af_arg[256-16]; +}; + /* * Level number for (get/set)sockopt() to apply to socket itself. */ @@ -153,7 +173,7 @@ struct linger { * Address families. */ #define AF_UNSPEC 0 /* unspecified */ -#define AF_LOCAL 1 /* local to host (pipes, portals) */ +#define AF_LOCAL 1 /* local to host */ #define AF_UNIX AF_LOCAL /* backward compatibility */ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #define AF_IMPLINK 3 /* arpanet imp addresses */ @@ -171,7 +191,7 @@ struct linger { #define AF_LAT 14 /* LAT */ #define AF_HYLINK 15 /* NSC Hyperchannel */ #define AF_APPLETALK 16 /* Apple Talk */ -#define AF_ROUTE 17 /* Internal Routing Protocol */ +#define AF_OROUTE 17 /* Internal Routing Protocol */ #define AF_LINK 18 /* Link layer interface */ #if defined(_NETBSD_SOURCE) #define pseudo_AF_XTP 19 /* eXpress Transfer Protocol (no AF) */ @@ -195,9 +215,11 @@ struct linger { #define pseudo_AF_HDRCMPLT 30 /* Used by BPF to not rewrite hdrs in interface output routine */ #endif -#define AF_BLUETOOTH 31 - -#define AF_MAX 32 +#define AF_BLUETOOTH 31 /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */ +#define AF_IEEE80211 32 /* IEEE80211 */ +#define AF_MPLS 33 /* MultiProtocol Label Switching */ +#define AF_ROUTE 34 /* Internal Routing Protocol */ +#define AF_MAX 35 /* * Structure used by kernel to store most @@ -238,6 +260,8 @@ struct sockaddr_storage { __int64_t __ss_align;/* force desired structure storage alignment */ char __ss_pad2[_SS_PAD2SIZE]; }; +#define sstosa(__ss) ((struct sockaddr *)(__ss)) +#define sstocsa(__ss) ((const struct sockaddr *)(__ss)) #endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */ #endif /* 1 */ @@ -263,7 +287,7 @@ struct sockaddr_storage { #define PF_LAT AF_LAT #define PF_HYLINK AF_HYLINK #define PF_APPLETALK AF_APPLETALK -#define PF_ROUTE AF_ROUTE +#define PF_OROUTE AF_OROUTE #define PF_LINK AF_LINK #if defined(_NETBSD_SOURCE) #define PF_XTP pseudo_AF_XTP /* really just proto family, no AF */ @@ -284,6 +308,8 @@ struct sockaddr_storage { #define PF_KEY pseudo_AF_KEY /* like PF_ROUTE, only for key mgmt */ #endif #define PF_BLUETOOTH AF_BLUETOOTH +#define PF_MPLS AF_MPLS +#define PF_ROUTE AF_ROUTE #define PF_MAX AF_MAX @@ -315,7 +341,8 @@ struct sockcred { * Compute size of a sockcred structure with groups. */ #define SOCKCREDSIZE(ngrps) \ - (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1))) + (/*CONSTCOND*/sizeof(struct sockcred) + (sizeof(gid_t) * \ + ((ngrps) ? ((ngrps) - 1) : 0))) #endif /* _NETBSD_SOURCE */ @@ -348,7 +375,7 @@ struct sockcred { { "lat", CTLTYPE_NODE }, \ { "hylink", CTLTYPE_NODE }, \ { "appletalk", CTLTYPE_NODE }, \ - { "route", CTLTYPE_NODE }, \ + { "oroute", CTLTYPE_NODE }, \ { "link_layer", CTLTYPE_NODE }, \ { "xtp", CTLTYPE_NODE }, \ { "coip", CTLTYPE_NODE }, \ @@ -361,6 +388,9 @@ struct sockcred { { "natm", CTLTYPE_NODE }, \ { "arp", CTLTYPE_NODE }, \ { "key", CTLTYPE_NODE }, \ + { "ieee80211", CTLTYPE_NODE }, \ + { "mlps", CTLTYPE_NODE }, \ + { "route", CTLTYPE_NODE }, \ } struct kinfo_pcb { @@ -399,6 +429,8 @@ struct kinfo_pcb { #define ki_src ki_s._kis_src #define ki_dst ki_d._kid_dst +#define ki_spad ki_s._kis_pad +#define ki_dpad ki_d._kid_pad #define PCB_SLOP 20 #define PCB_ALL 0 @@ -416,15 +448,17 @@ struct kinfo_pcb { */ #define NET_RT_DUMP 1 /* dump; may limit to a.f. */ #define NET_RT_FLAGS 2 /* by flags, e.g. RESOLVING */ -#define NET_RT_OIFLIST 3 /* old NET_RT_IFLIST (pre 1.5) */ -#define NET_RT_IFLIST 4 /* survey interface list */ -#define NET_RT_MAXID 5 +#define NET_RT_OOIFLIST 3 /* old NET_RT_IFLIST (pre 1.5) */ +#define NET_RT_OIFLIST 4 /* survey interface list */ +#define NET_RT_IFLIST 5 +#define NET_RT_MAXID 6 #define CTL_NET_RT_NAMES { \ { 0, 0 }, \ { "dump", CTLTYPE_STRUCT }, \ { "flags", CTLTYPE_STRUCT }, \ { 0, 0 }, \ + { 0, 0 }, \ { "iflist", CTLTYPE_STRUCT }, \ } #endif /* _NETBSD_SOURCE */ @@ -461,6 +495,23 @@ struct msghdr { #define MSG_BCAST 0x0100 /* this message was rcvd using link-level brdcst */ #define MSG_MCAST 0x0200 /* this message was rcvd using link-level mcast */ #define MSG_NOSIGNAL 0x0400 /* do not generate SIGPIPE on EOF */ +#if defined(_NETBSD_SOURCE) +#define MSG_CMSG_CLOEXEC 0x0800 /* close on exec receiving fd */ +#define MSG_NBIO 0x1000 /* use non-blocking I/O */ +#define MSG_WAITFORONE 0x2000 /* recvmmsg() wait for one message */ + +struct mmsghdr { + struct msghdr msg_hdr; + unsigned int msg_len; +}; +#endif + +/* Extra flags used internally only */ +#define MSG_USERFLAGS 0x0ffffff +#define MSG_NAMEMBUF 0x1000000 /* msg_name is an mbuf */ +#define MSG_CONTROLMBUF 0x2000000 /* msg_control is an mbuf */ +#define MSG_IOVUSRSPACE 0x4000000 /* msg_iov is in user space */ +#define MSG_LENUSRSPACE 0x8000000 /* address length is in user space */ /* * Header for ancillary data objects in msg_control buffer. @@ -477,10 +528,11 @@ struct cmsghdr { /* given pointer to struct cmsghdr, return pointer to data */ #define CMSG_DATA(cmsg) \ - ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr))) + ((u_char *)(void *)(cmsg) + \ + __CMSG_ALIGN(sizeof(struct cmsghdr))) #define CCMSG_DATA(cmsg) \ - ((const u_char *)(const void *)(cmsg) + \ - __CMSG_ALIGN(sizeof(struct cmsghdr))) + ((const u_char *)(const void *)(cmsg) + \ + __CMSG_ALIGN(sizeof(struct cmsghdr))) /* * Alignment requirement for CMSG struct manipulation. @@ -491,18 +543,18 @@ struct cmsghdr { * without (2), we can't guarantee binary compatibility in case of future * changes in ALIGNBYTES. */ -#define __CMSG_ALIGN(n) (((n) + __cmsg_alignbytes()) & ~__cmsg_alignbytes()) +#define __CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES) #ifdef _KERNEL #define CMSG_ALIGN(n) __CMSG_ALIGN(n) #endif /* given pointer to struct cmsghdr, return pointer to next cmsghdr */ #define CMSG_NXTHDR(mhdr, cmsg) \ - (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ + (((char *)(void *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ __CMSG_ALIGN(sizeof(struct cmsghdr)) > \ - (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ + (((char *)(void *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ?\ (struct cmsghdr *)0 : \ - (struct cmsghdr *)((__caddr_t)(cmsg) + \ + (struct cmsghdr *)(void *)((char *)(void *)(cmsg) + \ __CMSG_ALIGN((cmsg)->cmsg_len))) /* @@ -511,7 +563,7 @@ struct cmsghdr { */ #define CMSG_FIRSTHDR(mhdr) \ ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ - (struct cmsghdr *)(mhdr)->msg_control : \ + (struct cmsghdr *)(void *)(mhdr)->msg_control : \ (struct cmsghdr *)0) #define CMSG_SPACE(l) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l)) @@ -520,8 +572,9 @@ struct cmsghdr { /* "Socket"-level control message types: */ #define SCM_RIGHTS 0x01 /* access rights (array of int) */ #if defined(_NETBSD_SOURCE) -#define SCM_TIMESTAMP 0x02 /* timestamp (struct timeval) */ +/* 0x02 timestamp (struct timeval50) */ #define SCM_CREDS 0x04 /* credentials (struct sockcred) */ +#define SCM_TIMESTAMP 0x08 /* timestamp (struct timeval) */ #endif /* @@ -533,9 +586,30 @@ struct cmsghdr { #include +#ifdef _KERNEL +static inline socklen_t +sockaddr_getlen(const struct sockaddr *sa) +{ + return sa->sa_len; +} + __BEGIN_DECLS -int __cmsg_alignbytes(void); +struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t, + const struct sockaddr *); +struct sockaddr *sockaddr_externalize(struct sockaddr *, socklen_t, + const struct sockaddr *); +struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int); +const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *); +void *sockaddr_addr(struct sockaddr *, socklen_t *); +const struct sockaddr *sockaddr_any(const struct sockaddr *); +const struct sockaddr *sockaddr_any_by_family(int); +const void *sockaddr_anyaddr(const struct sockaddr *, socklen_t *); +int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *); +struct sockaddr *sockaddr_dup(const struct sockaddr *, int); +int sockaddr_format(const struct sockaddr *, char *, size_t); +void sockaddr_free(struct sockaddr *); __END_DECLS +#endif /* _KERNEL */ #ifndef _KERNEL @@ -545,10 +619,12 @@ int bind(int, const struct sockaddr *, s int connect(int, const struct sockaddr *, socklen_t); int getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict); int getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict); -int getsockopt(int, int, int, void * __restrict, socklen_t * __restrict); +int getsockopt(int, int, int, void *__restrict, socklen_t * __restrict); int listen(int, int); +int paccept(int, struct sockaddr * __restrict, socklen_t * __restrict, + const sigset_t * __restrict, int); ssize_t recv(int, void *, size_t, int); -ssize_t recvfrom(int, void * __restrict, size_t, int, +ssize_t recvfrom(int, void *__restrict, size_t, int, struct sockaddr * __restrict, socklen_t * __restrict); ssize_t recvmsg(int, struct msghdr *, int); ssize_t send(int, const void *, size_t, int); @@ -558,8 +634,19 @@ ssize_t sendmsg(int, const struct msghdr int setsockopt(int, int, int, const void *, socklen_t); int shutdown(int, int); int sockatmark(int); -int socket(int, int, int); +int socket(int, int, int) +#if !defined(__LIBC12_SOURCE__) && !defined(_STANDALONE) +__RENAME(__socket30) +#endif + ; int socketpair(int, int, int, int *); + +#if defined(_NETBSD_SOURCE) +int sendmmsg(int, struct mmsghdr *, unsigned int, unsigned int); +struct timespec; +int recvmmsg(int, struct mmsghdr *, unsigned int, unsigned int, + struct timespec *); +#endif __END_DECLS #endif /* !_KERNEL */