http dialer default port

powerpuffpenguin · Jan 24, 2024 · 9da6f6d · 9da6f6d
1 parent e850597
commit 9da6f6d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * fix http bridge default tag prefix 'ws'
 * fix bridge connect error not close source connection
 * add command flags -print
+* fix http/websocket dialer not set default port
 
 # v0.0.1
 

diff --git a/dialer/http.go b/dialer/http.go
@@ -79,12 +79,22 @@ func newHttpDialer(nk *network.Network, log *slog.Logger, opts *config.Dialer, u
 	}
 	var (
 		network = `tcp`
-		addr    = u.Host
+		addr    string
 	)
 	if opts.Network != `` {
 		network = opts.Network
 	}
-	if opts.Addr != `` {
+	if opts.Addr == `` {
+		if u.Port() == `` {
+			if secure {
+				addr = u.Host + `:443`
+			} else {
+				addr = u.Host + `:80`
+			}
+		} else {
+			addr = u.Host
+		}
+	} else {
 		addr = opts.Addr
 	}
 

diff --git a/dialer/websocket.go b/dialer/websocket.go
@@ -51,12 +51,22 @@ func newWebsocketDialer(nk *network.Network, log *slog.Logger, opts *config.Dial
 	}
 	var (
 		network = `tcp`
-		addr    = u.Host
+		addr    string
 	)
 	if opts.Network != `` {
 		network = opts.Network
 	}
-	if opts.Addr != `` {
+	if opts.Addr == `` {
+		if u.Port() == `` {
+			if secure {
+				addr = u.Host + `:443`
+			} else {
+				addr = u.Host + `:80`
+			}
+		} else {
+			addr = u.Host
+		}
+	} else {
 		addr = opts.Addr
 	}
 	rawDialer, e := nk.Dialer(network, addr, nil)