add tun/tap
This commit is contained in:
@ -1,46 +0,0 @@
|
||||
package tun
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
type tunConn struct {
|
||||
ifce *water.Interface
|
||||
addr net.Addr
|
||||
}
|
||||
|
||||
func (c *tunConn) Read(b []byte) (n int, err error) {
|
||||
return c.ifce.Read(b)
|
||||
}
|
||||
|
||||
func (c *tunConn) Write(b []byte) (n int, err error) {
|
||||
return c.ifce.Write(b)
|
||||
}
|
||||
|
||||
func (c *tunConn) Close() (err error) {
|
||||
return c.ifce.Close()
|
||||
}
|
||||
|
||||
func (c *tunConn) LocalAddr() net.Addr {
|
||||
return c.addr
|
||||
}
|
||||
|
||||
func (c *tunConn) RemoteAddr() net.Addr {
|
||||
return &net.IPAddr{}
|
||||
}
|
||||
|
||||
func (c *tunConn) SetDeadline(t time.Time) error {
|
||||
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
|
||||
}
|
||||
|
||||
func (c *tunConn) SetReadDeadline(t time.Time) error {
|
||||
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
|
||||
}
|
||||
|
||||
func (c *tunConn) SetWriteDeadline(t time.Time) error {
|
||||
return &net.OpError{Op: "set", Net: "tuntap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
|
||||
}
|
@ -3,18 +3,13 @@ package tun
|
||||
import (
|
||||
"net"
|
||||
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
"github.com/go-gost/gost/pkg/listener"
|
||||
"github.com/go-gost/gost/pkg/logger"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
"github.com/go-gost/gost/pkg/registry"
|
||||
)
|
||||
|
||||
// ipRoute is an IP routing entry
|
||||
type ipRoute struct {
|
||||
Dest net.IPNet
|
||||
Gateway net.IP
|
||||
}
|
||||
|
||||
func init() {
|
||||
registry.RegisterListener("tun", NewListener)
|
||||
}
|
||||
@ -44,19 +39,33 @@ func (l *tunListener) Init(md md.Metadata) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
conn, ifce, err := l.createTun()
|
||||
l.addr, err = net.ResolveUDPAddr("udp", l.saddr)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
addrs, _ := ifce.Addrs()
|
||||
l.logger.Infof("name: %s, net: %s, mtu: %d, addrs: %s",
|
||||
ifce.Name, conn.LocalAddr(), ifce.MTU, addrs)
|
||||
ifce, ip, err := l.createTun()
|
||||
if err != nil {
|
||||
if ifce != nil {
|
||||
ifce.Close()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
itf, err := net.InterfaceByName(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
addrs, _ := itf.Addrs()
|
||||
l.logger.Infof("name: %s, net: %s, mtu: %d, addrs: %s",
|
||||
itf.Name, ip, itf.MTU, addrs)
|
||||
|
||||
l.addr = conn.LocalAddr()
|
||||
l.cqueue = make(chan net.Conn, 1)
|
||||
l.closed = make(chan struct{})
|
||||
|
||||
conn := tun_util.NewConn(l.md.config, ifce, l.addr, &net.IPAddr{IP: ip})
|
||||
|
||||
l.cqueue <- conn
|
||||
|
||||
return
|
||||
|
@ -4,7 +4,8 @@ import (
|
||||
"net"
|
||||
"strings"
|
||||
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -12,18 +13,10 @@ const (
|
||||
)
|
||||
|
||||
type metadata struct {
|
||||
name string
|
||||
net string
|
||||
// peer addr of point-to-point on MacOS
|
||||
peer string
|
||||
mtu int
|
||||
routes []ipRoute
|
||||
// default gateway
|
||||
gateway string
|
||||
tcp bool
|
||||
config *tun_util.Config
|
||||
}
|
||||
|
||||
func (l *tunListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *tunListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
name = "name"
|
||||
netKey = "net"
|
||||
@ -31,40 +24,40 @@ func (l *tunListener) parseMetadata(md md.Metadata) (err error) {
|
||||
mtu = "mtu"
|
||||
routes = "routes"
|
||||
gateway = "gw"
|
||||
tcp = "tcp"
|
||||
)
|
||||
|
||||
l.md.name = md.GetString(name)
|
||||
l.md.net = md.GetString(netKey)
|
||||
l.md.peer = md.GetString(peer)
|
||||
l.md.mtu = md.GetInt(mtu)
|
||||
|
||||
if l.md.mtu <= 0 {
|
||||
l.md.mtu = DefaultMTU
|
||||
config := &tun_util.Config{
|
||||
Name: mdata.GetString(md, name),
|
||||
Net: mdata.GetString(md, netKey),
|
||||
Peer: mdata.GetString(md, peer),
|
||||
MTU: mdata.GetInt(md, mtu),
|
||||
Gateway: mdata.GetString(md, gateway),
|
||||
}
|
||||
if config.MTU <= 0 {
|
||||
config.MTU = DefaultMTU
|
||||
}
|
||||
|
||||
l.md.gateway = md.GetString(gateway)
|
||||
l.md.tcp = md.GetBool(tcp)
|
||||
gw := net.ParseIP(config.Gateway)
|
||||
|
||||
gw := net.ParseIP(l.md.gateway)
|
||||
|
||||
for _, s := range md.GetStrings(routes) {
|
||||
for _, s := range mdata.GetStrings(md, routes) {
|
||||
ss := strings.SplitN(s, " ", 2)
|
||||
if len(ss) == 2 {
|
||||
var route ipRoute
|
||||
var route tun_util.Route
|
||||
_, ipNet, _ := net.ParseCIDR(strings.TrimSpace(ss[0]))
|
||||
if ipNet == nil {
|
||||
continue
|
||||
}
|
||||
route.Dest = *ipNet
|
||||
route.Net = *ipNet
|
||||
route.Gateway = net.ParseIP(ss[1])
|
||||
if route.Gateway == nil {
|
||||
route.Gateway = gw
|
||||
}
|
||||
|
||||
l.md.routes = append(l.md.routes, route)
|
||||
config.Routes = append(config.Routes, route)
|
||||
}
|
||||
}
|
||||
|
||||
l.md.config = config
|
||||
|
||||
return
|
||||
}
|
||||
|
@ -6,29 +6,30 @@ import (
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
|
||||
ip, _, err := net.ParseCIDR(l.md.net)
|
||||
func (l *tunListener) createTun() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, _, err = net.ParseCIDR(l.md.config.Net)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ifce, err := water.New(water.Config{
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TUN,
|
||||
})
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
peer := l.md.peer
|
||||
peer := l.md.config.Peer
|
||||
if peer == "" {
|
||||
peer = ip.String()
|
||||
}
|
||||
|
||||
cmd := fmt.Sprintf("ifconfig %s inet %s %s mtu %d up",
|
||||
ifce.Name(), l.md.net, l.md.peer, l.md.mtu)
|
||||
ifce.Name(), l.md.config.Net, l.md.config.Peer, l.md.config.MTU)
|
||||
l.logger.Debug(cmd)
|
||||
|
||||
args := strings.Split(cmd, " ")
|
||||
@ -36,25 +37,16 @@ func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error)
|
||||
return
|
||||
}
|
||||
|
||||
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
|
||||
if err = l.addRoutes(ifce.Name(), l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
itf, err = net.InterfaceByName(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
conn = &tunConn{
|
||||
ifce: ifce,
|
||||
addr: &net.IPAddr{IP: ip},
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...tun_util.Route) error {
|
||||
for _, route := range routes {
|
||||
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Dest.String(), ifName)
|
||||
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Net.String(), ifName)
|
||||
l.logger.Debug(cmd)
|
||||
args := strings.Split(cmd, " ")
|
||||
if err := exec.Command(args[0], args[1:]...).Run(); err != nil {
|
||||
|
@ -6,20 +6,21 @@ import (
|
||||
"syscall"
|
||||
|
||||
"github.com/docker/libcontainer/netlink"
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
"github.com/milosgajdos/tenus"
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
|
||||
ip, ipNet, err := net.ParseCIDR(l.md.net)
|
||||
func (l *tunListener) createTun() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, ipNet, err := net.ParseCIDR(l.md.config.Net)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ifce, err := water.New(water.Config{
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TUN,
|
||||
PlatformSpecificParams: water.PlatformSpecificParams{
|
||||
Name: l.md.name,
|
||||
Name: l.md.config.Name,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
@ -31,13 +32,13 @@ func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error)
|
||||
return
|
||||
}
|
||||
|
||||
l.logger.Debugf("ip link set dev %s mtu %d", ifce.Name(), l.md.mtu)
|
||||
l.logger.Debugf("ip link set dev %s mtu %d", ifce.Name(), l.md.config.MTU)
|
||||
|
||||
if err = link.SetLinkMTU(l.md.mtu); err != nil {
|
||||
if err = link.SetLinkMTU(l.md.config.MTU); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.logger.Debugf("ip address add %s dev %s", l.md.net, ifce.Name())
|
||||
l.logger.Debugf("ip address add %s dev %s", l.md.config.Net, ifce.Name())
|
||||
|
||||
if err = link.SetLinkIp(ip, ipNet); err != nil {
|
||||
return
|
||||
@ -48,26 +49,17 @@ func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error)
|
||||
return
|
||||
}
|
||||
|
||||
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
|
||||
if err = l.addRoutes(ifce.Name(), l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
itf, err = net.InterfaceByName(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
conn = &tunConn{
|
||||
ifce: ifce,
|
||||
addr: &net.IPAddr{IP: ip},
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...tun_util.Route) error {
|
||||
for _, route := range routes {
|
||||
l.logger.Debugf("ip route add %s dev %s", route.Dest.String(), ifName)
|
||||
if err := netlink.AddRoute(route.Dest.String(), "", "", ifName); err != nil && !errors.Is(err, syscall.EEXIST) {
|
||||
l.logger.Debugf("ip route add %s dev %s", route.Net.String(), ifName)
|
||||
if err := netlink.AddRoute(route.Net.String(), "", "", ifName); err != nil && !errors.Is(err, syscall.EEXIST) {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -8,16 +8,17 @@ import (
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
|
||||
ip, _, err := net.ParseCIDR(l.md.net)
|
||||
func (l *tunListener) createTun() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, _, err = net.ParseCIDR(l.md.config.Net)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ifce, err := water.New(water.Config{
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TUN,
|
||||
})
|
||||
if err != nil {
|
||||
@ -25,33 +26,25 @@ func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error)
|
||||
}
|
||||
|
||||
cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up",
|
||||
ifce.Name(), l.md.net, l.md.mtu)
|
||||
ifce.Name(), l.md.config.Net, l.md.config.MTU)
|
||||
l.logger.Debug(cmd)
|
||||
|
||||
args := strings.Split(cmd, " ")
|
||||
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
|
||||
err = fmt.Errorf("%s: %v", cmd, er)
|
||||
return
|
||||
}
|
||||
|
||||
if err = l.addRoutes(ifce.Name(), l.md.routes...); err != nil {
|
||||
if err = l.addRoutes(ifce.Name(), l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
itf, err = net.InterfaceByName(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
conn = &tunConn{
|
||||
ifce: ifce,
|
||||
addr: &net.IPAddr{IP: ip},
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...ipRoute) error {
|
||||
func (l *tunListener) addRoutes(ifName string, routes ...tun_util.Route) error {
|
||||
for _, route := range routes {
|
||||
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Dest.String(), ifName)
|
||||
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Net.String(), ifName)
|
||||
l.logger.Debug(cmd)
|
||||
args := strings.Split(cmd, " ")
|
||||
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
|
||||
|
@ -6,21 +6,22 @@ import (
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
tun_util "github.com/go-gost/gost/pkg/internal/util/tun"
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error) {
|
||||
ip, ipNet, err := net.ParseCIDR(l.md.net)
|
||||
func (l *tunListener) createTun() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, ipNet, err := net.ParseCIDR(l.md.config.Net)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ifce, err := water.New(water.Config{
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TUN,
|
||||
PlatformSpecificParams: water.PlatformSpecificParams{
|
||||
ComponentID: "tap0901",
|
||||
InterfaceName: l.md.name,
|
||||
Network: l.md.net,
|
||||
InterfaceName: l.md.config.Name,
|
||||
Network: l.md.config.Net,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
@ -38,28 +39,19 @@ func (l *tunListener) createTun() (conn net.Conn, itf *net.Interface, err error)
|
||||
return
|
||||
}
|
||||
|
||||
if err = l.addRoutes(ifce.Name(), l.md.gateway, l.md.routes...); err != nil {
|
||||
if err = l.addRoutes(ifce.Name(), l.md.config.Gateway, l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
itf, err = net.InterfaceByName(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
conn = &tunConn{
|
||||
ifce: ifce,
|
||||
addr: &net.IPAddr{IP: ip},
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tunListener) addRoutes(ifName string, gw string, routes ...ipRoute) error {
|
||||
func (l *tunListener) addRoutes(ifName string, gw string, routes ...tun_util.Route) error {
|
||||
for _, route := range routes {
|
||||
l.deleteRoute(ifName, route.Dest.String())
|
||||
l.deleteRoute(ifName, route.Net.String())
|
||||
|
||||
cmd := fmt.Sprintf("netsh interface ip add route prefix=%s interface=%s store=active",
|
||||
route.Dest.String(), ifName)
|
||||
route.Net.String(), ifName)
|
||||
if gw != "" {
|
||||
cmd += " nexthop=" + gw
|
||||
}
|
||||
|
Reference in New Issue
Block a user