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

Fixed the building of the server/port string to be IPv6 safe.

This commit is contained in:
Andrew Brampton 2014-11-30 10:09:17 -08:00
parent 28d81b1146
commit dbcdb4c13d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/connection.go
View File

@ -225,7 +225,7 @@ func (conn *Conn) Connect() error {
} }
if conn.cfg.SSL { if conn.cfg.SSL {
if !hasPort(conn.cfg.Server) { if !hasPort(conn.cfg.Server) {
conn.cfg.Server += ":6697" conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6697")
} }
logging.Info("irc.Connect(): Connecting to %s with SSL.", conn.cfg.Server) logging.Info("irc.Connect(): Connecting to %s with SSL.", conn.cfg.Server)
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 {
@ -235,7 +235,7 @@ func (conn *Conn) Connect() error {
} }
} else { } else {
if !hasPort(conn.cfg.Server) { if !hasPort(conn.cfg.Server) {
conn.cfg.Server += ":6667" conn.cfg.Server = net.JoinHostPort(conn.cfg.Server, "6667")
} }
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.Dial("tcp", conn.cfg.Server); err == nil { if s, err := conn.dialer.Dial("tcp", conn.cfg.Server); err == nil {