pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-03-10 04:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mobile' of github.com:fosrl/newt into mobile

Browse Source
This commit is contained in:
Owen
2026-01-12 14:22:01 -08:00
parent 8c12db6dff a62567997d
commit 66949ca047
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bind/shared_bind.go
View File

@@ -523,7 +523,7 @@ func (b *SharedBind) receiveIPv4Simple(conn *net.UDPConn, bufs [][]byte, sizes [
func (b *SharedBind) handleMagicPacket(data []byte, addr *net.UDPAddr) bool { func (b *SharedBind) handleMagicPacket(data []byte, addr *net.UDPAddr) bool {
// Check if this is a test request packet // Check if this is a test request packet
if len(data) >= MagicTestRequestLen && bytes.HasPrefix(data, MagicTestRequest) { if len(data) >= MagicTestRequestLen && bytes.HasPrefix(data, MagicTestRequest) {
logger.Debug("Received magic test REQUEST from %s, sending response", addr.String()) // logger.Debug("Received magic test REQUEST from %s, sending response", addr.String())
// Extract the random data portion to echo back // Extract the random data portion to echo back
echoData := data[len(MagicTestRequest) : len(MagicTestRequest)+MagicPacketDataLen] echoData := data[len(MagicTestRequest) : len(MagicTestRequest)+MagicPacketDataLen]
@@ -546,7 +546,7 @@ func (b *SharedBind) handleMagicPacket(data []byte, addr *net.UDPAddr) bool {
// Check if this is a test response packet // Check if this is a test response packet
if len(data) >= MagicTestResponseLen && bytes.HasPrefix(data, MagicTestResponse) { if len(data) >= MagicTestResponseLen && bytes.HasPrefix(data, MagicTestResponse) {
logger.Debug("Received magic test RESPONSE from %s", addr.String()) // logger.Debug("Received magic test RESPONSE from %s", addr.String())
// Extract the echoed data // Extract the echoed data
echoData := data[len(MagicTestResponse) : len(MagicTestResponse)+MagicPacketDataLen] echoData := data[len(MagicTestResponse) : len(MagicTestResponse)+MagicPacketDataLen]

4
holepunch/tester.go
View File

@@ -211,7 +211,7 @@ func (t *HolepunchTester) ClearCache() {
// handleResponse is called by SharedBind when a magic response is received // handleResponse is called by SharedBind when a magic response is received
func (t *HolepunchTester) handleResponse(addr netip.AddrPort, echoData []byte) { func (t *HolepunchTester) handleResponse(addr netip.AddrPort, echoData []byte) {
logger.Debug("Received magic response from %s", addr.String()) // logger.Debug("Received magic response from %s", addr.String())
key := string(echoData) key := string(echoData)
value, ok := t.pendingRequests.LoadAndDelete(key) value, ok := t.pendingRequests.LoadAndDelete(key)
@@ -223,7 +223,7 @@ func (t *HolepunchTester) handleResponse(addr netip.AddrPort, echoData []byte) {
req := value.(*pendingRequest) req := value.(*pendingRequest)
rtt := time.Since(req.sentAt) rtt := time.Since(req.sentAt)
logger.Debug("Magic response matched pending request for %s (RTT: %v)", req.endpoint, rtt) // logger.Debug("Magic response matched pending request for %s (RTT: %v)", req.endpoint, rtt)
// Send RTT to the waiting goroutine (non-blocking) // Send RTT to the waiting goroutine (non-blocking)
select { select {

2
network/interface.go
View File

@@ -49,7 +49,7 @@ func ConfigureInterface(interfaceName string, tunnelIp string, mtu int) error {
case "ios": case "ios":
return nil return nil
} }
return nil return nil
} }