@@ -157,4 +157,6 @@ typedef enum AsyncSocketError AsyncSocketError; + (NSData*) LFData; // 0x0A + (NSData*) ZeroData; // 0x00 ++ (NSString*)posixErrorStringFromErrno:(int)code; + @end objc/AsyncSocket.h @@ -1581,4 +1581,15 @@ static void MyCFWriteStreamCallback (CFWriteStreamRef stream, CFStreamEventType CFWriteStreamSetProperty(theWriteStream, kCFStreamPropertySSLSettings, settings); } ++ (NSString*)posixErrorStringFromErrno:(int)code +{ + const char* error = strerror(code); + if (error) { + return [NSString stringWithCString:error]; + } + else { + return nil; + } +} + @end objc/AsyncSocket.m @@ -93,7 +93,18 @@ class TcpClient < NSObject def onSocket_willDisconnectWithError(sock, err) return unless check_tag(sock) - @delegate.tcpclient_on_error(self, err) if @delegate && err + return unless err + + str = nil + + case err.domain.to_s + when NSPOSIXErrorDomain.to_s + str = AsyncSocket.posixErrorStringFromErrno(err.code) + end + + str = err.localizedDescription.to_s unless str + + @delegate.tcpclient_on_error(self, str) if @delegate end def onSocketDidDisconnect(sock) ruby/component/tcpclient.rb @@ -83,7 +83,7 @@ class DccReceiver def tcpclient_on_error(sender, err) return if @status == :complete || @status == :error @status = :error - @error = err.localizedDescription.to_s + @error = err close @delegate.dccreceiver_on_error(self) end ruby/dcc/dccreceiver.rb @@ -1011,7 +1011,7 @@ class IRCUnit < NSObject end def ircsocket_on_error(err) - print_error(err.localizedDescription.to_s) + print_error(err) end def ResolverOnResolve(addr) ruby/irc/unit.rb 0b8361ab5ecddc7ca9af3eead3903cb7ccdc2902 Satoshi Nakagawa psychs@limechat.net http://github.com/psychs/limechat/commit/888e6a2109180b43c24b4c5724ca942495802223 888e6a2109180b43c24b4c5724ca942495802223 2009-03-08T18:46:50-07:00 2009-03-08T18:46:50-07:00 improved error messages af0fd6f8d85252e8208cb6bfa1a88e1cd04ef960 Satoshi Nakagawa psychs@limechat.net