Attachment 344 Details for Bug 336 – Add CMSG_DATA and CMSG_FIRSTHDR macros to monitor_fdpass.h

[patch] Add CMSG_DATA and CMSG_FIRSTHDR macros to monitor_fdpass.h

openssh-linux_cmsg.patch (text/plain), 1.03 KB, created by Darren Tucker on 2003-06-29 23:16:07 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-06-29 23:16:07 AEST

Size: 1.03 KB

patch

obsolete

>Index: monitor_fdpass.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/monitor_fdpass.h,v
>retrieving revision 1.5
>diff -u -r1.5 monitor_fdpass.h
>--- monitor_fdpass.h	25 Jun 2002 23:04:11 -0000	1.5
>+++ monitor_fdpass.h	29 Jun 2003 13:14:44 -0000
>@@ -28,6 +28,24 @@
> #ifndef _MM_FDPASS_H_
> #define _MM_FDPASS_H_
> 
>+/* given pointer to struct cmsghdr, return pointer to data */
>+#ifndef CMSG_DATA
>+# define MY_ALIGN(p) (((u_int)(p) + (sizeof(int) - 1)) &~ (sizeof(int) - 1))
>+# define CMSG_DATA(cmsg) \
>+	((u_char *)(cmsg) + MY_ALIGN(sizeof(struct cmsghdr)))
>+#endif /* CMSG_DATA */
>+
>+/*
>+ * RFC 2292 requires to check msg_controllen, in case that the kernel returns
>+ * an empty list for some reasons.
>+ */
>+#ifndef CMSG_FIRSTHDR
>+# define CMSG_FIRSTHDR(mhdr) \
>+	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
>+	 (struct cmsghdr *)(mhdr)->msg_control : \
>+	 (struct cmsghdr *)NULL)
>+#endif /* CMSG_FIRSTHDR */
>+
> void mm_send_fd(int, int);
> int mm_receive_fd(int);
>

Actions: View | Diff

Attachments on bug 336: 308 | 344 | 365