From 4d3f1ab554f3b7a36f8c0bceede316d9d1bfc71e Mon Sep 17 00:00:00 2001 From: zanjie1999 Date: Tue, 26 Sep 2023 18:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1dns=E4=BC=98=E9=80=89ip=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=B2=A1=E6=8A=8Aip=E5=AD=98=E6=88=90=E5=8A=9F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcp2ws.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tcp2ws.go b/tcp2ws.go index d47ff46..0fcf97b 100644 --- a/tcp2ws.go +++ b/tcp2ws.go @@ -1,7 +1,7 @@ // Tcp over WebSocket (tcp2ws) // 基于ws的内网穿透工具 // Sparkle 20210430 -// 10.3 +// 10.4 package main @@ -93,6 +93,7 @@ func dialNewWs(uuid string) bool { log.Print("dial ", uuid) // call ws dialer := websocket.Dialer{TLSClientConfig: &tls.Config{RootCAs: nil, InsecureSkipVerify: true}, Proxy: http.ProxyFromEnvironment, NetDial: meDial} + // println("tcpAddr ", tcpAddr, " wsAddr ", wsAddr, " wsAddrIp ", wsAddrIp, " wsAddrPort ", wsAddrPort) wsConn, _, err := dialer.Dial(wsAddr, nil) if err != nil { log.Print("connect to ws err: ", err) @@ -629,7 +630,7 @@ func dnsPreferIpWithTtl(hostname string, ttl uint32) { func main() { arg_num := len(os.Args) if arg_num < 3 { - fmt.Println("TCP over WebSocket (tcp2ws) with UDP support 10.3\nhttps://github.com/zanjie1999/tcp-over-websocket") + fmt.Println("TCP over WebSocket (tcp2ws) with UDP support 10.4\nhttps://github.com/zanjie1999/tcp-over-websocket") fmt.Println("Client: ws://tcp2wsUrl localPort\nServer: ip:port tcp2wsPort\nUse wss: ip:port tcp2wsPort server.crt server.key") fmt.Println("Make ssl cert:\nopenssl genrsa -out server.key 2048\nopenssl ecparam -genkey -name secp384r1 -out server.key\nopenssl req -new -x509 -sha256 -key server.key -out server.crt -days 36500") os.Exit(0) @@ -724,7 +725,8 @@ func main() { log.Print("tcping "+wsAddrIp+" ", tcping(wsAddrIp, wsAddrPort), "ms") } else { // 域名，需要解析，ip优选 - wsAddrIp, ttl := dnsPreferIp(u.Hostname()) + var ttl uint32 + wsAddrIp, ttl = dnsPreferIp(u.Hostname()) if wsAddrIp == "" { log.Fatal("tcp2ws Client Start Error: dns resolve error") } else if ttl > 0 {