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.71 retrieving revision 1.84.4.1 diff -u -p -r1.71 -r1.84.4.1 --- src/sys/sys/socket.h 2005/02/26 22:25:34 1.71 +++ src/sys/sys/socket.h 2007/07/11 20:12:36 1.84.4.1 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.71 2005/02/26 22:25:34 perry Exp $ */ +/* $NetBSD: socket.h,v 1.84.4.1 2007/07/11 20:12:36 mjf Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -122,6 +122,7 @@ typedef _BSD_SSIZE_T_ ssize_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. */ @@ -194,8 +195,9 @@ struct linger { #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 @@ -271,7 +273,7 @@ struct sockaddr_storage { #define PF_INET6 AF_INET6 #define PF_IPX AF_IPX /* same format as AF_NS */ #if defined(_NETBSD_SOURCE) -#define PF_RTIP pseudo_AF_FTIP /* same format as AF_INET */ +#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 */ @@ -281,6 +283,7 @@ struct sockaddr_storage { #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 @@ -359,6 +362,47 @@ struct sockcred { { "arp", CTLTYPE_NODE }, \ { "key", CTLTYPE_NODE }, \ } + +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) @@ -406,16 +450,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. @@ -433,6 +485,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. @@ -450,11 +505,11 @@ 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) + \ + (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ + (struct cmsghdr *)0 : \ + (struct cmsghdr *)((char *)(cmsg) + \ __CMSG_ALIGN((cmsg)->cmsg_len))) /* @@ -464,7 +519,7 @@ struct cmsghdr { #define CMSG_FIRSTHDR(mhdr) \ ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ (struct cmsghdr *)(mhdr)->msg_control : \ - (struct cmsghdr *)NULL) + (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)) @@ -483,34 +538,22 @@ struct cmsghdr { #define SHUT_WR 1 /* Disallow further sends. */ #define SHUT_RDWR 2 /* Disallow further sends/receives. */ -#if defined(_NETBSD_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 */ -}; - -/* - * 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 - #include __BEGIN_DECLS int __cmsg_alignbytes(void); __END_DECLS +#ifdef _KERNEL +__BEGIN_DECLS +struct sockaddr *sockaddr_copy(struct sockaddr *, const struct sockaddr *); +struct sockaddr *sockaddr_alloc(sa_family_t, int); +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 @@ -519,10 +562,10 @@ 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); 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); @@ -532,7 +575,11 @@ 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 *); __END_DECLS #endif /* !_KERNEL */