[BACK]Return to socket.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / sys

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/sys/socket.h between version 1.67.2.4 and 1.75.4.2

version 1.67.2.4, 2005/02/04 11:48:06 version 1.75.4.2, 2006/12/30 20:50:55
Line 3 
Line 3 
 /*  /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.   * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
Line 15 
Line 15 
  * 3. Neither the name of the project nor the names of its contributors   * 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   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND   * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Line 122  typedef _BSD_SSIZE_T_ ssize_t;
Line 122  typedef _BSD_SSIZE_T_ ssize_t;
 #define SO_REUSEPORT    0x0200          /* allow local address & port reuse */  #define SO_REUSEPORT    0x0200          /* allow local address & port reuse */
 #define SO_TIMESTAMP    0x0400          /* timestamp received dgram traffic */  #define SO_TIMESTAMP    0x0400          /* timestamp received dgram traffic */
   
   
 /*  /*
  * Additional options, not kept in so_options.   * Additional options, not kept in so_options.
  */   */
Line 194  struct linger {
Line 195  struct linger {
 #define pseudo_AF_HDRCMPLT 30           /* Used by BPF to not rewrite hdrs  #define pseudo_AF_HDRCMPLT 30           /* Used by BPF to not rewrite hdrs
                                            in interface output routine */                                             in interface output routine */
 #endif  #endif
   #define AF_BLUETOOTH    31
   
 #define AF_MAX          31  #define AF_MAX          32
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 271  struct sockaddr_storage {
Line 273  struct sockaddr_storage {
 #define PF_INET6        AF_INET6  #define PF_INET6        AF_INET6
 #define PF_IPX          AF_IPX          /* same format as AF_NS */  #define PF_IPX          AF_IPX          /* same format as AF_NS */
 #if defined(_NETBSD_SOURCE)  #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  #define PF_PIP          pseudo_AF_PIP
 #endif  #endif
 #define PF_ISDN         AF_ISDN         /* same as E164 */  #define PF_ISDN         AF_ISDN         /* same as E164 */
Line 281  struct sockaddr_storage {
Line 283  struct sockaddr_storage {
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 #define PF_KEY          pseudo_AF_KEY   /* like PF_ROUTE, only for key mgmt */  #define PF_KEY          pseudo_AF_KEY   /* like PF_ROUTE, only for key mgmt */
 #endif  #endif
   #define PF_BLUETOOTH    AF_BLUETOOTH
   
 #define PF_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
Line 359  struct sockcred {
Line 362  struct sockcred {
         { "arp", CTLTYPE_NODE }, \          { "arp", CTLTYPE_NODE }, \
         { "key", 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 */  #endif /* _NETBSD_SOURCE */
   
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
Line 406  struct msghdr {
Line 450  struct msghdr {
         int             msg_flags;      /* flags on received message */          int             msg_flags;      /* flags on received message */
 };  };
   
 #define MSG_OOB         0x1             /* process out-of-band data */  #define MSG_OOB         0x0001          /* process out-of-band data */
 #define MSG_PEEK        0x2             /* peek at incoming message */  #define MSG_PEEK        0x0002          /* peek at incoming message */
 #define MSG_DONTROUTE   0x4             /* send without using routing tables */  #define MSG_DONTROUTE   0x0004          /* send without using routing tables */
 #define MSG_EOR         0x8             /* data completes record */  #define MSG_EOR         0x0008          /* data completes record */
 #define MSG_TRUNC       0x10            /* data discarded before delivery */  #define MSG_TRUNC       0x0010          /* data discarded before delivery */
 #define MSG_CTRUNC      0x20            /* control data lost before delivery */  #define MSG_CTRUNC      0x0020          /* control data lost before delivery */
 #define MSG_WAITALL     0x40            /* wait for full request or error */  #define MSG_WAITALL     0x0040          /* wait for full request or error */
 #define MSG_DONTWAIT    0x80            /* this message should be nonblocking */  #define MSG_DONTWAIT    0x0080          /* this message should be nonblocking */
 #define MSG_BCAST       0x100           /* this message was rcvd using link-level brdcst */  #define MSG_BCAST       0x0100          /* this message was rcvd using link-level brdcst */
 #define MSG_MCAST       0x200           /* this message was rcvd using link-level mcast */  #define MSG_MCAST       0x0200          /* this message was rcvd using link-level mcast */
   #define MSG_NOSIGNAL    0x0400          /* do not generate SIGPIPE on EOF */
   
 /*  /*
  * Header for ancillary data objects in msg_control buffer.   * Header for ancillary data objects in msg_control buffer.
Line 433  struct cmsghdr {
Line 478  struct cmsghdr {
 /* given pointer to struct cmsghdr, return pointer to data */  /* given pointer to struct cmsghdr, return pointer to data */
 #define CMSG_DATA(cmsg) \  #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)))
   
 /*  /*
  * Alignment requirement for CMSG struct manipulation.   * Alignment requirement for CMSG struct manipulation.
Line 453  struct cmsghdr {
Line 501  struct cmsghdr {
         (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \          (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
             (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)NULL : \              (struct cmsghdr *)0 : \
             (struct cmsghdr *)((__caddr_t)(cmsg) + \              (struct cmsghdr *)((__caddr_t)(cmsg) + \
                 __CMSG_ALIGN((cmsg)->cmsg_len)))                  __CMSG_ALIGN((cmsg)->cmsg_len)))
   
Line 464  struct cmsghdr {
Line 512  struct cmsghdr {
 #define CMSG_FIRSTHDR(mhdr) \  #define CMSG_FIRSTHDR(mhdr) \
         ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \          ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
          (struct cmsghdr *)(mhdr)->msg_control : \           (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_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))  #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))
Line 483  struct cmsghdr {
Line 531  struct cmsghdr {
 #define SHUT_WR         1               /* Disallow further sends. */  #define SHUT_WR         1               /* Disallow further sends. */
 #define SHUT_RDWR       2               /* Disallow further sends/receives. */  #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 <sys/cdefs.h>  #include <sys/cdefs.h>
   
 __BEGIN_DECLS  __BEGIN_DECLS
Line 532  ssize_t sendmsg(int, const struct msghdr
Line 558  ssize_t sendmsg(int, const struct msghdr
 int     setsockopt(int, int, int, const void *, socklen_t);  int     setsockopt(int, int, int, const void *, socklen_t);
 int     shutdown(int, int);  int     shutdown(int, int);
 int     sockatmark(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 *);  int     socketpair(int, int, int, int *);
 __END_DECLS  __END_DECLS
 #endif /* !_KERNEL */  #endif /* !_KERNEL */

Legend:
Removed from v.1.67.2.4  
changed lines
  Added in v.1.75.4.2

CVSweb <webmaster@jp.NetBSD.org>