Ticket #257: socket.h.diff

socket.h

@@ -63 +63 @@
  */
 
 /*
+ * Data types.
+ */
+#if __BSD_VISIBLE
+#ifndef _GID_T_DECLARED
+typedef __gid_t         gid_t;
+#define _GID_T_DECLARED
+#endif
+
+#ifndef _OFF_T_DECLARED
+typedef __off_t         off_t;
+#define _OFF_T_DECLARED
+#endif
+
+#ifndef _PID_T_DECLARED
+typedef __pid_t         pid_t;
+#define _PID_T_DECLARED
+#endif
+#endif
+
+#ifndef _SA_FAMILY_T_DECLARED
+typedef __sa_family_t   sa_family_t;
+#define _SA_FAMILY_T_DECLARED
+#endif
+
+#ifndef _SOCKLEN_T_DECLARED
+typedef __socklen_t     socklen_t;
+#define _SOCKLEN_T_DECLARED
+#endif
+  
+#ifndef _SSIZE_T_DECLARED
+typedef __ssize_t       ssize_t;
+#define _SSIZE_T_DECLARED
+#endif
+
+#if __BSD_VISIBLE 
+#ifndef _UID_T_DECLARED
+typedef __uid_t         uid_t;
+#define _UID_T_DECLARED
+#endif
+#endif
+
+/*
  * Types
  */
 #define SOCK_STREAM     1               /* stream socket */
@@ -205 +247 @@
 };
 
 /*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define _SS_MAXSIZE     128U
+#define _SS_ALIGNSIZE   (sizeof(__int64_t))
+#define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(unsigned char) - \
+                             sizeof(sa_family_t))
+#define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(unsigned char) - \
+                             sizeof(sa_family_t) - _SS_PAD1SIZE - _SS_ALIGNSIZE)
+ 
+struct sockaddr_storage {
+         unsigned char   ss_len;         /* address length */
+         sa_family_t     ss_family;      /* address family */
+         char            __ss_pad1[_SS_PAD1SIZE];
+         __int64_t       __ss_align;     /* force desired struct alignment */
+         char            __ss_pad2[_SS_PAD2SIZE];
+};
+
+/*
  * Protocol families, same as address families for now.
  */
 #define PF_UNSPEC       AF_UNSPEC
@@ -391 +451 @@
 
 #define CMSG_FIRSTHDR(mhdr)     ((struct cmsghdr *)(mhdr)->msg_control)
 
+#if __BSD_VISIBLE
+/* RFC 2292 additions */
+#define CMSG_SPACE(l)           (_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l))
+#define CMSG_LEN(l)             (_ALIGN(sizeof(struct cmsghdr)) + (l))
+#endif
+
+#ifdef _KERNEL
+#define CMSG_ALIGN(n)   _ALIGN(n)
+#endif
+
 /* "Socket"-level control message types: */
 #define SCM_RIGHTS      0x01            /* access rights (array of int) */