fosrl/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2025-05-13 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace more logs

Browse source
This commit is contained in:
Owen Schwartz 2024-11-23 19:37:52 -05:00
parent 7c6c4237cf
commit 79c16a5705
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
proxy/manager.go
View file

@ -3,8 +3,8 @@ package proxy
import ( import (
"fmt" "fmt"
"io" "io"
"log"
"net" "net"
"newt/logger"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -154,7 +154,7 @@ func (pm *ProxyManager) serveTCP(target *ProxyTarget) {
Port: target.Port, Port: target.Port,
}) })
if err != nil { if err != nil {
log.Printf("Failed to start TCP listener for %s:%d: %v", target.Listen, target.Port, err) logger.Info("Failed to start TCP listener for %s:%d: %v", target.Listen, target.Port, err)
return return
} }
@ -163,7 +163,7 @@ func (pm *ProxyManager) serveTCP(target *ProxyTarget) {
target.Unlock() target.Unlock()
defer listener.Close() defer listener.Close()
log.Printf("TCP proxy listening on %s", listener.Addr()) logger.Info("TCP proxy listening on %s", listener.Addr())
var activeConns sync.WaitGroup var activeConns sync.WaitGroup
acceptDone := make(chan struct{}) acceptDone := make(chan struct{})
@ -184,7 +184,7 @@ func (pm *ProxyManager) serveTCP(target *ProxyTarget) {
activeConns.Wait() activeConns.Wait()
return return
default: default:
log.Printf("Failed to accept TCP connection: %v", err) logger.Info("Failed to accept TCP connection: %v", err)
// Don't return here, try to accept new connections // Don't return here, try to accept new connections
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
@ -204,7 +204,7 @@ func (pm *ProxyManager) handleTCPConnection(clientConn net.Conn, target string,
serverConn, err := net.Dial("tcp", target) serverConn, err := net.Dial("tcp", target)
if err != nil { if err != nil {
log.Printf("Failed to connect to target %s: %v", target, err) logger.Info("Failed to connect to target %s: %v", target, err)
return return
} }
defer serverConn.Close() defer serverConn.Close()
@ -247,7 +247,7 @@ func (pm *ProxyManager) serveUDP(target *ProxyTarget) {
conn, err := pm.tnet.ListenUDP(addr) conn, err := pm.tnet.ListenUDP(addr)
if err != nil { if err != nil {
log.Printf("Failed to start UDP listener for %s:%d: %v", target.Listen, target.Port, err) logger.Info("Failed to start UDP listener for %s:%d: %v", target.Listen, target.Port, err)
return return
} }
@ -256,7 +256,7 @@ func (pm *ProxyManager) serveUDP(target *ProxyTarget) {
target.Unlock() target.Unlock()
defer conn.Close() defer conn.Close()
log.Printf("UDP proxy listening on %s", conn.LocalAddr()) logger.Info("UDP proxy listening on %s", conn.LocalAddr())
buffer := make([]byte, 65535) buffer := make([]byte, 65535)
var activeConns sync.WaitGroup var activeConns sync.WaitGroup
@ -274,14 +274,14 @@ func (pm *ProxyManager) serveUDP(target *ProxyTarget) {
activeConns.Wait() activeConns.Wait()
return return
default: default:
log.Printf("Failed to read UDP packet: %v", err) logger.Info("Failed to read UDP packet: %v", err)
continue continue
} }
} }
targetAddr, err := net.ResolveUDPAddr("udp", target.Target) targetAddr, err := net.ResolveUDPAddr("udp", target.Target)
if err != nil { if err != nil {
log.Printf("Failed to resolve target address %s: %v", target.Target, err) logger.Info("Failed to resolve target address %s: %v", target.Target, err)
continue continue
} }
@ -290,7 +290,7 @@ func (pm *ProxyManager) serveUDP(target *ProxyTarget) {
defer activeConns.Done() defer activeConns.Done()
targetConn, err := net.DialUDP("udp", nil, targetAddr) targetConn, err := net.DialUDP("udp", nil, targetAddr)
if err != nil { if err != nil {
log.Printf("Failed to connect to target %s: %v", target.Target, err) logger.Info("Failed to connect to target %s: %v", target.Target, err)
return return
} }
defer targetConn.Close() defer targetConn.Close()
@ -301,20 +301,20 @@ func (pm *ProxyManager) serveUDP(target *ProxyTarget) {
default: default:
_, err = targetConn.Write(data) _, err = targetConn.Write(data)
if err != nil { if err != nil {
log.Printf("Failed to write to target: %v", err) logger.Info("Failed to write to target: %v", err)
return return
} }
response := make([]byte, 65535) response := make([]byte, 65535)
n, err := targetConn.Read(response) n, err := targetConn.Read(response)
if err != nil { if err != nil {
log.Printf("Failed to read response from target: %v", err) logger.Info("Failed to read response from target: %v", err)
return return
} }
_, err = conn.WriteTo(response[:n], remote) _, err = conn.WriteTo(response[:n], remote)
if err != nil { if err != nil {
log.Printf("Failed to write response to client: %v", err) logger.Info("Failed to write response to client: %v", err)
} }
} }
}(buffer[:n], remoteAddr) }(buffer[:n], remoteAddr)