TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-22 16:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from neilalexander/notuntap

Browse Source 
Allow setting IfName to 'none' to run without TUN/TAP
This commit is contained in:
Arceliar 2018-02-16 00:31:50 -06:00 committed by GitHub
commit 8a12a88447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/yggdrasil/debug.go
View File

@ -212,11 +212,13 @@ func (c *Core) DEBUG_startTun(ifname string, iftapmode bool) {
func (c *Core) DEBUG_startTunWithMTU(ifname string, iftapmode bool, mtu int) { func (c *Core) DEBUG_startTunWithMTU(ifname string, iftapmode bool, mtu int) {
addr := c.DEBUG_getAddr() addr := c.DEBUG_getAddr()
straddr := fmt.Sprintf("%s/%v", net.IP(addr[:]).String(), 8*len(address_prefix)) straddr := fmt.Sprintf("%s/%v", net.IP(addr[:]).String(), 8*len(address_prefix))
if ifname != "none" {
err := c.tun.setup(ifname, iftapmode, straddr, mtu) err := c.tun.setup(ifname, iftapmode, straddr, mtu)
if err != nil { if err != nil {
panic(err) panic(err)
} }
go c.tun.read() go c.tun.read()
}
go c.tun.write() go c.tun.write()
} }

6
src/yggdrasil/tun.go
View File

@ -33,6 +33,9 @@ func (tun *tunDevice) init(core *Core) {
func (tun *tunDevice) write() error { func (tun *tunDevice) write() error {
for { for {
data := <-tun.recv data := <-tun.recv
if tun.iface == nil {
continue
}
if tun.iface.IsTAP() { if tun.iface.IsTAP() {
var frame ethernet.Frame var frame ethernet.Frame
frame.Prepare( frame.Prepare(
@ -88,5 +91,8 @@ func (tun *tunDevice) read() error {
} }
func (tun *tunDevice) close() error { func (tun *tunDevice) close() error {
if tun.iface == nil {
return nil
}
return tun.iface.Close() return tun.iface.Close()
} }

6
yggdrasil.go
View File

@ -264,7 +264,11 @@ func main() {
logger.Println("Initializing...") logger.Println("Initializing...")
n := node{} n := node{}
n.init(cfg, logger) n.init(cfg, logger)
logger.Println("Starting tun...") if cfg.IfName != "none" {
logger.Println("Starting TUN/TAP...")
} else {
logger.Println("Not starting TUN/TAP")
}
//n.core.DEBUG_startTun(cfg.IfName) // 1280, the smallest supported MTU //n.core.DEBUG_startTun(cfg.IfName) // 1280, the smallest supported MTU
n.core.DEBUG_startTunWithMTU(cfg.IfName, cfg.IfTAPMode, cfg.IfMTU) // Largest supported MTU n.core.DEBUG_startTunWithMTU(cfg.IfName, cfg.IfTAPMode, cfg.IfMTU) // Largest supported MTU
defer func() { defer func() {