fixed more race conditions, improved logging

Author: shadowy-pycoder

colorize.go

@@ -18,7 +18,7 @@ import (
 
 var (
 	ipPortPattern = regexp.MustCompile(
-		`\b(?:\d{1,3}\.){3}\d{1,3}(?::(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]?\d{1,4}))?\b`,
+		`(?:\[(?:[0-9a-fA-F:.]+)\]|(?:\d{1,3}\.){3}\d{1,3})(?::(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]?\d{1,4}))?`,
 	)
 	domainPattern = regexp.MustCompile(
 		`\b(?:[a-zA-Z0-9-]{1,63}\.)+(?:com|net|org|io|co|uk|ru|de|edu|gov|info|biz|dev|app|ai)(?::(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]?\d{1,4}))?\b`,

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/rs/zerolog v1.34.0
 	github.com/shadowy-pycoder/colors v0.0.1
-	github.com/shadowy-pycoder/mshark v0.0.10
+	github.com/shadowy-pycoder/mshark v0.0.12
 	github.com/wzshiming/socks5 v0.5.2
 	golang.org/x/sys v0.33.0
 	golang.org/x/term v0.32.0

go.sum

@@ -30,8 +30,8 @@ github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/shadowy-pycoder/colors v0.0.1 h1:weCj/YIOupqy4BSP8KuVzr20fC+cuAv/tArz7bhhkP4=
 github.com/shadowy-pycoder/colors v0.0.1/go.mod h1:lkrJS1PY2oVigNLTT6pkbF7B/v0YcU2LD5PZnss1Q4U=
-github.com/shadowy-pycoder/mshark v0.0.10 h1:pLMIsgfvnO0oKeBNdy0fTGQsx//6scCPT52g93CqyT4=
-github.com/shadowy-pycoder/mshark v0.0.10/go.mod h1:FqbHFdsx0zMnrZZH0+oPzaFcleP4O+tUWv8i5gxo87k=
+github.com/shadowy-pycoder/mshark v0.0.12 h1:1zPAQLhKu1pxAZTm5oqUahywJ7SIpx9ds9/ytz5TwaU=
+github.com/shadowy-pycoder/mshark v0.0.12/go.mod h1:FqbHFdsx0zMnrZZH0+oPzaFcleP4O+tUWv8i5gxo87k=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/wzshiming/socks5 v0.5.2 h1:LtoowVNwAmkIQSkP1r1Wg435xUmC+tfRxorNW30KtnM=

helpers.go

@@ -199,7 +199,7 @@ func createSysctlOptCmd(opt, value, setex string, opts map[string]string, debug
     `, setex, opt, value))
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	if debug {
+	if !debug {
 		cmd.Stdout = nil
 	}
 	return cmd

tproxy_linux.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"os/exec"
 	"sync"
+	"sync/atomic"
 	"syscall"
 	"time"
 	"unsafe"
@@ -22,10 +23,11 @@ import (
 )
 
 type tproxyServer struct {
-	listener net.Listener
-	quit     chan struct{}
-	wg       sync.WaitGroup
-	p        *proxyapp
+	listener     net.Listener
+	quit         chan struct{}
+	wg           sync.WaitGroup
+	p            *proxyapp
+	startingFlag atomic.Bool
 }
 
 func newTproxyServer(p *proxyapp) *tproxyServer {
@@ -63,8 +65,10 @@ func newTproxyServer(p *proxyapp) *tproxyServer {
 }
 
 func (ts *tproxyServer) ListenAndServe() {
+	ts.startingFlag.Store(true)
 	ts.wg.Add(1)
 	go ts.serve()
+	ts.startingFlag.Store(false)
 }
 
 func (ts *tproxyServer) serve() {
@@ -146,10 +150,8 @@ func (ts *tproxyServer) handleConnection(srcConn net.Conn) {
 			ts.p.logger.Error().Err(err).Msgf("[tcp %s] Failed to get destination address", ts.p.tproxyMode)
 			return
 		}
-		ts.p.logger.Debug().Msgf("[tcp %s] getsockopt SO_ORIGINAL_DST %s", ts.p.tproxyMode, dst)
 	case "tproxy":
 		dst = srcConn.LocalAddr().String()
-		ts.p.logger.Debug().Msgf("[tcp %s] IP_TRANSPARENT %s", ts.p.tproxyMode, dst)
 	default:
 		ts.p.logger.Fatal().Msg("Unknown tproxyMode")
 	}
@@ -220,6 +222,9 @@ func (ts *tproxyServer) handleConnection(srcConn net.Conn) {
 }
 
 func (ts *tproxyServer) Shutdown() {
+	for ts.startingFlag.Load() {
+		time.Sleep(50 * time.Millisecond)
+	}
 	close(ts.quit)
 	ts.listener.Close()
 	done := make(chan struct{})