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/ (rsock_getfamily): renamed from rb_sock_getfamily.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-03-01 11:58:13 +00:00
parent 895b3f6e06
commit aa2b22bba2
5 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Mar 1 20:57:41 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/win32/lib/Win32API.rb (initialize): passes res * ext/dl/win32/lib/Win32API.rb (initialize): passes res

4
ext/socket/ancdata.c
View file

@ -1142,7 +1142,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
rb_secure(4); rb_secure(4);
GetOpenFile(sock, fptr); GetOpenFile(sock, fptr);
family = rb_sock_getfamily(fptr->fd); family = rsock_getfamily(fptr->fd);
data = vflags = dest_sockaddr = Qnil; data = vflags = dest_sockaddr = Qnil;
controls_ptr = NULL; controls_ptr = NULL;
@ -1649,7 +1649,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
); );
#if defined(HAVE_ST_MSG_CONTROL) #if defined(HAVE_ST_MSG_CONTROL)
family = rb_sock_getfamily(fptr->fd); family = rsock_getfamily(fptr->fd);
if (mh.msg_controllen) { if (mh.msg_controllen) {
char *msg_end = (char *)mh.msg_control + mh.msg_controllen; char *msg_end = (char *)mh.msg_control + mh.msg_controllen;
for (cmh = CMSG_FIRSTHDR(&mh); cmh != NULL; cmh = CMSG_NXTHDR(&mh, cmh)) { for (cmh = CMSG_FIRSTHDR(&mh); cmh != NULL; cmh = CMSG_NXTHDR(&mh, cmh)) {

4
ext/socket/basicsocket.c
View file

@ -212,7 +212,7 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
rb_secure(2); rb_secure(2);
GetOpenFile(sock, fptr); GetOpenFile(sock, fptr);
family = rb_sock_getfamily(fptr->fd); family = rsock_getfamily(fptr->fd);
level = rsock_level_arg(family, lev); level = rsock_level_arg(family, lev);
option = rsock_optname_arg(family, level, optname); option = rsock_optname_arg(family, level, optname);
@ -295,7 +295,7 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
int family; int family;
GetOpenFile(sock, fptr); GetOpenFile(sock, fptr);
family = rb_sock_getfamily(fptr->fd); family = rsock_getfamily(fptr->fd);
level = rsock_level_arg(family, lev); level = rsock_level_arg(family, lev);
option = rsock_optname_arg(family, level, optname); option = rsock_optname_arg(family, level, optname);
len = 256; len = 256;

3
ext/socket/init.c
View file

@ -526,7 +526,8 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
return rsock_init_sock(rb_obj_alloc(klass), fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2);
} }
int rb_sock_getfamily(int sockfd) int
rsock_getfamily(int sockfd)
{ {
struct sockaddr_storage ss; struct sockaddr_storage ss;
socklen_t sslen = sizeof(ss); socklen_t sslen = sizeof(ss);

2
ext/socket/rubysocket.h
View file

@ -203,7 +203,7 @@ int rsock_optname_arg(int family, int level, VALUE optname);
int rsock_cmsg_type_arg(int family, int level, VALUE type); int rsock_cmsg_type_arg(int family, int level, VALUE type);
int rsock_shutdown_how_arg(VALUE how); int rsock_shutdown_how_arg(VALUE how);
int rb_sock_getfamily(int sockfd); int rsock_getfamily(int sockfd);
int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res); int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags); int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);