mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed inconsistencies

This commit is contained in:
kyle 2014-12-20 19:36:08 +02:00
parent d1aa016bb0
commit dde47a6a32
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/connection.go
View File

@ -227,15 +227,12 @@ func (conn *Conn) Connect() error {
if conn.connected { if conn.connected {
return fmt.Errorf("irc.Connect(): Cannot connect to %s, already connected.", conn.cfg.Server) return fmt.Errorf("irc.Connect(): Cannot connect to %s, already connected.", conn.cfg.Server)
} }
conn.dialer.Timeout = conn.cfg.Timeout
if conn.cfg.SSL { if conn.cfg.SSL {
if !hasPort(conn.cfg.Server) { if !hasPort(conn.cfg.Server) {
conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6697") conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6697")
} }
if &conn.cfg.Timeout != nil {
conn.cfg.Timeout = (60 * time.Second)
}
logging.Info("irc.Connect(): Connecting to %s with SSL.", conn.cfg.Server) logging.Info("irc.Connect(): Connecting to %s with SSL.", conn.cfg.Server)
conn.dialer.Timeout = conn.cfg.Timeout
if s, err := tls.DialWithDialer(conn.dialer, "tcp", conn.cfg.Server, conn.cfg.SSLConfig); err == nil { if s, err := tls.DialWithDialer(conn.dialer, "tcp", conn.cfg.Server, conn.cfg.SSLConfig); err == nil {
conn.sock = s conn.sock = s
} else { } else {
@ -245,11 +242,8 @@ func (conn *Conn) Connect() error {
if !hasPort(conn.cfg.Server) { if !hasPort(conn.cfg.Server) {
conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6667") conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6667")
} }
if &conn.cfg.Timeout != nil {
conn.cfg.Timeout = (60 * time.Second)
}
logging.Info("irc.Connect(): Connecting to %s without SSL.", conn.cfg.Server) logging.Info("irc.Connect(): Connecting to %s without SSL.", conn.cfg.Server)
if s, err := conn.dialer.DialTimeout("tcp", conn.cfg.Server, conn.cfg.Timeout); err == nil { if s, err := conn.dialer.Dial("tcp", conn.cfg.Server); err == nil {
conn.sock = s conn.sock = s
} else { } else {
return err return err