Skip to content

Commit 2d3b04d

Browse files
authored
Merge pull request #577 from ChIoT-Tech/master
nil c.options.Dialer caused a panic. Would only have impacted users who manually created ClientOptions structure.
2 parents 44f71c7 + 721bf9f commit 2d3b04d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

client.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,16 @@ func (c *client) attemptConnection() (net.Conn, byte, bool, error) {
392392
DEBUG.Println(CLI, "using custom onConnectAttempt handler...")
393393
tlsCfg = c.options.OnConnectAttempt(broker, c.options.TLSConfig)
394394
}
395+
dialer := c.options.Dialer
396+
if dialer == nil { //
397+
WARN.Println(CLI, "dialer was nil, using default")
398+
dialer = &net.Dialer{Timeout: 30 * time.Second}
399+
}
395400
// Start by opening the network connection (tcp, tls, ws) etc
396401
if c.options.CustomOpenConnectionFn != nil {
397402
conn, err = c.options.CustomOpenConnectionFn(broker, c.options)
398403
} else {
399-
conn, err = openConnection(broker, tlsCfg, c.options.ConnectTimeout, c.options.HTTPHeaders, c.options.WebsocketOptions, c.options.Dialer)
404+
conn, err = openConnection(broker, tlsCfg, c.options.ConnectTimeout, c.options.HTTPHeaders, c.options.WebsocketOptions, dialer)
400405
}
401406
if err != nil {
402407
ERROR.Println(CLI, err.Error())

0 commit comments

Comments
 (0)