From 1f48971a80f48257e478e532f6971d0557026120 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 10 Jun 2019 17:33:40 -0400 Subject: tun: remove TUN prefix from types to reduce stutter elsewhere Signed-off-by: Matt Layher --- tun/tun_freebsd.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tun/tun_freebsd.go') diff --git a/tun/tun_freebsd.go b/tun/tun_freebsd.go index df43ab7..6cf9313 100644 --- a/tun/tun_freebsd.go +++ b/tun/tun_freebsd.go @@ -79,7 +79,7 @@ type in6_ndireq struct { type NativeTun struct { name string tunFile *os.File - events chan TUNEvent + events chan Event errors chan error routeSocket int } @@ -125,16 +125,16 @@ func (tun *NativeTun) routineRouteListener(tunIfindex int) { // Up / Down event up := (iface.Flags & net.FlagUp) != 0 if up != statusUp && up { - tun.events <- TUNEventUp + tun.events <- EventUp } if up != statusUp && !up { - tun.events <- TUNEventDown + tun.events <- EventDown } statusUp = up // MTU changes if iface.MTU != statusMTU { - tun.events <- TUNEventMTUUpdate + tun.events <- EventMTUUpdate } statusMTU = iface.MTU } @@ -246,7 +246,7 @@ func tunDestroy(name string) error { return nil } -func CreateTUN(name string, mtu int) (TUNDevice, error) { +func CreateTUN(name string, mtu int) (Device, error) { if len(name) > unix.IFNAMSIZ-1 { return nil, errors.New("interface name too long") } @@ -365,11 +365,11 @@ func CreateTUN(name string, mtu int) (TUNDevice, error) { return CreateTUNFromFile(tunFile, mtu) } -func CreateTUNFromFile(file *os.File, mtu int) (TUNDevice, error) { +func CreateTUNFromFile(file *os.File, mtu int) (Device, error) { tun := &NativeTun{ tunFile: file, - events: make(chan TUNEvent, 10), + events: make(chan Event, 10), errors: make(chan error, 1), } @@ -425,7 +425,7 @@ func (tun *NativeTun) File() *os.File { return tun.tunFile } -func (tun *NativeTun) Events() chan TUNEvent { +func (tun *NativeTun) Events() chan Event { return tun.events } -- cgit v1.2.3-59-g8ed1b