From 6e211cc4a4b5e0085983e7efb88dbc3d9213ec30 Mon Sep 17 00:00:00 2001 From: codesoap Date: Sat, 4 Apr 2026 22:08:05 +0200 Subject: [PATCH] Remove unnecessary code --- internal/analyzer/checker.go | 2 +- internal/relay/relay.go | 11 ++++------- wpex.go | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/analyzer/checker.go b/internal/analyzer/checker.go index 509e5d5..bdf45e4 100644 --- a/internal/analyzer/checker.go +++ b/internal/analyzer/checker.go @@ -14,7 +14,7 @@ type macChecker struct { } func (c *macChecker) cookie(addr net.UDPAddr) [16]byte { - ticks := uint64(time.Now().Sub(c.start) / (time.Duration(120) * time.Minute)) + ticks := uint64(time.Since(c.start) / (120 * time.Minute)) addrBytes, _ := addr.AddrPort().MarshalBinary() return mac32(nil, c.secret, binary.BigEndian.AppendUint64(nil, ticks), addrBytes) } diff --git a/internal/relay/relay.go b/internal/relay/relay.go index d91a697..9e42ee3 100644 --- a/internal/relay/relay.go +++ b/internal/relay/relay.go @@ -2,7 +2,6 @@ package relay import ( "context" - "fmt" "github.com/weiiwang01/wpex/internal/analyzer" "golang.org/x/time/rate" "log" @@ -36,11 +35,9 @@ func (r *Relay) relay(conn *net.UDPConn) { packet := buf[:n] peers, send := r.analyzer.Analyse(packet, *remoteAddr) for _, peer := range peers { - if len(peers) > 1 { - if !r.limit.Allow() { - slog.Warn("broadcast rate limit exceeded", "src", remoteAddr.String(), "dst", peer.String()) - continue - } + if !r.limit.Allow() { + slog.Warn("broadcast rate limit exceeded", "src", remoteAddr.String(), "dst", peer.String()) + continue } _, err := conn.WriteToUDP(send, &peer) if err != nil { @@ -70,7 +67,7 @@ func Start(address string, publicKeys [][]byte, broadcastLimit *rate.Limiter) { for i := 0; i < runtime.NumCPU(); i++ { l, err := lc.ListenPacket(context.Background(), "udp", address) if err != nil { - log.Fatal(fmt.Sprintf("failed to listen on %s: %s", address, err)) + log.Fatalf("failed to listen on %s: %s", address, err) } conn := l.(*net.UDPConn) go relay.relay(conn) diff --git a/wpex.go b/wpex.go index b50819e..2f1b9b1 100644 --- a/wpex.go +++ b/wpex.go @@ -49,7 +49,7 @@ func main() { for _, allow := range allows { k, err := base64.StdEncoding.DecodeString(allow) if err != nil || len(k) != 32 { - log.Fatal(fmt.Sprintf("invalid wireguard public key: '%s'", allow)) + log.Fatalf("invalid wireguard public key: '%s'", allow) } logger.Debug("allow wireguard public key", "key", allow) allowKeys = append(allowKeys, k)