------------------------------------------------------------
revno: 12262
revision-id: squid3@treenet.co.nz-20120808081528-bh7m7fceo6om918v
parent: squid3@treenet.co.nz-20120808080146-ugq1744dvm8lklsg
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Wed 2012-08-08 02:15:28 -0600
message:
  Portability: CMSG_*() macro API substitute
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120808081528-bh7m7fceo6om918v
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 97671e718904218a908cf18ce17dbf1c51eb0e18
# timestamp: 2012-08-08 08:17:08 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20120808080146-\
#   ugq1744dvm8lklsg
# 
# Begin patch
=== modified file 'compat/cmsg.h'
--- compat/cmsg.h	2012-05-29 12:20:02 +0000
+++ compat/cmsg.h	2012-08-08 08:15:28 +0000
@@ -1,12 +1,106 @@
+/*
+ * Compatibility-layer for CMSG_
+ */
 #ifndef SQUID_COMPAT_CMSG_H
 #define SQUID_COMPAT_CMSG_H
 
+// cmsg.h is found through sys/socket.h
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifndef CMSG_H_
+#define CMSG_H_
+
+/* mostly windows-specific */
+#ifndef CMSG_SPACE
+struct cmsghdr{
+        unsigned int    cmsg_len;
+        int  cmsg_level;
+        int     cmsg_type;
+        unsigned char cmsg_data[16]; /* dummy */
+        /* followed by UCHAR cmsg_data[]; */
+} ;
+
+/* lifted off https://metacpan.org/source/SAMPO/Socket-PassAccessRights-0.03/passfd.c */
+#ifndef CMSG_DATA
+# define CMSG_DATA(cmsg) ((cmsg)->cmsg_data)
+#endif
+
+#ifndef CMSG_NXTHDR
+# define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
+#endif
+
+#ifndef CMSG_FIRSTHDR
+# define CMSG_FIRSTHDR(mhdr) \
+  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)        \
+   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
+#endif
+
+#ifndef CMSG_ALIGN
+# define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
+             & ~(sizeof (size_t) - 1))
+#endif
+
+# define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+             + CMSG_ALIGN (sizeof (struct cmsghdr)))
+#undef HAVE_CONSTANT_CMSG_SPACE
+#define HAVE_CONSTANT_CMSG_SPACE 1
+
+#ifndef CMSG_LEN
+# define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+#endif
+
+struct msghdr {
+    void *msg_name;             /* Address to send to/receive from.  */
+    socklen_t msg_namelen;      /* Length of address data.  */
+
+    struct iovec *msg_iov;      /* Vector of data to send/receive into.  */
+    size_t msg_iovlen;          /* Number of elements in the vector.  */
+
+    void *msg_control;          /* Ancillary data (eg BSD filedesc passing). */
+    size_t msg_controllen;      /* Ancillary data buffer length.
+                                   !! The type should be socklen_t but the
+                                   definition of the kernel is incompatible
+                                   with this.  */
+
+    int msg_flags;              /* Flags on received message.  */
+};
+
+
+struct iovec {
+	void *iov_base;
+	size_t iov_len;
+};
+struct sockaddr_un {
+	char sun_family;
+    char sun_path[256];   /* pathname */
+};
+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)        \
+        + strlen ((ptr)->sun_path))
+
+
+#endif /* CMSG_SPACE */
+
+#ifndef SCM_RIGHTS
+#define SCM_RIGHTS 1
+#endif
+#ifndef SCM_CREDENTIALS
+#define SCM_CREDENTIALS 2
+#endif
+#ifndef SCM_SECURITY
+#define SCM_SECURITY 3
+#endif
+
+#ifndef AF_LOCAL
+#define AF_LOCAL 1
+#endif
+
+#endif /* CMSG_H_ */
+
 // CMSG_SPACE is not constant on some systems (in particular Max OS X),
 // provide a replacement that can be used at build time in that case
-
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+// NP: this must go below our replacement definitions.
 
 #if HAVE_CONSTANT_CMSG_SPACE
 #define SQUID_CMSG_SPACE CMSG_SPACE