4078. [bug] Hand the case where CMSG_SPACE(sizeof(int)) !=

CMSG_SPACE(sizeof(int)). [RT #38621.

(cherry picked from commit b5edc023a1)
This commit is contained in:
Mark Andrews
2015-02-27 14:52:52 +11:00
parent f0d388e561
commit 76cbe3617f
2 changed files with 13 additions and 4 deletions
+3
View File
@@ -1,3 +1,6 @@
4078. [bug] Hand the case where CMSG_SPACE(sizeof(int)) !=
CMSG_SPACE(sizeof(int)). [RT #38621.
4077. [test] Add static-stub regression test for DS NXDOMAIN
return making the static stub disappear. [RT #38564]
+10 -4
View File
@@ -530,24 +530,30 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) {
msg.msg_iov = &iovec;
msg.msg_iovlen = 1;
msg.msg_control = (void*)&control;
msg.msg_controllen = cmsg_space(sizeof(int));
msg.msg_controllen = 0;
msg.msg_flags = 0;
cmsgp = msg.msg_control;
cmsgp->cmsg_level = level;
cmsgp->cmsg_type = type;
switch (cmsgp->cmsg_type) {
switch (type) {
#ifdef IP_TOS
case IP_TOS:
memset(cmsgp, 0, cmsg_space(sizeof(char)));
cmsgp->cmsg_level = level;
cmsgp->cmsg_type = type;
cmsgp->cmsg_len = cmsg_len(sizeof(char));
*(unsigned char*)CMSG_DATA(cmsgp) = dscp;
msg.msg_controllen += cmsg_space(sizeof(char));
break;
#endif
#ifdef IPV6_TCLASS
case IPV6_TCLASS:
memset(cmsgp, 0, cmsg_space(sizeof(dscp)));
cmsgp->cmsg_level = level;
cmsgp->cmsg_type = type;
cmsgp->cmsg_len = cmsg_len(sizeof(dscp));
memmove(CMSG_DATA(cmsgp), &dscp, sizeof(dscp));
msg.msg_controllen += cmsg_space(sizeof(dscp));
break;
#endif
default: