mirrors/wireproxy
1
0
Fork 0
mirror of https://github.com/whyvl/wireproxy.git synced 2025-04-29 19:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace log.Panic with log.Fatal

Browse source
This commit is contained in:
octeep 2022-04-03 19:42:19 +01:00
parent d1711b02b6
commit 6ab6551686
No known key found for this signature in database
GPG key ID: D8251F73BE242851
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/wireproxy/main.go
View file

@ -19,7 +19,7 @@ const daemonProcess = "daemon-process"
func pledgeOrPanic(promises string) { func pledgeOrPanic(promises string) {
err := protect.Pledge(promises) err := protect.Pledge(promises)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
} }
@ -54,7 +54,7 @@ func main() {
conf, err := wireproxy.ParseConfig(*config) conf, err := wireproxy.ParseConfig(*config)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
if *configTest { if *configTest {
@ -89,7 +89,7 @@ func main() {
tnet, err := wireproxy.StartWireguard(conf.Device) tnet, err := wireproxy.StartWireguard(conf.Device)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
for _, spawner := range conf.Routines { for _, spawner := range conf.Routines {

16
routine.go
View file

@ -122,11 +122,11 @@ func (config *Socks5Config) SpawnRoutine(vt *VirtualTun) {
} }
server, err := socks5.New(conf) server, err := socks5.New(conf)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
if err := server.ListenAndServe("tcp", config.BindAddress); err != nil { 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) { func (conf *TCPClientTunnelConfig) SpawnRoutine(vt *VirtualTun) {
raddr, err := vt.ResolveAddrPort(conf.Target) raddr, err := vt.ResolveAddrPort(conf.Target)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
tcpAddr := TCPAddrFromAddrPort(*raddr) tcpAddr := TCPAddrFromAddrPort(*raddr)
server, err := net.ListenTCP("tcp", conf.BindAddress) server, err := net.ListenTCP("tcp", conf.BindAddress)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
for { for {
conn, err := server.Accept() conn, err := server.Accept()
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
go tcpClientForward(vt.tnet, tcpAddr, conn) go tcpClientForward(vt.tnet, tcpAddr, conn)
} }
@ -199,20 +199,20 @@ func tcpServerForward(target *net.TCPAddr, conn net.Conn) {
func (conf *TCPServerTunnelConfig) SpawnRoutine(vt *VirtualTun) { func (conf *TCPServerTunnelConfig) SpawnRoutine(vt *VirtualTun) {
raddr, err := vt.ResolveAddrPort(conf.Target) raddr, err := vt.ResolveAddrPort(conf.Target)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
tcpAddr := TCPAddrFromAddrPort(*raddr) tcpAddr := TCPAddrFromAddrPort(*raddr)
addr := &net.TCPAddr{Port: conf.ListenPort} addr := &net.TCPAddr{Port: conf.ListenPort}
server, err := vt.tnet.ListenTCP(addr) server, err := vt.tnet.ListenTCP(addr)
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
for { for {
conn, err := server.Accept() conn, err := server.Accept()
if err != nil { if err != nil {
log.Panic(err) log.Fatal(err)
} }
go tcpServerForward(tcpAddr, conn) go tcpServerForward(tcpAddr, conn)
} }