archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

matz

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-06-29 07:46:56 +00:00
parent 1e965f4f9a
commit 11fef7fd63
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/socket/socket.c
View file

@ -104,7 +104,7 @@ struct sockaddr_storage {
};
#endif
#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET))
#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
#define LOOKUP_ORDERS 3
static int lookup_order_table[LOOKUP_ORDERS] = {
#if defined(LOOKUP_ORDER_HACK_INET)
@ -381,7 +381,7 @@ bsock_send(argc, argv, sock)
retry:
rb_thread_fd_writable(fd);
m = rb_str2cstr(msg, &mlen);
if (RTEST(to)) {
if (!NIL_P(to)) {
t = rb_str2cstr(to, &tlen);
n = sendto(fd, m, mlen, NUM2INT(flags),
(struct sockaddr*)t, tlen);
@ -611,15 +611,6 @@ ip_addrsetup(host, port)
return res;
}
static VALUE
ip_recvfrom(argc, argv, sock)
int argc;
VALUE *argv;
VALUE sock;
{
return s_recvfrom(sock, argc, argv, RECV_IP);
}
static void
setipaddr(name, addr)
VALUE name;
@ -1167,6 +1158,15 @@ ip_peeraddr(sock)
return ipaddr((struct sockaddr *)&addr);
}
static VALUE
ip_recvfrom(argc, argv, sock)
int argc;
VALUE *argv;
VALUE sock;
{
return s_recvfrom(sock, argc, argv, RECV_IP);
}
static VALUE
ip_s_getaddress(obj, host)
VALUE obj, host;
@ -1259,7 +1259,7 @@ udp_send(argc, argv, sock)
int mlen;
struct addrinfo *res0, *res;
if (argc == 2) {
if (argc == 2 || argc == 3) {
return bsock_send(argc, argv, sock);
}
rb_secure(4);