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.66 retrieving revision 1.73 diff -u -p -r1.66 -r1.73 --- src/sys/sys/socket.h 2003/04/19 21:30:29 1.66 +++ src/sys/sys/socket.h 2005/03/09 05:07:19 1.73 @@ -1,9 +1,9 @@ -/* $NetBSD: socket.h,v 1.66 2003/04/19 21:30:29 christos Exp $ */ +/* $NetBSD: socket.h,v 1.73 2005/03/09 05:07:19 atatat 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. */ @@ -135,6 +133,7 @@ typedef _BSD_SSIZE_T_ ssize_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 */ /* * Structure used for manipulating linger option. @@ -173,24 +172,24 @@ 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 */ @@ -229,7 +228,7 @@ struct sockproto { #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 */ sa_family_t ss_family; /* address family */ @@ -237,7 +236,7 @@ struct sockaddr_storage { __int64_t __ss_align;/* force desired structure storage alignment */ char __ss_pad2[_SS_PAD2SIZE]; }; -#endif /* !_XOPEN_SOURCE || ... */ +#endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */ #endif /* 1 */ /* @@ -264,28 +263,28 @@ 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_MAX AF_MAX -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #ifndef gid_t typedef __gid_t gid_t; /* group id */ @@ -314,10 +313,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. * @@ -360,9 +359,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 * @@ -384,7 +424,7 @@ struct sockcred { { 0, 0 }, \ { "iflist", CTLTYPE_STRUCT }, \ } -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ /* * Maximum queue length specifiable by listen(2). @@ -472,7 +512,7 @@ struct cmsghdr { /* "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 @@ -484,7 +524,7 @@ struct cmsghdr { #define SHUT_WR 1 /* Disallow further sends. */ #define SHUT_RDWR 2 /* Disallow further sends/receives. */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) /* * 4.3 compat sockaddr, move to compat file later */ @@ -509,35 +549,32 @@ struct omsghdr { #include __BEGIN_DECLS -int __cmsg_alignbytes __P((void)); +int __cmsg_alignbytes(void); __END_DECLS #ifndef _KERNEL __BEGIN_DECLS -int accept __P((int, struct sockaddr * __restrict, socklen_t * __restrict)); -int bind __P((int, const struct sockaddr *, socklen_t)); -int connect __P((int, const struct sockaddr *, socklen_t)); -int getpeername __P((int, struct sockaddr * __restrict, - socklen_t * __restrict)); -int getsockname __P((int, struct sockaddr * __restrict, - socklen_t * __restrict)); -int getsockopt __P((int, int, int, void * __restrict, - socklen_t * __restrict)); -int listen __P((int, int)); -ssize_t recv __P((int, void *, size_t, int)); -ssize_t recvfrom __P((int, void * __restrict, size_t, int, - struct sockaddr * __restrict, socklen_t * __restrict)); -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 sockatmark __P((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); +int socketpair(int, int, int, int *); __END_DECLS #endif /* !_KERNEL */