diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-01 15:21:24 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-01 15:21:24 +0000 |
| commit | c9c51009cf154ef028d40d48d55607378867e312 () | |
| tree | 7faa653bad660077eaebef9612e22bde66d1e0d3 /lib/resolv-replace.rb | |
| parent | 0967d72815617a13f10fed36f3d00535eb4fedb6 (diff) | |
* lib/resolv-replace.rb (BasicSocket#send): don't replace because
it has no hostname argument. (IPSocket.getaddress): raise SocketError instead of Resolv::ResolvError for errors. (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect) (SOCKSSocket#initialize): use IPSocket.getaddress instead of Resolv.getaddress. (UDPSocket#send): recognize 3 arguments form. try all addresses on 4 arguments form. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/resolv-replace.rb | 44 |
1 files changed, 28 insertions, 16 deletions
@@ -1,50 +1,62 @@ require 'socket' require 'resolv' -class BasicSocket - alias original_resolv_send send - def send(mesg, flags, *rest) - rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty? - original_resolv_send(mesg, flags, *rest) - end -end - class << IPSocket alias original_resolv_getaddress getaddress def getaddress(host) - return Resolv.getaddress(host).to_s end end class TCPSocket alias original_resolv_initialize initialize def initialize(host, serv, *rest) - rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty? - original_resolv_initialize(Resolv.getaddress(host).to_s, serv, *rest) end end 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 def connect(host, port) - original_resolv_connect(Resolv.getaddress(host).to_s, port) end alias original_resolv_send send def send(mesg, flags, *rest) - rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty? - original_resolv_send(mesg, flags, *rest) 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 |