mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/socket/rubysocket.h (level_arg): add family argument.
(optname_arg): ditto. (cmsg_type_arg): ditto. (rb_sock_getfamily): declared. * ext/socket/constants.c (level_arg): add family argument. (optname_arg): ditto. (cmsg_type_arg): ditto. * ext/socket/init.c (rb_sock_getfamily): defined. * ext/socket/option.c (sockopt_initialize): give family for level_arg and optname_arg. (sockopt_s_int): ditto. * ext/socket/basicsocket.c (bsock_setsockopt): ditto. (bsock_getsockopt): ditto. * ext/socket/ancdata.c (ancillary_initialize): ditto. (ancillary_s_int): ditto. (ancillary_cmsg_is_p): ditto. (bsock_sendmsg_internal): ditto. (bsock_recvmsg_internal): use rb_sock_getfamily. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2092fbcc3a
commit
f5da7031b9
7 changed files with 85 additions and 44 deletions
|
|
@ -38,8 +38,8 @@ static VALUE
|
|||
sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE data)
|
||||
{
|
||||
int family = family_arg(vfamily);
|
||||
int level = level_arg(vlevel);
|
||||
int optname = optname_arg(level, voptname);
|
||||
int level = level_arg(family, vlevel);
|
||||
int optname = optname_arg(family, level, voptname);
|
||||
StringValue(data);
|
||||
rb_ivar_set(self, rb_intern("family"), INT2NUM(family));
|
||||
rb_ivar_set(self, rb_intern("level"), INT2NUM(level));
|
||||
|
|
@ -133,8 +133,8 @@ static VALUE
|
|||
sockopt_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vint)
|
||||
{
|
||||
int family = family_arg(vfamily);
|
||||
int level = level_arg(vlevel);
|
||||
int optname = optname_arg(level, voptname);
|
||||
int level = level_arg(family, vlevel);
|
||||
int optname = optname_arg(family, level, voptname);
|
||||
int i = NUM2INT(vint);
|
||||
return sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue