personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-11-22 08:24:25 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

checkpt3

Browse Source
This commit is contained in:
JackDoan
2025-10-30 16:51:03 -05:00
parent 9e38065673
commit 469a5fc350
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface.go
View File

@@ -271,7 +271,7 @@ func (f *Interface) listenOut(i int) {
fwPacket := &firewall.Packet{} fwPacket := &firewall.Packet{}
nb := make([]byte, 12, 12) nb := make([]byte, 12, 12)
li.ListenOut(func(fromUdpAddr netip.AddrPort, payload []byte) { li.ListenOut(func(fromUdpAddr netip.AddrPort, payload []byte, q int) {
f.readOutsidePackets(fromUdpAddr, nil, plaintext[:0], payload, h, fwPacket, lhh, nb, i, ctCache.Get(f.l)) f.readOutsidePackets(fromUdpAddr, nil, plaintext[:0], payload, h, fwPacket, lhh, nb, i, ctCache.Get(f.l))
}) })
} }

1
udp/conn.go
View File

@@ -11,6 +11,7 @@ const MTU = 9001
type EncReader func( type EncReader func(
addr netip.AddrPort, addr netip.AddrPort,
payload []byte, payload []byte,
q int,
) )
type Conn interface { type Conn interface {

48
udp/udp_linux.go
View File

@@ -25,7 +25,7 @@ const (
defaultGSOMaxSegments = 64 defaultGSOMaxSegments = 64
defaultGSOMaxBytes = 64000 defaultGSOMaxBytes = 64000
defaultGROReadBufferSize = 2 * defaultGSOMaxBytes defaultGROReadBufferSize = 2 * defaultGSOMaxBytes
defaultGSOFlushTimeout = 50 * time.Microsecond defaultGSOFlushTimeout = 100 * time.Microsecond
) )
type StdConn struct { type StdConn struct {
@@ -171,19 +171,17 @@ func (u *StdConn) ListenOut(r EncReader) {
for { for {
//desiredControl := int(u.controlLen.Load()) //desiredControl := int(u.controlLen.Load())
hasControl := len(controls) > 0 //hasControl := len(controls) > 0
//if (desiredControl > 0) != hasControl || (desiredControl > 0 && hasControl && len(controls[0]) != desiredControl) { //if (desiredControl > 0) != hasControl || (desiredControl > 0 && hasControl && len(controls[0]) != desiredControl) {
// msgs, buffers, names, controls = u.PrepareRawMessages(u.batch) // msgs, buffers, names, controls = u.PrepareRawMessages(u.batch)
// hasControl = len(controls) > 0 // hasControl = len(controls) > 0
//} //}
// //
if hasControl { for i := range msgs {
for i := range msgs { if len(controls) <= i || len(controls[i]) == 0 {
if len(controls) <= i || len(controls[i]) == 0 { continue
continue
}
msgs[i].Hdr.Controllen = controllen(len(controls[i]))
} }
msgs[i].Hdr.Controllen = controllen(len(controls[i]))
} }
n, err := read(msgs) n, err := read(msgs)
@@ -224,7 +222,7 @@ func (u *StdConn) ListenOut(r EncReader) {
} }
} }
r(addr, buffers[i][:payloadLen]) r(addr, buffers[i][:payloadLen], 0)
} }
} }
} }
@@ -386,6 +384,7 @@ func (u *StdConn) writeToGSO(b []byte, addr netip.AddrPort) error {
} }
} }
inBuf := len(u.gsoPendingBuf) + len(b)
if len(u.gsoPendingBuf)+len(b) > u.gsoMaxBytes { if len(u.gsoPendingBuf)+len(b) > u.gsoMaxBytes {
if err := u.flushPendingLocked(); err != nil { if err := u.flushPendingLocked(); err != nil {
return err return err
@@ -405,7 +404,7 @@ func (u *StdConn) writeToGSO(b []byte, addr netip.AddrPort) error {
return u.flushPendingLocked() return u.flushPendingLocked()
} }
u.scheduleFlushLocked() u.scheduleFlushLocked(inBuf)
return nil return nil
} }
@@ -531,19 +530,25 @@ func (u *StdConn) sendSequentialLocked(buf []byte, addr netip.AddrPort, segSize
return nil return nil
} }
func (u *StdConn) scheduleFlushLocked() { func (u *StdConn) scheduleFlushLocked(inBuf int) {
if u.gsoFlushTimeout <= 0 { if u.gsoFlushTimeout <= 0 {
_ = u.flushPendingLocked() _ = u.flushPendingLocked()
return return
} }
t := u.gsoFlushTimeout
if inBuf > u.gsoMaxBytes/2 {
t = t / 2
}
if u.gsoFlushTimer == nil { if u.gsoFlushTimer == nil {
u.gsoFlushTimer = time.AfterFunc(u.gsoFlushTimeout, u.flushTimerHandler) u.gsoFlushTimer = time.AfterFunc(t, u.flushTimerHandler)
return return
} }
if !u.gsoFlushTimer.Stop() { if !u.gsoFlushTimer.Stop() {
// timer already fired or running; allow handler to exit if no data // timer already fired or running; allow handler to exit if no data
} }
u.gsoFlushTimer.Reset(u.gsoFlushTimeout) u.gsoFlushTimer.Reset(t)
} }
func (u *StdConn) stopFlushTimerLocked() { func (u *StdConn) stopFlushTimerLocked() {
@@ -621,7 +626,8 @@ func (u *StdConn) emitSegments(r EncReader, addr netip.AddrPort, payload []byte,
} }
//segment := append([]byte(nil), payload[start:end]...) //segment := append([]byte(nil), payload[start:end]...)
r(addr, payload[start:end]) //q := numSegments % 4 //TODO
r(addr, payload[start:end], 0)
numSegments++ numSegments++
//segments = append(segments, segment) //segments = append(segments, segment)
start = end start = end
@@ -714,12 +720,14 @@ func (u *StdConn) parseGROSegment(msg *rawMessage, control []byte) (int, int) {
if len(c.Data) >= 4 { if len(c.Data) >= 4 {
segCount = int(binary.NativeEndian.Uint16(c.Data[2:4])) segCount = int(binary.NativeEndian.Uint16(c.Data[2:4]))
} }
u.l.WithFields(logrus.Fields{ if u.l.Level >= logrus.DebugLevel {
"tag": "gro-debug", u.l.WithFields(logrus.Fields{
"stage": "parse", "tag": "gro-debug",
"seg_size": segSize, "stage": "parse",
"seg_count": segCount, "seg_size": segSize,
}).Debug("gro-debug control parsed") "seg_count": segCount,
}).Debug("gro-debug control parsed")
}
return segSize, segCount return segSize, segCount
} }
} }