Skip to content

Commit

Permalink
fixed #13 sip003 args in server side
Browse files Browse the repository at this point in the history
  • Loading branch information
IrineSistiana committed Sep 28, 2020
1 parent 8a9d2ec commit 3c620ad
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"]

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 3c620ad

Please sign in to comment.