Revert "Add IPReadWriteCloser interface"

This reverts commit ebe366ef3b.
This commit is contained in:
Arceliar 2021-08-07 12:56:36 -05:00
parent ebe366ef3b
commit 3613614b41

View File

@ -11,7 +11,6 @@ package tuntap
import ( import (
"errors" "errors"
"fmt" "fmt"
"io"
"net" "net"
//"sync" //"sync"
@ -23,23 +22,17 @@ import (
"github.com/yggdrasil-network/yggdrasil-go/src/address" "github.com/yggdrasil-network/yggdrasil-go/src/address"
"github.com/yggdrasil-network/yggdrasil-go/src/config" "github.com/yggdrasil-network/yggdrasil-go/src/config"
"github.com/yggdrasil-network/yggdrasil-go/src/defaults" "github.com/yggdrasil-network/yggdrasil-go/src/defaults"
"github.com/yggdrasil-network/yggdrasil-go/src/ipv6rwc"
) )
type IPReadWriteCloser interface { type MTU uint16
io.ReadWriteCloser
MaxMTU() uint64
SetMTU(mtu uint64)
MTU() uint64
Address() address.Address
Subnet() address.Subnet
}
// TunAdapter represents a running TUN interface and extends the // TunAdapter represents a running TUN interface and extends the
// yggdrasil.Adapter type. In order to use the TUN adapter with Yggdrasil, you // yggdrasil.Adapter type. In order to use the TUN adapter with Yggdrasil, you
// should pass this object to the yggdrasil.SetRouterAdapter() function before // should pass this object to the yggdrasil.SetRouterAdapter() function before
// calling yggdrasil.Start(). // calling yggdrasil.Start().
type TunAdapter struct { type TunAdapter struct {
rwc IPReadWriteCloser rwc *ipv6rwc.ReadWriteCloser
config *config.NodeConfig config *config.NodeConfig
log *log.Logger log *log.Logger
addr address.Address addr address.Address
@ -100,7 +93,7 @@ func MaximumMTU() uint64 {
// Init initialises the TUN module. You must have acquired a Listener from // Init initialises the TUN module. You must have acquired a Listener from
// the Yggdrasil core before this point and it must not be in use elsewhere. // the Yggdrasil core before this point and it must not be in use elsewhere.
func (tun *TunAdapter) Init(rwc IPReadWriteCloser, config *config.NodeConfig, log *log.Logger, options interface{}) error { func (tun *TunAdapter) Init(rwc *ipv6rwc.ReadWriteCloser, config *config.NodeConfig, log *log.Logger, options interface{}) error {
tun.rwc = rwc tun.rwc = rwc
tun.config = config tun.config = config
tun.log = log tun.log = log