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/rubysocket.h (sockopt_new): add family argument.

Browse source 
* ext/socket/option.c (sockopt_initialize): add vfamily argument.
  (sockopt_new): add family argument and record it in the object.
  (sockopt_family): new method.
  (sockopt_s_int): add vfamily argument.
  (sockopt_inspect): show family.

* ext/socket/basicsocket.c (bsock_getsockopt): check address family
  using getsockname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-08 15:12:27 +00:00
parent 3e11901f1c
commit c02ce88762
4 changed files with 63 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/socket/basicsocket.c
View file

@ -290,6 +290,8 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
socklen_t len;
char *buf;
rb_io_t *fptr;
struct sockaddr_storage ss;
socklen_t sslen = sizeof(ss);
level = level_arg(lev);
option = optname_arg(level, optname);
@ -297,10 +299,16 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
buf = ALLOCA_N(char,len);
GetOpenFile(sock, fptr);
if (getsockname(fptr->fd, (struct sockaddr*)&ss, &sslen) < 0)
rb_sys_fail("getsockname(2)");
if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
rb_sys_fail_path(fptr->pathv);
return sockopt_new(level, option, rb_str_new(buf, len));
if (sslen < (char*)&ss.ss_family + sizeof(ss.ss_family) - (char*)&ss)
ss.ss_family = AF_UNSPEC;
return sockopt_new(ss.ss_family, level, option, rb_str_new(buf, len));
#else
rb_notimplement();
#endif