sneak/go-ircevent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41 from whd/master

Browse Source 
Use tls.DialWithDialer instead of tls.Client and remove irc.netsock
This commit is contained in:
Thomas Jager 2014-08-14 15:11:46 +02:00
commit 90dc7f966b
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
irc.go
View File

@ -299,10 +299,6 @@ func (irc *Connection) Disconnect() {
irc.Wait() irc.Wait()
irc.socket.Close() irc.socket.Close()
irc.socket = nil irc.socket = nil
if irc.netsock != nil {
irc.netsock.Close()
irc.netsock = nil
}
irc.ErrorChan() <- ErrDisconnected irc.ErrorChan() <- ErrDisconnected
} }
@ -352,9 +348,8 @@ func (irc *Connection) Connect(server string) error {
} }
if irc.UseTLS { if irc.UseTLS {
if irc.netsock, err = net.DialTimeout("tcp", irc.server, irc.Timeout); err == nil { dialer := &net.Dialer{Timeout: irc.Timeout}
irc.socket = tls.Client(irc.netsock, irc.TLSConfig) irc.socket, err = tls.DialWithDialer(dialer, "tcp", irc.server, irc.TLSConfig)
}
} else { } else {
irc.socket, err = net.DialTimeout("tcp", irc.server, irc.Timeout) irc.socket, err = net.DialTimeout("tcp", irc.server, irc.Timeout)
} }

7
irc_struct.go
View File

@ -24,10 +24,9 @@ type Connection struct {
PingFreq time.Duration PingFreq time.Duration
KeepAlive time.Duration KeepAlive time.Duration
socket net.Conn socket net.Conn
netsock net.Conn pwrite chan string
pwrite chan string end chan struct{}
end chan struct{}
nick string //The nickname we want. nick string //The nickname we want.
nickcurrent string //The nickname we currently have. nickcurrent string //The nickname we currently have.