Skip to content
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.

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

Proxy optimizations and wireguard tweaks #89

Merged
merged 4 commits into from
May 5, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
wireguard: tweak trick
Signed-off-by: Mark Pashmfouroush <mark@markpash.me>
markpash committed May 2, 2024
commit 1fa74243720be423af4db7f7671e797c8bcd6826
8 changes: 1 addition & 7 deletions wireguard/device/peer.go
Original file line number Diff line number Diff line change
@@ -53,8 +53,7 @@ type Peer struct {
inbound *autodrainingInboundQueue // sequential ordering of tun writing
}

trick bool
stopCh chan int
trick bool

cookieGenerator CookieGenerator
trieEntries list.List
@@ -80,7 +79,6 @@ func (device *Device) NewPeer(pk NoisePublicKey) (*Peer, error) {

// create peer
peer := new(Peer)
peer.stopCh = make(chan int, 1)
peer.cookieGenerator.Init(pk)
peer.device = device
peer.queue.outbound = newAutodrainingOutboundQueue(device)
@@ -267,10 +265,6 @@ func (peer *Peer) Stop() {
return
}

select {
case peer.stopCh <- 1:
default:
}
peer.device.log.Verbosef("%v - Stopping", peer)

peer.timersStop()
23 changes: 11 additions & 12 deletions wireguard/device/send.go
Original file line number Diff line number Diff line change
@@ -90,28 +90,27 @@ func randomInt(min, max int) int {
func (peer *Peer) sendRandomPackets() {
// Generate a random number of packets between 5 and 10
numPackets := randomInt(8, 15)
randomPacket := make([]byte, 100)
for i := 0; i < numPackets; i++ {
if peer.device.isClosed() || !peer.isRunning.Load() {
return
}

// Generate a random packet size between 10 and 40 bytes
packetSize := randomInt(40, 100)
randomPacket := make([]byte, packetSize)
_, err := rand.Read(randomPacket)
_, err := rand.Read(randomPacket[:packetSize])
if err != nil {
return
}

// Send the random packet
err = peer.SendBuffers([][]byte{randomPacket})
err = peer.SendBuffers([][]byte{randomPacket[:packetSize]})
if err != nil {
return
}

if i < numPackets-1 && peer.isRunning.Load() && !peer.device.isClosed() {
select {
case <-peer.stopCh:
// Wait for a random duration between 20 and 250 milliseconds
case <-time.After(time.Duration(randomInt(20, 250)) * time.Millisecond):
}
}
// Wait for a random duration between 20 and 250 milliseconds
<-time.After(time.Duration(randomInt(20, 250)) * time.Millisecond)
}
}

@@ -122,7 +121,7 @@ func (peer *Peer) SendKeepalive() {
// Send some random packets on every keepalive
if peer.trick {
peer.device.log.Verbosef("%v - Running tricks! (keepalive)", peer)
peer.sendRandomPackets()
go peer.sendRandomPackets()
}

elem := peer.device.NewOutboundElement()
@@ -161,7 +160,7 @@ func (peer *Peer) SendHandshakeInitiation(isRetry bool) error {
// send some random packets on handshake
if peer.trick {
peer.device.log.Verbosef("%v - Running tricks! (handshake)", peer)
peer.sendRandomPackets()
go peer.sendRandomPackets()
}

peer.handshake.lastSentHandshake = time.Now()