add other schemes to connection url

and remove fallthroughs, don't think they help clarity

Author: Al S-M

netconn.go

@@ -39,7 +39,7 @@ func openConnection(uri *url.URL, tlsc *tls.Config, timeout time.Duration, heade
 	case "wss":
 		conn, err := NewWebsocket(uri.String(), tlsc, timeout, headers)
 		return conn, err
-	case "tcp":
+	case "mqtt", "tcp":
 		allProxy := os.Getenv("all_proxy")
 		if len(allProxy) == 0 {
 			conn, err := net.DialTimeout("tcp", uri.Host, timeout)
@@ -61,11 +61,7 @@ func openConnection(uri *url.URL, tlsc *tls.Config, timeout time.Duration, heade
 			return nil, err
 		}
 		return conn, nil
-	case "ssl":
-		fallthrough
-	case "tls":
-		fallthrough
-	case "tcps":
+	case "ssl", "tls", "mqtts", "mqtt+ssl", "tcps":
 		allProxy := os.Getenv("all_proxy")
 		if len(allProxy) == 0 {
 			conn, err := tls.DialWithDialer(&net.Dialer{Timeout: timeout}, "tcp", uri.Host, tlsc)

unit_router_test.go

@@ -43,7 +43,7 @@ func Test_AddRoute(t *testing.T) {
 }
 
 func Test_AddRoute_Wildcards(t *testing.T) {
-	router, _ := newRouter()
+	router := newRouter()
 	cb := func(client Client, msg Message) {
 	}
 	router.addRoute("#", cb)
@@ -55,15 +55,16 @@ func Test_AddRoute_Wildcards(t *testing.T) {
 }
 
 func Test_DeleteRoute_Wildcards(t *testing.T) {
-	router, _ := newRouter()
+	router := newRouter()
 	cb := func(client Client, msg Message) {
 	}
 	router.addRoute("#", cb)
 	router.addRoute("topic1", cb)
 	router.deleteRoute("topic1")
-	
+
 	expected := "#"
-	got := router.routes.Front().Value.(*route).topic; if !(router.routes.Front().Value.(*route).topic == "#") {
+	got := router.routes.Front().Value.(*route).topic
+	if !(router.routes.Front().Value.(*route).topic == "#") {
 		t.Fatalf("deleteRoute deleted wrong route when wildcards are used, got topic '%s', expected route with topic '%s'", got, expected)
 	}
 }