kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/ancdata.c (bsock_sendmsg_internal): should not remove the

Browse source 
last padding of control messages, basically.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-17 10:40:20 +00:00
parent 0958624759
commit 3d39a9a070
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 17 19:39:04 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (bsock_sendmsg_internal): should not remove the
last padding of control messages, basically.
Tue Feb 17 12:50:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Feb 17 12:50:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_shared_replace): no need for * string.c (rb_str_shared_replace): no need for

28
ext/socket/ancdata.c
View file

@ -890,6 +890,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
#if defined(HAVE_ST_MSG_CONTROL) #if defined(HAVE_ST_MSG_CONTROL)
int i; int i;
int last_pad = 0; int last_pad = 0;
int last_level = 0;
int last_type = 0;
controls_str = rb_str_tmp_new(0); controls_str = rb_str_tmp_new(0);
for (i = 0; i < controls_num; i++) { for (i = 0; i < controls_num; i++) {
VALUE elt = controls_ptr[i], v; VALUE elt = controls_ptr[i], v;
@ -925,13 +927,33 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
cmh->cmsg_type = type; cmh->cmsg_type = type;
cmh->cmsg_len = CMSG_LEN(RSTRING_LEN(cdata)); cmh->cmsg_len = CMSG_LEN(RSTRING_LEN(cdata));
MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata)); MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
last_level = cmh->cmsg_level;
last_type = cmh->cmsg_type;
last_pad = cspace - cmh->cmsg_len; last_pad = cspace - cmh->cmsg_len;
} }
#if !defined(__OpenBSD__)
if (last_pad) { if (last_pad) {
rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad); /*
* This code removes the last padding from msg_controllen.
*
* 4.3BSD-Reno reject the padding for SCM_RIGHTS. (There was no 64bit environments in those days?)
* RFC 2292 require the padding.
* RFC 3542 relaxes the condition - implementation must accept both as valid.
*
* Actual problems:
*
* - NetBSD 4.0.1
* SCM_RIGHTS with padding causes EINVAL
* IPV6_PKTINFO without padding causes "page fault trap"
*
* - OpenBSD 4.4
* IPV6_PKTINFO without padding causes EINVAL
*
* Basically, msg_controllen should contains the padding.
* So the padding is removed only if a problem really exists.
*/
if (last_level == SOL_SOCKET && last_type == SCM_RIGHTS)
rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
} }
#endif
#else #else
rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented"); rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
#endif #endif