cwinfo/yggdrasil-go
4
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2025-06-15 17:56:05 +00:00
Code Releases Activity

Rename tuntap package to tun

Browse Source 
We haven't had TAP support in ages.
This commit is contained in:
Neil Alexander
2022-09-24 14:41:47 +01:00
parent 217ac39e77
commit 01c44a087b
18 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/yggdrasil/main.go
View File

@ -32,13 +32,13 @@ import (
"github.com/yggdrasil-network/yggdrasil-go/src/core"
"github.com/yggdrasil-network/yggdrasil-go/src/multicast"
"github.com/yggdrasil-network/yggdrasil-go/src/tuntap"
"github.com/yggdrasil-network/yggdrasil-go/src/tun"
"github.com/yggdrasil-network/yggdrasil-go/src/version"
)
type node struct {
core *core.Core
tuntap *tuntap.TunAdapter
tun *tun.TunAdapter
multicast *multicast.Multicast
admin *admin.AdminSocket
}
@ -219,7 +219,7 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) {
return
case args.autoconf:
// Use an autoconf-generated config, this will give us random keys and
// port numbers, and will use an automatically selected TUN/TAP interface.
// port numbers, and will use an automatically selected TUN interface.
cfg = defaults.GenerateConfig()
case args.useconffile != "" || args.useconf:
// Read the configuration from either stdin or from the filesystem
@ -348,15 +348,15 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) {
// Setup the TUN module.
{
options := []tuntap.SetupOption{
tuntap.InterfaceName(cfg.IfName),
tuntap.InterfaceMTU(cfg.IfMTU),
options := []tun.SetupOption{
tun.InterfaceName(cfg.IfName),
tun.InterfaceMTU(cfg.IfMTU),
}
if n.tuntap, err = tuntap.New(ipv6rwc.NewReadWriteCloser(n.core), logger, options...); err != nil {
if n.tun, err = tun.New(ipv6rwc.NewReadWriteCloser(n.core), logger, options...); err != nil {
panic(err)
}
if n.admin != nil && n.tuntap != nil {
n.tuntap.SetupAdminHandlers(n.admin)
if n.admin != nil && n.tun != nil {
n.tun.SetupAdminHandlers(n.admin)
}
}
@ -378,7 +378,7 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) {
func (n *node) shutdown() {
_ = n.admin.Stop()
_ = n.multicast.Stop()
_ = n.tuntap.Stop()
_ = n.tun.Stop()
n.core.Stop()
}