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.60.2.1 retrieving revision 1.87.8.1 diff -u -p -r1.60.2.1 -r1.87.8.1 --- src/sys/sys/socket.h 2001/08/03 04:14:05 1.60.2.1 +++ src/sys/sys/socket.h 2007/11/06 23:34:56 1.87.8.1 @@ -1,9 +1,9 @@ -/* $NetBSD: socket.h,v 1.60.2.1 2001/08/03 04:14:05 lukem Exp $ */ +/* $NetBSD: socket.h,v 1.87.8.1 2007/11/06 23:34:56 matt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,7 +15,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -41,11 +41,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -67,6 +63,8 @@ #ifndef _SYS_SOCKET_H_ #define _SYS_SOCKET_H_ +#include + /* * Definitions related to sockets: types, address families, options. */ @@ -86,6 +84,20 @@ typedef __socklen_t socklen_t; #define socklen_t __socklen_t #endif +#include + +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ +#endif + +#ifdef _BSD_SSIZE_T_ +typedef _BSD_SSIZE_T_ ssize_t; +#undef _BSD_SSIZE_T_ +#endif + +#include + /* * Socket types. */ @@ -110,6 +122,7 @@ typedef __socklen_t socklen_t; #define SO_REUSEPORT 0x0200 /* allow local address & port reuse */ #define SO_TIMESTAMP 0x0400 /* timestamp received dgram traffic */ + /* * Additional options, not kept in so_options. */ @@ -121,7 +134,12 @@ typedef __socklen_t socklen_t; #define SO_RCVTIMEO 0x1006 /* receive timeout */ #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 + */ /* * Structure used for manipulating linger option. */ @@ -159,37 +177,38 @@ struct linger { #define AF_APPLETALK 16 /* Apple Talk */ #define AF_ROUTE 17 /* Internal Routing Protocol */ #define AF_LINK 18 /* Link layer interface */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define pseudo_AF_XTP 19 /* eXpress Transfer Protocol (no AF) */ #endif #define AF_COIP 20 /* connection-oriented IP, aka ST II */ #define AF_CNT 21 /* Computer Network Technology */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define pseudo_AF_RTIP 22 /* Help Identify RTIP packets */ #endif #define AF_IPX 23 /* Novell Internet Protocol */ #define AF_INET6 24 /* IP version 6 */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define pseudo_AF_PIP 25 /* Help Identify PIP packets */ #endif #define AF_ISDN 26 /* Integrated Services Digital Network*/ #define AF_E164 AF_ISDN /* CCITT E.164 recommendation */ #define AF_NATM 27 /* native ATM access */ #define AF_ARP 28 /* (rev.) addr. res. prot. (RFC 826) */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define pseudo_AF_KEY 29 /* Internal key management protocol */ #define pseudo_AF_HDRCMPLT 30 /* Used by BPF to not rewrite hdrs in interface output routine */ #endif +#define AF_BLUETOOTH 31 /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */ -#define AF_MAX 31 +#define AF_MAX 32 /* * Structure used by kernel to store most * addresses. */ struct sockaddr { - uint8_t sa_len; /* total length */ + __uint8_t sa_len; /* total length */ sa_family_t sa_family; /* address family */ char sa_data[14]; /* actually longer; address value */ }; @@ -210,20 +229,22 @@ struct sockproto { * RFC 2553: protocol-independent placeholder for socket addresses */ #define _SS_MAXSIZE 128 -#define _SS_ALIGNSIZE (sizeof(int64_t)) +#define _SS_ALIGNSIZE (sizeof(__int64_t)) #define _SS_PAD1SIZE (_SS_ALIGNSIZE - 2) #define _SS_PAD2SIZE (_SS_MAXSIZE - 2 - \ _SS_PAD1SIZE - _SS_ALIGNSIZE) -#if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500 +#if (_XOPEN_SOURCE - 0) >= 500 || defined(_NETBSD_SOURCE) struct sockaddr_storage { - uint8_t ss_len; /* address length */ + __uint8_t ss_len; /* address length */ sa_family_t ss_family; /* address family */ char __ss_pad1[_SS_PAD1SIZE]; - int64_t __ss_align;/* force desired structure storage alignment */ + __int64_t __ss_align;/* force desired structure storage alignment */ char __ss_pad2[_SS_PAD2SIZE]; }; -#endif /* !_XOPEN_SOURCE || ... */ +#define sstosa(__ss) ((struct sockaddr *)(__ss)) +#define sstocsa(__ss) ((const struct sockaddr *)(__ss)) +#endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */ #endif /* 1 */ /* @@ -250,28 +271,40 @@ struct sockaddr_storage { #define PF_APPLETALK AF_APPLETALK #define PF_ROUTE AF_ROUTE #define PF_LINK AF_LINK -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define PF_XTP pseudo_AF_XTP /* really just proto family, no AF */ #endif #define PF_COIP AF_COIP #define PF_CNT AF_CNT #define PF_INET6 AF_INET6 #define PF_IPX AF_IPX /* same format as AF_NS */ -#if !defined(_XOPEN_SOURCE) -#define PF_RTIP pseudo_AF_FTIP /* same format as AF_INET */ +#if defined(_NETBSD_SOURCE) +#define PF_RTIP pseudo_AF_RTIP /* same format as AF_INET */ #define PF_PIP pseudo_AF_PIP #endif #define PF_ISDN AF_ISDN /* same as E164 */ #define PF_E164 AF_E164 #define PF_NATM AF_NATM #define PF_ARP AF_ARP -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define PF_KEY pseudo_AF_KEY /* like PF_ROUTE, only for key mgmt */ #endif +#define PF_BLUETOOTH AF_BLUETOOTH #define PF_MAX AF_MAX -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) + +#ifndef gid_t +typedef __gid_t gid_t; /* group id */ +#define gid_t __gid_t +#endif + +#ifndef uid_t +typedef __uid_t uid_t; /* user id */ +#define uid_t __uid_t +#endif + /* * Socket credentials. */ @@ -289,10 +322,10 @@ struct sockcred { */ #define SOCKCREDSIZE(ngrps) \ (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1))) -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) /* * Definitions for network related sysctl, CTL_NET. * @@ -335,9 +368,50 @@ struct sockcred { { "arp", CTLTYPE_NODE }, \ { "key", CTLTYPE_NODE }, \ } -#endif /* !_XOPEN_SOURCE */ -#if !defined(_XOPEN_SOURCE) +struct kinfo_pcb { + __uint64_t ki_pcbaddr; /* PTR: pcb addr */ + __uint64_t ki_ppcbaddr; /* PTR: ppcb addr */ + __uint64_t ki_sockaddr; /* PTR: socket addr */ + + __uint32_t ki_family; /* INT: protocol family */ + __uint32_t ki_type; /* INT: socket type */ + __uint32_t ki_protocol; /* INT: protocol */ + __uint32_t ki_pflags; /* INT: generic protocol flags */ + + __uint32_t ki_sostate; /* INT: socket state */ + __uint32_t ki_prstate; /* INT: protocol state */ + __int32_t ki_tstate; /* INT: tcp state */ + __uint32_t ki_tflags; /* INT: tcp flags */ + + __uint64_t ki_rcvq; /* U_LONG: receive queue len */ + __uint64_t ki_sndq; /* U_LONG: send queue len */ + + union { + struct sockaddr _kis_src; /* STRUCT: local address */ + char _kis_pad[256 + 8]; /* pad to max addr length */ + } ki_s; + union { + struct sockaddr _kid_dst; /* STRUCT: remote address */ + char _kid_pad[256 + 8]; /* pad to max addr length */ + } ki_d; + + __uint64_t ki_inode; /* INO_T: fake inode number */ + __uint64_t ki_vnode; /* PTR: if associated with file */ + __uint64_t ki_conn; /* PTR: control block of peer */ + __uint64_t ki_refs; /* PTR: referencing socket */ + __uint64_t ki_nextref; /* PTR: link in refs list */ +}; + +#define ki_src ki_s._kis_src +#define ki_dst ki_d._kid_dst + +#define PCB_SLOP 20 +#define PCB_ALL 0 + +#endif /* _NETBSD_SOURCE */ + +#if defined(_NETBSD_SOURCE) /* * PF_ROUTE - Routing table * @@ -359,13 +433,14 @@ struct sockcred { { 0, 0 }, \ { "iflist", CTLTYPE_STRUCT }, \ } -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ /* * Maximum queue length specifiable by listen(2). */ - +#ifndef SOMAXCONN #define SOMAXCONN 128 +#endif /* * Message header for recvmsg and sendmsg calls. @@ -381,16 +456,24 @@ struct msghdr { int msg_flags; /* flags on received message */ }; -#define MSG_OOB 0x1 /* process out-of-band data */ -#define MSG_PEEK 0x2 /* peek at incoming message */ -#define MSG_DONTROUTE 0x4 /* send without using routing tables */ -#define MSG_EOR 0x8 /* data completes record */ -#define MSG_TRUNC 0x10 /* data discarded before delivery */ -#define MSG_CTRUNC 0x20 /* control data lost before delivery */ -#define MSG_WAITALL 0x40 /* wait for full request or error */ -#define MSG_DONTWAIT 0x80 /* this message should be nonblocking */ -#define MSG_BCAST 0x100 /* this message was rcvd using link-level brdcst */ -#define MSG_MCAST 0x200 /* this message was rcvd using link-level mcast */ +#define MSG_OOB 0x0001 /* process out-of-band data */ +#define MSG_PEEK 0x0002 /* peek at incoming message */ +#define MSG_DONTROUTE 0x0004 /* send without using routing tables */ +#define MSG_EOR 0x0008 /* data completes record */ +#define MSG_TRUNC 0x0010 /* data discarded before delivery */ +#define MSG_CTRUNC 0x0020 /* control data lost before delivery */ +#define MSG_WAITALL 0x0040 /* wait for full request or error */ +#define MSG_DONTWAIT 0x0080 /* this message should be nonblocking */ +#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 */ + +/* 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. @@ -408,6 +491,9 @@ struct cmsghdr { /* given pointer to struct cmsghdr, return pointer to data */ #define CMSG_DATA(cmsg) \ ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr))) +#define CCMSG_DATA(cmsg) \ + ((const u_char *)(const void *)(cmsg) + \ + __CMSG_ALIGN(sizeof(struct cmsghdr))) /* * Alignment requirement for CMSG struct manipulation. @@ -425,20 +511,28 @@ struct cmsghdr { /* given pointer to struct cmsghdr, return pointer to next cmsghdr */ #define CMSG_NXTHDR(mhdr, cmsg) \ - (((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ + (((char *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ __CMSG_ALIGN(sizeof(struct cmsghdr)) > \ - (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ - (struct cmsghdr *)NULL : \ - (struct cmsghdr *)((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len))) + (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ + (struct cmsghdr *)0 : \ + (struct cmsghdr *)((char *)(cmsg) + \ + __CMSG_ALIGN((cmsg)->cmsg_len))) -#define CMSG_FIRSTHDR(mhdr) ((struct cmsghdr *)(mhdr)->msg_control) +/* + * RFC 2292 requires to check msg_controllen, in case that the kernel returns + * an empty list for some reasons. + */ +#define CMSG_FIRSTHDR(mhdr) \ + ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ + (struct cmsghdr *)(mhdr)->msg_control : \ + (struct cmsghdr *)0) #define CMSG_SPACE(l) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l)) #define CMSG_LEN(l) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l)) /* "Socket"-level control message types: */ #define SCM_RIGHTS 0x01 /* access rights (array of int) */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define SCM_TIMESTAMP 0x02 /* timestamp (struct timeval) */ #define SCM_CREDS 0x04 /* credentials (struct sockcred) */ #endif @@ -450,56 +544,60 @@ struct cmsghdr { #define SHUT_WR 1 /* Disallow further sends. */ #define SHUT_RDWR 2 /* Disallow further sends/receives. */ -#if !defined(_XOPEN_SOURCE) -/* - * 4.3 compat sockaddr, move to compat file later - */ -struct osockaddr { - uint16_t sa_family; /* address family */ - char sa_data[14]; /* up to 14 bytes of direct address */ -}; +#include -/* - * 4.3-compat message header (move to compat file later). - */ -struct omsghdr { - caddr_t msg_name; /* optional address */ - int msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - int msg_iovlen; /* # elements in msg_iov */ - caddr_t msg_accrights; /* access rights sent/received */ - int msg_accrightslen; -}; -#endif +__BEGIN_DECLS +int __cmsg_alignbytes(void); +__END_DECLS -#include +#ifdef _KERNEL +static inline socklen_t +sockaddr_getlen(const struct sockaddr *sa) +{ + return sa->sa_len; +} __BEGIN_DECLS -int __cmsg_alignbytes __P((void)); +struct sockaddr *sockaddr_copy(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 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); +void sockaddr_free(struct sockaddr *); __END_DECLS +#endif /* _KERNEL */ #ifndef _KERNEL __BEGIN_DECLS -int accept __P((int, struct sockaddr *, socklen_t *)); -int bind __P((int, const struct sockaddr *, socklen_t)); -int connect __P((int, const struct sockaddr *, socklen_t)); -int getpeername __P((int, struct sockaddr *, socklen_t *)); -int getsockname __P((int, struct sockaddr *, socklen_t *)); -int getsockopt __P((int, int, int, void *, socklen_t *)); -int listen __P((int, int)); -ssize_t recv __P((int, void *, size_t, int)); -ssize_t recvfrom __P((int, void *, size_t, int, struct sockaddr *, - socklen_t *)); -ssize_t recvmsg __P((int, struct msghdr *, int)); -ssize_t send __P((int, const void *, size_t, int)); -ssize_t sendto __P((int, const void *, - size_t, int, const struct sockaddr *, socklen_t)); -ssize_t sendmsg __P((int, const struct msghdr *, int)); -int setsockopt __P((int, int, int, const void *, socklen_t)); -int shutdown __P((int, int)); -int socket __P((int, int, int)); -int socketpair __P((int, int, int, int *)); +int accept(int, struct sockaddr * __restrict, socklen_t * __restrict); +int bind(int, const struct sockaddr *, socklen_t); +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 listen(int, int); +ssize_t recv(int, void *, 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); +ssize_t sendto(int, const void *, + size_t, int, const struct sockaddr *, socklen_t); +ssize_t sendmsg(int, const struct msghdr *, int); +int setsockopt(int, int, int, const void *, socklen_t); +int shutdown(int, int); +int sockatmark(int); +int socket(int, int, int) +#if !defined(__LIBC12_SOURCE__) && !defined(_STANDALONE) +__RENAME(__socket30) +#endif + ; +int socketpair(int, int, int, int *); __END_DECLS #endif /* !_KERNEL */