Skip to content

Remove unnecessary code #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codesoap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unnecessary code #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/analyzer/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
11 changes: 4 additions & 7 deletions internal/relay/relay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package relay

import (
"context"
"fmt"
"github.com/weiiwang01/wpex/internal/analyzer"
"golang.org/x/time/rate"
"log"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion wpex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down