app/vppn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Added timeout to read failure in rdpControlConn to avoid spinning on error.

Browse Source
This commit is contained in:
jdl
2026-06-13 09:07:03 +02:00
parent f3d8a9ff75
commit a730211167
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
peer/control_conn.go
View File

@@ -4,6 +4,7 @@ import (
"log" "log"
"net" "net"
"net/netip" "net/netip"
"time"
"vppn/peer/control" "vppn/peer/control"
) )
@@ -32,11 +33,14 @@ func (c *udpControlConn) SendPing(dst netip.AddrPort, ping control.Ping, buf []b
// run reads incoming ping packets and forwards them to ch until ctx is done. // run reads incoming ping packets and forwards them to ch until ctx is done.
// Call this in a goroutine before starting the App event loop. // Call this in a goroutine before starting the App event loop.
func (c *udpControlConn) run(ch chan<- PingEvent) { func (c *udpControlConn) run(ch chan<- PingEvent) {
const errorTimeout = 8 * time.Second
var buf [control.Size]byte var buf [control.Size]byte
for { for {
n, src, err := c.conn.ReadFromUDP(buf[:]) n, src, err := c.conn.ReadFromUDP(buf[:])
if err != nil { if err != nil {
log.Printf("control read: %v", err) log.Printf("control read: %v", err)
time.Sleep(errorTimeout)
continue continue
} }

2
peer/wginterface/interface.go
View File

@@ -175,7 +175,7 @@ func nlAttr(attrType uint16, data []byte) []byte {
func ioctlSetAddr(name string, ip net.IP, prefixLen int) error { func ioctlSetAddr(name string, ip net.IP, prefixLen int) error {
if ip.To4() == nil { if ip.To4() == nil {
return errors.New("attempted to set nil IP on interface") return errors.New("attempted to set non-IPv4 address on interface")
} }
fd, err := unix.Socket(unix.AF_INET, unix.SOCK_DGRAM, unix.IPPROTO_IP) fd, err := unix.Socket(unix.AF_INET, unix.SOCK_DGRAM, unix.IPPROTO_IP)