From da4990df068c90d00e605d6b54be25b277088620 Mon Sep 17 00:00:00 2001 From: octeep Date: Sun, 3 Apr 2022 19:42:19 +0100 Subject: [PATCH] replace log.Panic with log.Fatal --- cmd/wireproxy/main.go | 6 +++--- routine.go | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/wireproxy/main.go b/cmd/wireproxy/main.go index 110dd2f..5d91320 100644 --- a/cmd/wireproxy/main.go +++ b/cmd/wireproxy/main.go @@ -19,7 +19,7 @@ const daemonProcess = "daemon-process" func pledgeOrPanic(promises string) { err := protect.Pledge(promises) if err != nil { - log.Panic(err) + log.Fatal(err) } } @@ -54,7 +54,7 @@ func main() { conf, err := wireproxy.ParseConfig(*config) if err != nil { - log.Panic(err) + log.Fatal(err) } if *configTest { @@ -89,7 +89,7 @@ func main() { tnet, err := wireproxy.StartWireguard(conf.Device) if err != nil { - log.Panic(err) + log.Fatal(err) } for _, spawner := range conf.Routines { diff --git a/routine.go b/routine.go index e8d156c..8fcbe8c 100644 --- a/routine.go +++ b/routine.go @@ -122,11 +122,11 @@ func (config *Socks5Config) SpawnRoutine(vt *VirtualTun) { } server, err := socks5.New(conf) if err != nil { - log.Panic(err) + log.Fatal(err) } if err := server.ListenAndServe("tcp", config.BindAddress); err != nil { - log.Panic(err) + log.Fatal(err) } } @@ -165,19 +165,19 @@ func tcpClientForward(tnet *netstack.Net, target *net.TCPAddr, conn net.Conn) { func (conf *TCPClientTunnelConfig) SpawnRoutine(vt *VirtualTun) { raddr, err := vt.ResolveAddrPort(conf.Target) if err != nil { - log.Panic(err) + log.Fatal(err) } tcpAddr := TCPAddrFromAddrPort(*raddr) server, err := net.ListenTCP("tcp", conf.BindAddress) if err != nil { - log.Panic(err) + log.Fatal(err) } for { conn, err := server.Accept() if err != nil { - log.Panic(err) + log.Fatal(err) } go tcpClientForward(vt.tnet, tcpAddr, conn) } @@ -199,20 +199,20 @@ func tcpServerForward(target *net.TCPAddr, conn net.Conn) { func (conf *TCPServerTunnelConfig) SpawnRoutine(vt *VirtualTun) { raddr, err := vt.ResolveAddrPort(conf.Target) if err != nil { - log.Panic(err) + log.Fatal(err) } tcpAddr := TCPAddrFromAddrPort(*raddr) addr := &net.TCPAddr{Port: conf.ListenPort} server, err := vt.tnet.ListenTCP(addr) if err != nil { - log.Panic(err) + log.Fatal(err) } for { conn, err := server.Accept() if err != nil { - log.Panic(err) + log.Fatal(err) } go tcpServerForward(tcpAddr, conn) }