From 3c620ad156ca51a3965dacec521e23c0f979640a Mon Sep 17 00:00:00 2001 From: IrineSistiana <49315432+IrineSistiana@users.noreply.github.com> Date: Tue, 29 Sep 2020 01:31:30 +0800 Subject: [PATCH] fixed #13 sip003 args in server side --- main.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/main.go b/main.go index 16a0bb7..d90886e 100644 --- a/main.go +++ b/main.go @@ -41,7 +41,6 @@ import ( var version = "unknown/dev" func main() { - log.Printf("main: simple-tls %s", version) go func() { //wait signals osSignals := make(chan os.Signal, 1) @@ -150,14 +149,6 @@ func main() { if sip003Args != nil { log.Print("main: simple-tls is running as a sip003 plugin") - if isServer { - dstAddr = sip003Args.GetLocalAddr() - bindAddr = sip003Args.GetRemoteAddr() - } else { - bindAddr = sip003Args.GetLocalAddr() - dstAddr = sip003Args.GetRemoteAddr() - } - // android only _, vpn = sip003Args.SS_PLUGIN_OPTIONS["V"] @@ -200,6 +191,14 @@ func main() { } _, ok = sip003Args.SS_PLUGIN_OPTIONS["fast-open"] tfo = tfo || ok + + if isServer { + dstAddr = sip003Args.GetLocalAddr() + bindAddr = sip003Args.GetRemoteAddr() + } else { + bindAddr = sip003Args.GetLocalAddr() + dstAddr = sip003Args.GetRemoteAddr() + } } timeout = time.Duration(timeoutFlag) * time.Second @@ -212,6 +211,8 @@ func main() { log.Fatal("main: destination addr is required") } + log.Printf("main: simple-tls %s (go version: %s, os: %s, arch: %s)", version, runtime.Version(), runtime.GOOS, runtime.GOARCH) + if isServer { var certificates []tls.Certificate