1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-09-26 09:35:44 +00:00
parent 13391b4047
commit dfe0aab04f
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Sep 26 18:35:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946]
Mon Sep 26 17:39:27 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> Mon Sep 26 17:39:27 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/ruby/test_marshal.rb: add test for ruby's objects. * test/ruby/test_marshal.rb: add test for ruby's objects.

2
defines.h
View File

@ -144,7 +144,7 @@ flush_register_windows(void)
volatile volatile
#endif #endif
# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__) # if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
("flushw" : :) ("flushw")
# elif defined(linux) || defined(__linux__) # elif defined(linux) || defined(__linux__)
("ta 0x83") ("ta 0x83")
# else /* Solaris, OpenBSD, NetBSD, etc. */ # else /* Solaris, OpenBSD, NetBSD, etc. */

31
lib/resolv-replace.rb
View File

@ -1,9 +1,10 @@
require 'socket'
require 'resolv' require 'resolv'
class BasicSocket class BasicSocket
alias original_resolv_send send alias original_resolv_send send
def send(mesg, flags, *rest) def send(mesg, flags, *rest)
rest[0] = Resolv.getaddress(rest[0]).to_s if 0 < rest.length rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
original_resolv_send(mesg, flags, *rest) original_resolv_send(mesg, flags, *rest)
end end
end end
@ -15,19 +16,20 @@ class << IPSocket
end end
end end
class << TCPSocket class TCPSocket
alias original_resolv_new new alias original_resolv_initialize initialize
def new(host, service) def initialize(host, serv, *rest)
original_resolv_new(Resolv.getaddress(host).to_s, service) rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
end original_resolv_initialize(Resolv.getaddress(host).to_s, serv, *rest)
alias original_resolv_open open
def open(host, service)
original_resolv_open(Resolv.getaddress(host).to_s, service)
end end
end end
class UDPSocket class UDPSocket
alias original_resolv_bind bind
def bind(host, port)
original_resolv_bind(Resolv.getaddress(host).to_s, port)
end
alias original_resolv_connect connect alias original_resolv_connect connect
def connect(host, port) def connect(host, port)
original_resolv_connect(Resolv.getaddress(host).to_s, port) original_resolv_connect(Resolv.getaddress(host).to_s, port)
@ -35,7 +37,14 @@ class UDPSocket
alias original_resolv_send send alias original_resolv_send send
def send(mesg, flags, *rest) def send(mesg, flags, *rest)
rest[0] = Resolv.getaddress(rest[0]).to_s if 0 < rest.length rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
original_resolv_send(mesg, flags, *rest) original_resolv_send(mesg, flags, *rest)
end end
end end
class SOCKSSocket
alias original_resolv_initialize initialize
def initialize(host, serv)
original_resolv_initialize(Resolv.getaddress(host).to_s, port)
end
end if defined? SOCKSSocket