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

Refactor

Browse Source
This commit is contained in:
jdl
2025-09-01 18:15:42 +02:00
parent 5f0b00ff46
commit 0a7328ed5f
11 changed files with 0 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
cmd/vppn/vppn
View File

Binary file not shown.

1
peer/bufferset.go
View File

@@ -1 +0,0 @@
package peer

1
peer/cipher.go
View File

@@ -1 +0,0 @@
package peer

69
peer/globals.go
View File

@@ -31,7 +31,6 @@ var multicastAddr = net.UDPAddrFromAddrPort(netip.AddrPortFrom(
netip.AddrFrom4([4]byte{224, 0, 0, 157}), netip.AddrFrom4([4]byte{224, 0, 0, 157}),
4560)) 4560))
<<<<<<< HEAD
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
type Globals struct { type Globals struct {
@@ -106,73 +105,5 @@ func NewGlobals(
g.RemotePeers[i].Store(newRemote(g, byte(i))) g.RemotePeers[i].Store(newRemote(g, byte(i)))
} }
return g
=======
type marshaller interface {
Marshal([]byte) []byte
>>>>>>> 69f2536 (WIP)
}
// ----------------------------------------------------------------------------
type Globals struct {
LocalConfig // Embed, immutable.
// Local public address (if available). Immutable.
LocalAddr netip.AddrPort
// True if local public address is valid. Immutable.
LocalAddrValid bool
// All remote peers by VPN IP.
RemotePeers [256]*atomic.Pointer[Remote]
// Discovered public addresses.
PubAddrs *pubAddrStore
// Attempts to ensure that we have a relay available.
RelayHandler *relayHandler
// Send UDP - Global function to write UDP packets.
SendUDP func(b []byte, addr netip.AddrPort) (n int, err error)
// Global TUN interface.
IFace io.ReadWriteCloser
}
func NewGlobals(
localConfig LocalConfig,
localAddr netip.AddrPort,
conn *net.UDPConn,
iface io.ReadWriteCloser,
) (g Globals) {
g.LocalConfig = localConfig
g.LocalAddr = localAddr
g.LocalAddrValid = localAddr.IsValid()
g.PubAddrs = newPubAddrStore(localAddr)
g.RelayHandler = newRelayHandler()
// Use a lock here avoids starvation, at least on my Linux machine.
sendLock := sync.Mutex{}
g.SendUDP = func(b []byte, addr netip.AddrPort) (int, error) {
sendLock.Lock()
n, err := conn.WriteToUDPAddrPort(b, addr)
sendLock.Unlock()
return n, err
}
g.IFace = iface
for i := range g.RemotePeers {
g.RemotePeers[i] = &atomic.Pointer[Remote]{}
}
for i := range g.RemotePeers {
g.RemotePeers[i].Store(newRemote(g, byte(i)))
}
return g return g
} }

1
peer/mcreader.go
View File

@@ -41,7 +41,6 @@ func runMCReaderInner(g Globals) {
logf("Failed to open discovery packet?") logf("Failed to open discovery packet?")
continue continue
} }
log.Printf("Got local discovery from %v: %v", remoteAddr, h)
g.RemotePeers[h.SourceIP].Load().HandleLocalDiscoveryPacket(h, remoteAddr, buf) g.RemotePeers[h.SourceIP].Load().HandleLocalDiscoveryPacket(h, remoteAddr, buf)
} }

10
peer/peer.go
View File

