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

it works I guess

Browse Source
This commit is contained in:
JackDoan
2025-11-07 20:18:43 -06:00
parent 9b29a3fe14
commit 1a51ee7884
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connection_state.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/slackhq/nebula/noiseutil" "github.com/slackhq/nebula/noiseutil"
) )
const ReplayWindow = 1024 const ReplayWindow = 4096
type ConnectionState struct { type ConnectionState struct {
eKey *NebulaCipherState eKey *NebulaCipherState

15
overlay/tun_linux.go
View File

@@ -106,9 +106,7 @@ func newTun(c *config.C, l *logrus.Logger, vpnNetworks []netip.Prefix, multiqueu
} }
var req ifReq var req ifReq
//todo
req.Flags = uint16(unix.IFF_TUN | unix.IFF_NO_PI | unix.IFF_TUN_EXCL | unix.IFF_VNET_HDR) req.Flags = uint16(unix.IFF_TUN | unix.IFF_NO_PI | unix.IFF_TUN_EXCL | unix.IFF_VNET_HDR)
//req.Flags = uint16(unix.IFF_TUN | unix.IFF_NO_PI | unix.IFF_TUN_EXCL)
if multiqueue { if multiqueue {
//req.Flags |= unix.IFF_MULTI_QUEUE //req.Flags |= unix.IFF_MULTI_QUEUE
} }
@@ -125,12 +123,12 @@ func newTun(c *config.C, l *logrus.Logger, vpnNetworks []netip.Prefix, multiqueu
file := os.NewFile(uintptr(fd), "/dev/net/tun") file := os.NewFile(uintptr(fd), "/dev/net/tun")
//todo
err = unix.IoctlSetPointerInt(fd, unix.TUNSETVNETHDRSZ, virtio.NetHdrSize) err = unix.IoctlSetPointerInt(fd, unix.TUNSETVNETHDRSZ, virtio.NetHdrSize)
if err != nil { if err != nil {
return nil, fmt.Errorf("set vnethdr size: %w", err) return nil, fmt.Errorf("set vnethdr size: %w", err)
} }
//|unix.TUN_F_USO4|unix.TUN_F_USO6
err = unix.IoctlSetInt(fd, unix.TUNSETOFFLOAD, 0) //todo! err = unix.IoctlSetInt(fd, unix.TUNSETOFFLOAD, 0) //todo!
if err != nil { if err != nil {
return nil, fmt.Errorf("set offloads: %w", err) return nil, fmt.Errorf("set offloads: %w", err)
@@ -156,7 +154,7 @@ func newTun(c *config.C, l *logrus.Logger, vpnNetworks []netip.Prefix, multiqueu
vdev, err := vhostnet.NewDevice( vdev, err := vhostnet.NewDevice(
vhostnet.WithBackendFD(fd), vhostnet.WithBackendFD(fd),
vhostnet.WithQueueSize(8), //todo config vhostnet.WithQueueSize(16), //todo config
) )
if err != nil { if err != nil {
return nil, err return nil, err
@@ -309,15 +307,6 @@ func (t *tun) Write(b []byte) (int, error) {
NumBuffers: 0, NumBuffers: 0,
} }
//use just tun
//vnethdrBuf := make([]byte, virtio.NetHdrSize+14+len(b)) //todo WHY
//if err := hdr.Encode(vnethdrBuf); err != nil {
// //return fmt.Errorf("encode vnethdr: %w", err)
//}
//copy(vnethdrBuf[virtio.NetHdrSize:], b)
//return unix.Write(t.fd, vnethdrBuf)
//end
err := t.vdev.TransmitPacket(hdr, b) err := t.vdev.TransmitPacket(hdr, b)
if err != nil { if err != nil {
return 0, err return 0, err