|
 |
1bb262 |
From 111803a7b99abd01d487b00f7cce5b6d142a755c Mon Sep 17 00:00:00 2001
|
|
|
1bb262 |
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
|
|
|
1bb262 |
Date: Tue, 28 Jun 2016 14:00:16 +0200
|
|
|
1bb262 |
Subject: [PATCH 11/19] recv.2, cmsg.3: fix type of cmsg_len member of cmsghdr
|
|
|
1bb262 |
structure
|
|
|
1bb262 |
|
|
|
1bb262 |
---
|
|
|
1bb262 |
man-pages/man2/____recv.2 | 7 ++++---
|
|
|
1bb262 |
man-pages/man2/recv.2 | 7 ++++---
|
|
|
1bb262 |
man-pages/man3/cmsg.3 | 10 ++++++----
|
|
|
1bb262 |
3 files changed, 14 insertions(+), 10 deletions(-)
|
|
|
1bb262 |
|
|
|
1bb262 |
diff --git a/man-pages/man2/____recv.2 b/man-pages/man2/____recv.2
|
|
|
1bb262 |
index 3ac8ef4..7056eb2 100644
|
|
|
1bb262 |
--- a/man-pages/man2/____recv.2
|
|
|
1bb262 |
+++ b/man-pages/man2/____recv.2
|
|
|
1bb262 |
@@ -341,9 +341,10 @@ The messages are of the form:
|
|
|
1bb262 |
.nf
|
|
|
1bb262 |
|
|
|
1bb262 |
struct cmsghdr {
|
|
|
1bb262 |
- socklen_t cmsg_len; /* data byte count, including hdr */
|
|
|
1bb262 |
- int cmsg_level; /* originating protocol */
|
|
|
1bb262 |
- int cmsg_type; /* protocol-specific type */
|
|
|
1bb262 |
+ size_t cmsg_len; /* Data byte count, including header
|
|
|
1bb262 |
+ (type is socklen_t in POSIX) */
|
|
|
1bb262 |
+ int cmsg_level; /* Originating protocol */
|
|
|
1bb262 |
+ int cmsg_type; /* Protocol-specific type */
|
|
|
1bb262 |
/* followed by
|
|
|
1bb262 |
unsigned char cmsg_data[]; */
|
|
|
1bb262 |
};
|
|
|
1bb262 |
diff --git a/man-pages/man2/recv.2 b/man-pages/man2/recv.2
|
|
|
1bb262 |
index 3ac8ef4..7056eb2 100644
|
|
|
1bb262 |
--- a/man-pages/man2/recv.2
|
|
|
1bb262 |
+++ b/man-pages/man2/recv.2
|
|
|
1bb262 |
@@ -341,9 +341,10 @@ The messages are of the form:
|
|
|
1bb262 |
.nf
|
|
|
1bb262 |
|
|
|
1bb262 |
struct cmsghdr {
|
|
|
1bb262 |
- socklen_t cmsg_len; /* data byte count, including hdr */
|
|
|
1bb262 |
- int cmsg_level; /* originating protocol */
|
|
|
1bb262 |
- int cmsg_type; /* protocol-specific type */
|
|
|
1bb262 |
+ size_t cmsg_len; /* Data byte count, including header
|
|
|
1bb262 |
+ (type is socklen_t in POSIX) */
|
|
|
1bb262 |
+ int cmsg_level; /* Originating protocol */
|
|
|
1bb262 |
+ int cmsg_type; /* Protocol-specific type */
|
|
|
1bb262 |
/* followed by
|
|
|
1bb262 |
unsigned char cmsg_data[]; */
|
|
|
1bb262 |
};
|
|
|
1bb262 |
diff --git a/man-pages/man3/cmsg.3 b/man-pages/man3/cmsg.3
|
|
|
1bb262 |
index 2713c09..8fe3d5d 100644
|
|
|
1bb262 |
--- a/man-pages/man3/cmsg.3
|
|
|
1bb262 |
+++ b/man-pages/man3/cmsg.3
|
|
|
1bb262 |
@@ -28,10 +28,12 @@ CMSG_ALIGN, CMSG_SPACE, CMSG_NXTHDR, CMSG_FIRSTHDR \- access ancillary data
|
|
|
1bb262 |
.sp
|
|
|
1bb262 |
.nf
|
|
|
1bb262 |
struct cmsghdr {
|
|
|
1bb262 |
- socklen_t cmsg_len; /* data byte count, including header */
|
|
|
1bb262 |
- int cmsg_level; /* originating protocol */
|
|
|
1bb262 |
- int cmsg_type; /* protocol-specific type */
|
|
|
1bb262 |
- /* followed by unsigned char cmsg_data[]; */
|
|
|
1bb262 |
+ size_t cmsg_len; /* Data byte count, including header
|
|
|
1bb262 |
+ (type is socklen_t in POSIX) */
|
|
|
1bb262 |
+ int cmsg_level; /* Originating protocol */
|
|
|
1bb262 |
+ int cmsg_type; /* Protocol-specific type */
|
|
|
1bb262 |
+/* followed by
|
|
|
1bb262 |
+ unsigned char cmsg_data[]; */
|
|
|
1bb262 |
};
|
|
|
1bb262 |
.fi
|
|
|
1bb262 |
.SH DESCRIPTION
|
|
|
1bb262 |
--
|
|
|
1bb262 |
2.7.4
|
|
|
1bb262 |
|