@@ -11,10 +11,7 @@ import (
"net/http" "net/http"
"net/netip" "net/netip"
"net/url" "net/url"
<<<<<<< HEAD
"os" "os"
=======
>>>>>>> 69f2536 (WIP)
"vppn/m" "vppn/m"
) )
@@ -53,7 +50,6 @@ func newPeerMain(args mainArgs) *peerMain {
log.Fatalf("Failed to load network state: %v", err) log.Fatalf("Failed to load network state: %v", err)
} }
<<<<<<< HEAD
startupCount, err := loadStartupCount(args.NetName) startupCount, err := loadStartupCount(args.NetName)
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
@@ -70,8 +66,6 @@ func newPeerMain(args mainArgs) *peerMain {
log.Fatalf("Failed to write startup count: %v", err) log.Fatalf("Failed to write startup count: %v", err)
} }
=======
>>>>>>> 69f2536 (WIP)
iface, err := openInterface(config.Network, config.LocalPeerIP, args.NetName) iface, err := openInterface(config.Network, config.LocalPeerIP, args.NetName)
if err != nil { if err != nil {
log.Fatalf("Failed to open interface: %v", err) log.Fatalf("Failed to open interface: %v", err)
@@ -99,11 +93,7 @@ func newPeerMain(args mainArgs) *peerMain {
localAddr = netip.AddrPortFrom(ip, localPeer.Port) localAddr = netip.AddrPortFrom(ip, localPeer.Port)
} }
<<<<<<< HEAD
g := NewGlobals(config, startupCount, localAddr, conn, iface) g := NewGlobals(config, startupCount, localAddr, conn, iface)
=======
g := NewGlobals(config, localAddr, conn, iface)
>>>>>>> 69f2536 (WIP)
hubPoller, err := NewHubPoller(g, args.NetName, args.HubAddress, args.APIKey) hubPoller, err := NewHubPoller(g, args.NetName, args.HubAddress, args.APIKey)
if err != nil { if err != nil {

1
peer/peersuper.go
View File

@@ -1 +0,0 @@
package peer

1
peer/relay.go
View File

@@ -1 +0,0 @@
package peer

102
peer/remote.go
View File

@@ -6,14 +6,7 @@ import (
"net/netip" "net/netip"
"strings" "strings"
"sync/atomic" "sync/atomic"
<<<<<<< HEAD
"vppn/m" "vppn/m"
=======
"time"
"vppn/m"
"git.crumpington.com/lib/go/ratelimiter"
>>>>>>> 69f2536 (WIP)
) )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -44,10 +37,6 @@ type Remote struct {
Globals Globals
RemotePeerIP byte // Immutable. RemotePeerIP byte // Immutable.
<<<<<<< HEAD
=======
limiter *ratelimiter.Limiter
>>>>>>> 69f2536 (WIP)
dupCheck *dupCheck dupCheck *dupCheck
sendCounter uint64 // init to startupCount << 48. Atomic access only. sendCounter uint64 // init to startupCount << 48. Atomic access only.
@@ -60,19 +49,9 @@ func newRemote(g Globals, remotePeerIP byte) *Remote {
r := &Remote{ r := &Remote{
Globals: g, Globals: g,
RemotePeerIP: remotePeerIP, RemotePeerIP: remotePeerIP,
<<<<<<< HEAD
dupCheck: newDupCheck(0), dupCheck: newDupCheck(0),
sendCounter: (uint64(g.StartupCount) << 48) + 1, sendCounter: (uint64(g.StartupCount) << 48) + 1,
messages: make(chan any, 8), messages: make(chan any, 8),
=======
limiter: ratelimiter.New(ratelimiter.Config{
FillPeriod: 20 * time.Millisecond,
MaxWaitCount: 1,
}),
dupCheck: newDupCheck(0),
sendCounter: uint64(time.Now().Unix()<<30) + 1,
messages: make(chan any, 8),
>>>>>>> 69f2536 (WIP)
} }
r.config.Store(&remoteConfig{}) r.config.Store(&remoteConfig{})
return r return r
@@ -100,36 +79,19 @@ func (r *Remote) updateConf(conf remoteConfig) {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
func (r *Remote) sendUDP(b []byte, addr netip.AddrPort) { func (r *Remote) sendUDP(b []byte, addr netip.AddrPort) {
<<<<<<< HEAD
if _, err := r.SendUDP(b, addr); err != nil { if _, err := r.SendUDP(b, addr); err != nil {
r.logf("Failed to send UDP packet: %v", err) r.logf("Failed to send UDP packet: %v", err)
=======
if err := r.limiter.Limit(); err != nil {
r.logf("Rate limiter")
return
}
if _, err := r.SendUDP(b, addr); err != nil {
r.logf("Failed to send URP packet: %v", err)
>>>>>>> 69f2536 (WIP)
} }
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
<<<<<<< HEAD
func (r *Remote) encryptData(conf remoteConfig, destIP byte, packet []byte) []byte { func (r *Remote) encryptData(conf remoteConfig, destIP byte, packet []byte) []byte {
=======
func (r *Remote) encryptData(conf remoteConfig, packet []byte) []byte {
>>>>>>> 69f2536 (WIP)
h := Header{ h := Header{
StreamID: dataStreamID, StreamID: dataStreamID,
Counter: atomic.AddUint64(&r.sendCounter, 1), Counter: atomic.AddUint64(&r.sendCounter, 1),
SourceIP: r.Globals.LocalPeerIP, SourceIP: r.Globals.LocalPeerIP,
<<<<<<< HEAD
DestIP: destIP, DestIP: destIP,
=======
DestIP: r.RemotePeerIP,
>>>>>>> 69f2536 (WIP)
} }
return conf.DataCipher.Encrypt(h, packet, packet[len(packet):cap(packet)]) return conf.DataCipher.Encrypt(h, packet, packet[len(packet):cap(packet)])
} }
@@ -154,7 +116,6 @@ func (r *Remote) SendDataTo(data []byte) {
return return
} }
<<<<<<< HEAD
// Direct: // Direct:
if conf.Direct { if conf.Direct {
@@ -163,17 +124,6 @@ func (r *Remote) SendDataTo(data []byte) {
} }
// Relayed: // Relayed:
=======
if conf.Direct {
r.sendDataDirect(conf, data)
} else {
r.sendDataRelayed(conf, data)
}
}
// sendDataRelayed sends data to the remote via the relay.
func (r *Remote) sendDataRelayed(conf remoteConfig, data []byte) {
>>>>>>> 69f2536 (WIP)
relay := r.RelayHandler.Load() relay := r.RelayHandler.Load()
if relay == nil { if relay == nil {
@@ -181,29 +131,15 @@ func (r *Remote) sendDataRelayed(conf remoteConfig, data []byte) {
return return
} }
<<<<<<< HEAD
relay.relayData(conf.Peer.PeerIP, r.encryptData(conf, conf.Peer.PeerIP, data)) relay.relayData(conf.Peer.PeerIP, r.encryptData(conf, conf.Peer.PeerIP, data))
} }
func (r *Remote) relayData(toIP byte, enc []byte) { func (r *Remote) relayData(toIP byte, enc []byte) {
=======
relay.relayData(r.encryptData(conf, data))
}
// sendDataDirect sends data to the remote directly.
func (r *Remote) sendDataDirect(conf remoteConfig, data []byte) {
r.logf("Sending data direct...")
r.sendUDP(r.encryptData(conf, data), conf.DirectAddr)
}
func (r *Remote) relayData(enc []byte) {
>>>>>>> 69f2536 (WIP)
conf := r.conf() conf := r.conf()
if !conf.Up || !conf.Direct { if !conf.Up || !conf.Direct {
r.logf("Cannot relay: not up or not a direct connection") r.logf("Cannot relay: not up or not a direct connection")
return return
} }
<<<<<<< HEAD
r.sendUDP(r.encryptData(conf, toIP, enc), conf.DirectAddr) r.sendUDP(r.encryptData(conf, toIP, enc), conf.DirectAddr)
} }
@@ -218,32 +154,6 @@ func (r *Remote) sendControl(conf remoteConfig, data []byte) {
// Relayed: // Relayed:
=======
r.sendDataDirect(conf, enc)
}
func (r *Remote) sendControl(conf remoteConfig, data []byte) {
if conf.Direct {
r.sendControlDirect(conf, data)
} else {
r.sendControlRelayed(conf, data)
}
}
func (r *Remote) sendControlToAddr(buf []byte, addr netip.AddrPort) {
enc := r.encryptControl(r.conf(), buf)
r.sendUDP(enc, addr)
}
func (r *Remote) sendControlDirect(conf remoteConfig, data []byte) {
r.logf("Sending control direct...")
enc := r.encryptControl(conf, data)
r.sendUDP(enc, conf.DirectAddr)
}
func (r *Remote) sendControlRelayed(conf remoteConfig, data []byte) {
r.logf("Sending control relayed...")
>>>>>>> 69f2536 (WIP)
relay := r.RelayHandler.Load() relay := r.RelayHandler.Load()
if relay == nil { if relay == nil {
@@ -251,16 +161,12 @@ func (r *Remote) sendControlRelayed(conf remoteConfig, data []byte) {
return return
} }
<<<<<<< HEAD
relay.relayData(conf.Peer.PeerIP, r.encryptControl(conf, data)) relay.relayData(conf.Peer.PeerIP, r.encryptControl(conf, data))
} }
func (r *Remote) sendControlToAddr(buf []byte, addr netip.AddrPort) { func (r *Remote) sendControlToAddr(buf []byte, addr netip.AddrPort) {
enc := r.encryptControl(r.conf(), buf) enc := r.encryptControl(r.conf(), buf)
r.sendUDP(enc, addr) r.sendUDP(enc, addr)
=======
relay.relayData(r.encryptControl(conf, data))
>>>>>>> 69f2536 (WIP)
} }
func (r *Remote) forwardPacket(data []byte) { func (r *Remote) forwardPacket(data []byte) {
@@ -338,13 +244,9 @@ func (r *Remote) handleDataPacket(h Header, data []byte) {
// For local. // For local.
if h.DestIP == r.LocalPeerIP { if h.DestIP == r.LocalPeerIP {
if _, err := r.IFace.Write(dec); err != nil { if _, err := r.IFace.Write(dec); err != nil {
<<<<<<< HEAD
// This could be a malformed packet from a peer, so we don't crash if it // This could be a malformed packet from a peer, so we don't crash if it
// happens. // happens.
r.logf("Failed to write to interface: %v", err) r.logf("Failed to write to interface: %v", err)
=======
log.Fatalf("Failed to write to interface: %v", err)
>>>>>>> 69f2536 (WIP)
} }
return return
} }
@@ -373,10 +275,6 @@ func (r *Remote) HandleLocalDiscoveryPacket(h Header, srcAddr netip.AddrPort, da
SrcIP: h.SourceIP, SrcIP: h.SourceIP,
SrcAddr: srcAddr, SrcAddr: srcAddr,
} }
<<<<<<< HEAD
=======
r.logf("Got local discovery packet from %v.", srcAddr)
>>>>>>> 69f2536 (WIP)
select { select {
case r.messages <- msg: case r.messages <- msg:

40
peer/remotefsm.go
View File

@@ -9,14 +9,11 @@ import (
type stateFunc func(msg any) stateFunc type stateFunc func(msg any) stateFunc
<<<<<<< HEAD
type sentProbe struct { type sentProbe struct {
SentAt time.Time SentAt time.Time
Addr netip.AddrPort Addr netip.AddrPort
} }
=======
>>>>>>> 69f2536 (WIP)
type remoteFSM struct { type remoteFSM struct {
*Remote *Remote
@@ -164,23 +161,13 @@ func (r *remoteFSM) stateServer_onInit(msg controlMsg[packetInit]) {
} }
func (r *remoteFSM) stateServer_onSyn(msg controlMsg[packetSyn]) { func (r *remoteFSM) stateServer_onSyn(msg controlMsg[packetSyn]) {
<<<<<<< HEAD
=======
r.logf("Got SYN: %v", msg.Packet)
>>>>>>> 69f2536 (WIP)
r.lastSeen = time.Now() r.lastSeen = time.Now()
p := msg.Packet p := msg.Packet
// Before we can respond to this packet, we need to make sure the // Before we can respond to this packet, we need to make sure the
// route is setup properly. // route is setup properly.
conf := r.conf() conf := r.conf()
<<<<<<< HEAD
logSyn := !conf.Up || conf.Direct != p.Direct logSyn := !conf.Up || conf.Direct != p.Direct
=======
if !conf.Up || conf.Direct != p.Direct {
r.logf("Got SYN.")
}
>>>>>>> 69f2536 (WIP)
conf.Up = true conf.Up = true
conf.Direct = p.Direct conf.Direct = p.Direct
@@ -194,13 +181,10 @@ func (r *remoteFSM) stateServer_onSyn(msg controlMsg[packetSyn]) {
r.updateConf(conf) r.updateConf(conf)
<<<<<<< HEAD
if logSyn { if logSyn {
r.logf("Got SYN.") r.logf("Got SYN.")
} }
=======
>>>>>>> 69f2536 (WIP)
r.sendControl(conf, packetAck{ r.sendControl(conf, packetAck{
TraceID: p.TraceID, TraceID: p.TraceID,
ToAddr: conf.DirectAddr, ToAddr: conf.DirectAddr,
@@ -217,11 +201,7 @@ func (r *remoteFSM) stateServer_onSyn(msg controlMsg[packetSyn]) {
break break
} }
r.logf("Probing %v...", addr) r.logf("Probing %v...", addr)
<<<<<<< HEAD
r.sendControlToAddr(packetProbe{TraceID: r.NewTraceID()}.Marshal(r.buf), addr) r.sendControlToAddr(packetProbe{TraceID: r.NewTraceID()}.Marshal(r.buf), addr)
=======
r.sendControlToAddr(packetProbe{TraceID: newTraceID()}.Marshal(r.buf), addr)
>>>>>>> 69f2536 (WIP)
} }
} }
@@ -289,11 +269,7 @@ func (r *remoteFSM) stateClientInit(iMsg any) stateFunc {
func (r *remoteFSM) stateClientInit_sendInit() { func (r *remoteFSM) stateClientInit_sendInit() {
conf := r.conf() conf := r.conf()
<<<<<<< HEAD
r.traceID = r.NewTraceID() r.traceID = r.NewTraceID()
=======
r.traceID = newTraceID()
>>>>>>> 69f2536 (WIP)
init := packetInit{ init := packetInit{
TraceID: r.traceID, TraceID: r.traceID,
Direct: conf.Direct, Direct: conf.Direct,
@@ -340,11 +316,7 @@ func (r *remoteFSM) enterClient() stateFunc {
conf := r.conf() conf := r.conf()
r.probes = make(map[uint64]sentProbe, 8) r.probes = make(map[uint64]sentProbe, 8)
<<<<<<< HEAD
r.traceID = r.NewTraceID() r.traceID = r.NewTraceID()
=======
r.traceID = newTraceID()
>>>>>>> 69f2536 (WIP)
r.stateClient_sendSyn(conf) r.stateClient_sendSyn(conf)
r.pingTimer.Reset(pingInterval) r.pingTimer.Reset(pingInterval)
@@ -410,11 +382,7 @@ func (r *remoteFSM) stateClient_cleanProbes() {
} }
func (r *remoteFSM) stateClient_sendProbeTo(addr netip.AddrPort) { func (r *remoteFSM) stateClient_sendProbeTo(addr netip.AddrPort) {
<<<<<<< HEAD
probe := packetProbe{TraceID: r.NewTraceID()} probe := packetProbe{TraceID: r.NewTraceID()}
=======
probe := packetProbe{TraceID: newTraceID()}
>>>>>>> 69f2536 (WIP)
r.probes[probe.TraceID] = sentProbe{ r.probes[probe.TraceID] = sentProbe{
SentAt: time.Now(), SentAt: time.Now(),
Addr: addr, Addr: addr,
@@ -440,11 +408,7 @@ func (r *remoteFSM) stateClient_onProbe(msg controlMsg[packetProbe]) {
conf.DirectAddr = sent.Addr conf.DirectAddr = sent.Addr
r.updateConf(conf) r.updateConf(conf)
<<<<<<< HEAD
r.traceID = r.NewTraceID() r.traceID = r.NewTraceID()
=======
r.traceID = newTraceID()
>>>>>>> 69f2536 (WIP)
r.stateClient_sendSyn(conf) r.stateClient_sendSyn(conf)
r.logf("Successful probe to %v.", sent.Addr) r.logf("Successful probe to %v.", sent.Addr)
} }
@@ -471,10 +435,6 @@ func (r *remoteFSM) stateClient_onPingTimer() stateFunc {
return r.enterClientInit() return r.enterClientInit()
} }
<<<<<<< HEAD
=======
r.traceID = newTraceID()
>>>>>>> 69f2536 (WIP)
r.stateClient_sendSyn(conf) r.stateClient_sendSyn(conf)
return r.stateClient return r.stateClient
} }

1
peer/remotestate-disconnected.go
View File

@@ -1 +0,0 @@
package peer