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

Cleanup most of the remaining nits (#578)

Browse Source
This commit is contained in:
Nate Brown
2021-11-12 10:47:36 -06:00
committed by GitHub
parent e07524a654
commit 2f1f0d602f
13 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
overlay/tun_android.go
View File

@@ -13,7 +13,7 @@ import (
"golang.org/x/sys/unix"
)
type Tun struct {
type tun struct {
io.ReadWriteCloser
fd int
Device string
@@ -26,10 +26,10 @@ type Tun struct {
l *logrus.Logger
}
func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, defaultMTU int, routes []Route, unsafeRoutes []Route, txQueueLen int) (ifce *Tun, err error) {
func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, defaultMTU int, routes []Route, unsafeRoutes []Route, txQueueLen int) (*tun, error) {
file := os.NewFile(uintptr(deviceFd), "/dev/net/tun")
ifce = &Tun{
return &tun{
ReadWriteCloser: file,
fd: int(file.Fd()),
Device: "android",
@@ -39,19 +39,18 @@ func newTunFromFd(l *logrus.Logger, deviceFd int, cidr *net.IPNet, defaultMTU in
Routes: routes,
UnsafeRoutes: unsafeRoutes,
l: l,
}
return
}, nil
}
func newTun(l *logrus.Logger, deviceName string, cidr *net.IPNet, defaultMTU int, routes []Route, unsafeRoutes []Route, txQueueLen int, multiqueue bool) (ifce *Tun, err error) {
func newTun(_ *logrus.Logger, _ string, _ *net.IPNet, _ int, _ []Route, _ []Route, _ int, _ bool) (*tun, error) {
return nil, fmt.Errorf("newTun not supported in Android")
}
func (c *Tun) WriteRaw(b []byte) error {
func (t *tun) WriteRaw(b []byte) error {
var nn int
for {
max := len(b)
n, err := unix.Write(c.fd, b[nn:max])
n, err := unix.Write(t.fd, b[nn:max])
if n > 0 {
nn += n
}
@@ -69,18 +68,18 @@ func (c *Tun) WriteRaw(b []byte) error {
}
}
func (c Tun) Activate() error {
func (t tun) Activate() error {
return nil
}
func (c *Tun) CidrNet() *net.IPNet {
return c.Cidr
func (t *tun) CidrNet() *net.IPNet {
return t.Cidr
}
func (c *Tun) DeviceName() string {
return c.Device
func (t *tun) DeviceName() string {
return t.Device
}
func (t *Tun) NewMultiQueueReader() (io.ReadWriteCloser, error) {
func (t *tun) NewMultiQueueReader() (io.ReadWriteCloser, error) {
return nil, fmt.Errorf("TODO: multiqueue not implemented for android")
}