add tun/tap
This commit is contained in:
@ -4,7 +4,7 @@ import (
|
||||
"crypto/tls"
|
||||
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -17,7 +17,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *h2Listener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *h2Listener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
path = "path"
|
||||
certFile = "certFile"
|
||||
@ -27,19 +27,19 @@ func (l *h2Listener) parseMetadata(md md.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
l.md.path = md.GetString(path)
|
||||
l.md.path = mdata.GetString(md, path)
|
||||
return
|
||||
}
|
||||
|
@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -25,7 +25,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *http2Listener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *http2Listener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
path = "path"
|
||||
certFile = "certFile"
|
||||
@ -39,15 +39,15 @@ func (l *http2Listener) parseMetadata(md md.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ import (
|
||||
"encoding/json"
|
||||
|
||||
kcp_util "github.com/go-gost/gost/pkg/common/util/kcp"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -16,19 +16,13 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *kcpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *kcpListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
backlog = "backlog"
|
||||
config = "config"
|
||||
)
|
||||
|
||||
if mm, _ := md.Get(config).(map[interface{}]interface{}); len(mm) > 0 {
|
||||
m := make(map[string]interface{})
|
||||
for k, v := range mm {
|
||||
if sk, ok := k.(string); ok {
|
||||
m[sk] = v
|
||||
}
|
||||
}
|
||||
if m := mdata.GetStringMap(md, config); len(m) > 0 {
|
||||
b, err := json.Marshal(m)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -44,7 +38,7 @@ func (l *kcpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
l.md.config = kcp_util.DefaultConfig
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -22,7 +22,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *quicListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *quicListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
keepAlive = "keepAlive"
|
||||
handshakeTimeout = "handshakeTimeout"
|
||||
@ -37,26 +37,26 @@ func (l *quicListener) parseMetadata(md md.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
if key := md.GetString(cipherKey); key != "" {
|
||||
if key := mdata.GetString(md, cipherKey); key != "" {
|
||||
l.md.cipherKey = []byte(key)
|
||||
}
|
||||
|
||||
l.md.keepAlive = md.GetBool(keepAlive)
|
||||
l.md.handshakeTimeout = md.GetDuration(handshakeTimeout)
|
||||
l.md.maxIdleTimeout = md.GetDuration(maxIdleTimeout)
|
||||
l.md.keepAlive = mdata.GetBool(md, keepAlive)
|
||||
l.md.handshakeTimeout = mdata.GetDuration(md, handshakeTimeout)
|
||||
l.md.maxIdleTimeout = mdata.GetDuration(md, maxIdleTimeout)
|
||||
|
||||
return
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ package udp
|
||||
import (
|
||||
"time"
|
||||
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -16,18 +16,18 @@ type metadata struct {
|
||||
readBufferSize int
|
||||
}
|
||||
|
||||
func (l *redirectListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *redirectListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
ttl = "ttl"
|
||||
readBufferSize = "readBufferSize"
|
||||
)
|
||||
|
||||
l.md.ttl = md.GetDuration(ttl)
|
||||
l.md.ttl = mdata.GetDuration(md, ttl)
|
||||
if l.md.ttl <= 0 {
|
||||
l.md.ttl = defaultTTL
|
||||
}
|
||||
|
||||
l.md.readBufferSize = md.GetInt(readBufferSize)
|
||||
l.md.readBufferSize = mdata.GetInt(md, readBufferSize)
|
||||
if l.md.readBufferSize <= 0 {
|
||||
l.md.readBufferSize = defaultReadBufferSize
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ package rtcp
|
||||
import (
|
||||
"time"
|
||||
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -17,17 +17,17 @@ type metadata struct {
|
||||
retryCount int
|
||||
}
|
||||
|
||||
func (l *rtcpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *rtcpListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
enableMux = "mux"
|
||||
backlog = "backlog"
|
||||
retryCount = "retry"
|
||||
)
|
||||
|
||||
l.md.enableMux = md.GetBool(enableMux)
|
||||
l.md.retryCount = md.GetInt(retryCount)
|
||||
l.md.enableMux = mdata.GetBool(md, enableMux)
|
||||
l.md.retryCount = mdata.GetInt(md, retryCount)
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ package rudp
|
||||
import (
|
||||
"time"
|
||||
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -21,7 +21,7 @@ type metadata struct {
|
||||
retryCount int
|
||||
}
|
||||
|
||||
func (l *rudpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *rudpListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
ttl = "ttl"
|
||||
readBufferSize = "readBufferSize"
|
||||
@ -30,25 +30,25 @@ func (l *rudpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
retryCount = "retry"
|
||||
)
|
||||
|
||||
l.md.ttl = md.GetDuration(ttl)
|
||||
l.md.ttl = mdata.GetDuration(md, ttl)
|
||||
if l.md.ttl <= 0 {
|
||||
l.md.ttl = defaultTTL
|
||||
}
|
||||
l.md.readBufferSize = md.GetInt(readBufferSize)
|
||||
l.md.readBufferSize = mdata.GetInt(md, readBufferSize)
|
||||
if l.md.readBufferSize <= 0 {
|
||||
l.md.readBufferSize = defaultReadBufferSize
|
||||
}
|
||||
|
||||
l.md.readQueueSize = md.GetInt(readQueueSize)
|
||||
l.md.readQueueSize = mdata.GetInt(md, readQueueSize)
|
||||
if l.md.readQueueSize <= 0 {
|
||||
l.md.readQueueSize = defaultReadQueueSize
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
l.md.retryCount = md.GetInt(retryCount)
|
||||
l.md.retryCount = mdata.GetInt(md, retryCount)
|
||||
return
|
||||
}
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"github.com/go-gost/gost/pkg/auth"
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
"golang.org/x/crypto/ssh"
|
||||
)
|
||||
|
||||
@ -22,7 +22,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *sshListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *sshListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
users = "users"
|
||||
authorizedKeys = "authorizedKeys"
|
||||
@ -31,28 +31,26 @@ func (l *sshListener) parseMetadata(md md.Metadata) (err error) {
|
||||
backlog = "backlog"
|
||||
)
|
||||
|
||||
if v, _ := md.Get(users).([]interface{}); len(v) > 0 {
|
||||
if auths := mdata.GetStrings(md, users); len(auths) > 0 {
|
||||
authenticator := auth.NewLocalAuthenticator(nil)
|
||||
for _, auth := range v {
|
||||
if s, _ := auth.(string); s != "" {
|
||||
ss := strings.SplitN(s, ":", 2)
|
||||
if len(ss) == 1 {
|
||||
authenticator.Add(ss[0], "")
|
||||
} else {
|
||||
authenticator.Add(ss[0], ss[1])
|
||||
}
|
||||
for _, auth := range auths {
|
||||
ss := strings.SplitN(auth, ":", 2)
|
||||
if len(ss) == 1 {
|
||||
authenticator.Add(ss[0], "")
|
||||
} else {
|
||||
authenticator.Add(ss[0], ss[1])
|
||||
}
|
||||
}
|
||||
l.md.authenticator = authenticator
|
||||
}
|
||||
|
||||
if key := md.GetString(privateKeyFile); key != "" {
|
||||
if key := mdata.GetString(md, privateKeyFile); key != "" {
|
||||
data, err := ioutil.ReadFile(key)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pp := md.GetString(passphrase)
|
||||
pp := mdata.GetString(md, passphrase)
|
||||
if pp == "" {
|
||||
l.md.signer, err = ssh.ParsePrivateKey(data)
|
||||
} else {
|
||||
@ -70,7 +68,7 @@ func (l *sshListener) parseMetadata(md md.Metadata) (err error) {
|
||||
l.md.signer = signer
|
||||
}
|
||||
|
||||
if name := md.GetString(authorizedKeys); name != "" {
|
||||
if name := mdata.GetString(md, authorizedKeys); name != "" {
|
||||
m, err := ssh_util.ParseAuthorizedKeysFile(name)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -78,7 +76,7 @@ func (l *sshListener) parseMetadata(md md.Metadata) (err error) {
|
||||
l.md.authorizedKeys = m
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
96
pkg/listener/tap/listener.go
Normal file
96
pkg/listener/tap/listener.go
Normal file
@ -0,0 +1,96 @@
|
||||
package tap
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
tap_util "github.com/go-gost/gost/pkg/internal/util/tap"
|
||||
"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"
|
||||
)
|
||||
|
||||
func init() {
|
||||
registry.RegisterListener("tap", NewListener)
|
||||
}
|
||||
|
||||
type tapListener struct {
|
||||
saddr string
|
||||
addr net.Addr
|
||||
cqueue chan net.Conn
|
||||
closed chan struct{}
|
||||
logger logger.Logger
|
||||
md metadata
|
||||
}
|
||||
|
||||
func NewListener(opts ...listener.Option) listener.Listener {
|
||||
options := &listener.Options{}
|
||||
for _, opt := range opts {
|
||||
opt(options)
|
||||
}
|
||||
return &tapListener{
|
||||
saddr: options.Addr,
|
||||
logger: options.Logger,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *tapListener) Init(md md.Metadata) (err error) {
|
||||
if err = l.parseMetadata(md); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.addr, err = net.ResolveUDPAddr("udp", l.saddr)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ifce, ip, err := l.createTap()
|
||||
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, mac: %s, mtu: %d, addrs: %s",
|
||||
itf.Name, itf.HardwareAddr, itf.MTU, addrs)
|
||||
|
||||
l.cqueue = make(chan net.Conn, 1)
|
||||
l.closed = make(chan struct{})
|
||||
|
||||
conn := tap_util.NewConn(l.md.config, ifce, l.addr, &net.IPAddr{IP: ip})
|
||||
|
||||
l.cqueue <- conn
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tapListener) Accept() (net.Conn, error) {
|
||||
select {
|
||||
case conn := <-l.cqueue:
|
||||
return conn, nil
|
||||
case <-l.closed:
|
||||
}
|
||||
|
||||
return nil, listener.ErrClosed
|
||||
}
|
||||
|
||||
func (l *tapListener) Addr() net.Addr {
|
||||
return l.addr
|
||||
}
|
||||
|
||||
func (l *tapListener) Close() error {
|
||||
select {
|
||||
case <-l.closed:
|
||||
return net.ErrClosed
|
||||
default:
|
||||
close(l.closed)
|
||||
}
|
||||
return nil
|
||||
}
|
44
pkg/listener/tap/metadata.go
Normal file
44
pkg/listener/tap/metadata.go
Normal file
@ -0,0 +1,44 @@
|
||||
package tap
|
||||
|
||||
import (
|
||||
tap_util "github.com/go-gost/gost/pkg/internal/util/tap"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
DefaultMTU = 1350
|
||||
)
|
||||
|
||||
type metadata struct {
|
||||
config *tap_util.Config
|
||||
}
|
||||
|
||||
func (l *tapListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
name = "name"
|
||||
netKey = "net"
|
||||
mtu = "mtu"
|
||||
routes = "routes"
|
||||
gateway = "gw"
|
||||
)
|
||||
|
||||
config := &tap_util.Config{
|
||||
Name: mdata.GetString(md, name),
|
||||
Net: mdata.GetString(md, netKey),
|
||||
MTU: mdata.GetInt(md, mtu),
|
||||
Gateway: mdata.GetString(md, gateway),
|
||||
}
|
||||
if config.MTU <= 0 {
|
||||
config.MTU = DefaultMTU
|
||||
}
|
||||
|
||||
for _, s := range mdata.GetStrings(md, routes) {
|
||||
if s != "" {
|
||||
config.Routes = append(config.Routes, s)
|
||||
}
|
||||
}
|
||||
|
||||
l.md.config = config
|
||||
|
||||
return
|
||||
}
|
13
pkg/listener/tap/tap_darwin.go
Normal file
13
pkg/listener/tap/tap_darwin.go
Normal file
@ -0,0 +1,13 @@
|
||||
package tap
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tapListener) createTap() (ifce *water.Interface, ip net.IP, err error) {
|
||||
err = errors.New("tap is not supported on darwin")
|
||||
return
|
||||
}
|
69
pkg/listener/tap/tap_linux.go
Normal file
69
pkg/listener/tap/tap_linux.go
Normal file
@ -0,0 +1,69 @@
|
||||
package tap
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
"github.com/docker/libcontainer/netlink"
|
||||
"github.com/milosgajdos/tenus"
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tapListener) createTap() (ifce *water.Interface, ip net.IP, err error) {
|
||||
var ipNet *net.IPNet
|
||||
if l.md.config.Net != "" {
|
||||
ip, ipNet, err = net.ParseCIDR(l.md.config.Net)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TAP,
|
||||
PlatformSpecificParams: water.PlatformSpecificParams{
|
||||
Name: l.md.config.Name,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
link, err := tenus.NewLinkFrom(ifce.Name())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.logger.Debugf("ip link set dev %s mtu %d", ifce.Name(), l.md.config.MTU)
|
||||
|
||||
if err = link.SetLinkMTU(l.md.config.MTU); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if l.md.config.Net != "" {
|
||||
l.logger.Debugf("ip address add %s dev %s", l.md.config.Net, ifce.Name())
|
||||
|
||||
if err = link.SetLinkIp(ip, ipNet); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
l.logger.Debugf("ip link set dev %s up", ifce.Name())
|
||||
if err = link.SetLinkUp(); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if err = l.addRoutes(ifce.Name(), l.md.config.Gateway, l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tapListener) addRoutes(ifName string, gw string, routes ...string) error {
|
||||
for _, route := range routes {
|
||||
l.logger.Debugf("ip route add %s via %s dev %s", route, gw, ifName)
|
||||
if err := netlink.AddRoute(route, "", gw, ifName); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
61
pkg/listener/tap/tap_unix.go
Normal file
61
pkg/listener/tap/tap_unix.go
Normal file
@ -0,0 +1,61 @@
|
||||
//go:build !linux && !windows && !darwin
|
||||
|
||||
package tap
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tapListener) createTap() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, _, _ = net.ParseCIDR(l.md.config.Net)
|
||||
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TAP,
|
||||
})
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
var cmd string
|
||||
if l.md.config.Net != "" {
|
||||
cmd = fmt.Sprintf("ifconfig %s inet %s mtu %d up", ifce.Name(), l.md.config.Net, l.md.config.MTU)
|
||||
} else {
|
||||
cmd = fmt.Sprintf("ifconfig %s mtu %d up", ifce.Name(), 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.config.Gateway, l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tapListener) addRoutes(ifName string, gw string, routes ...string) error {
|
||||
for _, route := range routes {
|
||||
if route == "" {
|
||||
continue
|
||||
}
|
||||
cmd := fmt.Sprintf("route add -net %s dev %s", route, ifName)
|
||||
if gw != "" {
|
||||
cmd += " gw " + gw
|
||||
}
|
||||
l.logger.Debug(cmd)
|
||||
args := strings.Split(cmd, " ")
|
||||
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
|
||||
return fmt.Errorf("%s: %v", cmd, er)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
75
pkg/listener/tap/tap_windows.go
Normal file
75
pkg/listener/tap/tap_windows.go
Normal file
@ -0,0 +1,75 @@
|
||||
package tap
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/songgao/water"
|
||||
)
|
||||
|
||||
func (l *tapListener) createTap() (ifce *water.Interface, ip net.IP, err error) {
|
||||
ip, ipNet, _ := net.ParseCIDR(l.md.config.Net)
|
||||
|
||||
ifce, err = water.New(water.Config{
|
||||
DeviceType: water.TAP,
|
||||
PlatformSpecificParams: water.PlatformSpecificParams{
|
||||
ComponentID: "tap0901",
|
||||
InterfaceName: l.md.config.Name,
|
||||
Network: l.md.config.Net,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if ip != nil && ipNet != nil {
|
||||
cmd := fmt.Sprintf("netsh interface ip set address name=%s "+
|
||||
"source=static addr=%s mask=%s gateway=none",
|
||||
ifce.Name(), ip.String(), ipMask(ipNet.Mask))
|
||||
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.config.Gateway, l.md.config.Routes...); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (l *tapListener) addRoutes(ifName string, gw string, routes ...string) error {
|
||||
for _, route := range routes {
|
||||
l.deleteRoute(ifName, route)
|
||||
|
||||
cmd := fmt.Sprintf("netsh interface ip add route prefix=%s interface=%s store=active",
|
||||
route, ifName)
|
||||
if gw != "" {
|
||||
cmd += " nexthop=" + gw
|
||||
}
|
||||
l.logger.Debug(cmd)
|
||||
args := strings.Split(cmd, " ")
|
||||
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
|
||||
return fmt.Errorf("%s: %v", cmd, er)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (l *tapListener) deleteRoute(ifName string, route string) error {
|
||||
cmd := fmt.Sprintf("netsh interface ip delete route prefix=%s interface=%s store=active",
|
||||
route, ifName)
|
||||
l.logger.Debug(cmd)
|
||||
args := strings.Split(cmd, " ")
|
||||
return exec.Command(args[0], args[1:]...).Run()
|
||||
}
|
||||
|
||||
func ipMask(mask net.IPMask) string {
|
||||
return fmt.Sprintf("%d.%d.%d.%d", mask[0], mask[1], mask[2], mask[3])
|
||||
}
|
@ -4,14 +4,14 @@ import (
|
||||
"crypto/tls"
|
||||
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
type metadata struct {
|
||||
tlsConfig *tls.Config
|
||||
}
|
||||
|
||||
func (l *tlsListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *tlsListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
certFile = "certFile"
|
||||
keyFile = "keyFile"
|
||||
@ -19,9 +19,9 @@ func (l *tlsListener) parseMetadata(md md.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
|
@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -25,7 +25,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *mtlsListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
certFile = "certFile"
|
||||
keyFile = "keyFile"
|
||||
@ -42,25 +42,25 @@ func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
l.md.muxKeepAliveDisabled = md.GetBool(muxKeepAliveDisabled)
|
||||
l.md.muxKeepAliveInterval = md.GetDuration(muxKeepAliveInterval)
|
||||
l.md.muxKeepAliveTimeout = md.GetDuration(muxKeepAliveTimeout)
|
||||
l.md.muxMaxFrameSize = md.GetInt(muxMaxFrameSize)
|
||||
l.md.muxMaxReceiveBuffer = md.GetInt(muxMaxReceiveBuffer)
|
||||
l.md.muxMaxStreamBuffer = md.GetInt(muxMaxStreamBuffer)
|
||||
l.md.muxKeepAliveDisabled = mdata.GetBool(md, muxKeepAliveDisabled)
|
||||
l.md.muxKeepAliveInterval = mdata.GetDuration(md, muxKeepAliveInterval)
|
||||
l.md.muxKeepAliveTimeout = mdata.GetDuration(md, muxKeepAliveTimeout)
|
||||
l.md.muxMaxFrameSize = mdata.GetInt(md, muxMaxFrameSize)
|
||||
l.md.muxMaxReceiveBuffer = mdata.GetInt(md, muxMaxReceiveBuffer)
|
||||
l.md.muxMaxStreamBuffer = mdata.GetInt(md, muxMaxStreamBuffer)
|
||||
|
||||
return
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ package udp
|
||||
import (
|
||||
"time"
|
||||
|
||||
md "github.com/go-gost/gost/pkg/metadata"
|
||||
mdata "github.com/go-gost/gost/pkg/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -21,7 +21,7 @@ type metadata struct {
|
||||
backlog int
|
||||
}
|
||||
|
||||
func (l *udpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
func (l *udpListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
ttl = "ttl"
|
||||
readBufferSize = "readBufferSize"
|
||||
@ -29,21 +29,21 @@ func (l *udpListener) parseMetadata(md md.Metadata) (err error) {
|
||||
backlog = "backlog"
|
||||
)
|
||||
|
||||
l.md.ttl = md.GetDuration(ttl)
|
||||
l.md.ttl = mdata.GetDuration(md, ttl)
|
||||
if l.md.ttl <= 0 {
|
||||
l.md.ttl = defaultTTL
|
||||
}
|
||||
l.md.readBufferSize = md.GetInt(readBufferSize)
|
||||
l.md.readBufferSize = mdata.GetInt(md, readBufferSize)
|
||||
if l.md.readBufferSize <= 0 {
|
||||
l.md.readBufferSize = defaultReadBufferSize
|
||||
}
|
||||
|
||||
l.md.readQueueSize = md.GetInt(readQueueSize)
|
||||
l.md.readQueueSize = mdata.GetInt(md, readQueueSize)
|
||||
if l.md.readQueueSize <= 0 {
|
||||
l.md.readQueueSize = defaultReadQueueSize
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
@ -47,29 +47,29 @@ func (l *wsListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.md.path = md.GetString(path)
|
||||
l.md.path = mdata.GetString(md, path)
|
||||
if l.md.path == "" {
|
||||
l.md.path = defaultPath
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
l.md.handshakeTimeout = md.GetDuration(handshakeTimeout)
|
||||
l.md.readHeaderTimeout = md.GetDuration(readHeaderTimeout)
|
||||
l.md.readBufferSize = md.GetInt(readBufferSize)
|
||||
l.md.writeBufferSize = md.GetInt(writeBufferSize)
|
||||
l.md.enableCompression = md.GetBool(enableCompression)
|
||||
l.md.handshakeTimeout = mdata.GetDuration(md, handshakeTimeout)
|
||||
l.md.readHeaderTimeout = mdata.GetDuration(md, readHeaderTimeout)
|
||||
l.md.readBufferSize = mdata.GetInt(md, readBufferSize)
|
||||
l.md.writeBufferSize = mdata.GetInt(md, writeBufferSize)
|
||||
l.md.enableCompression = mdata.GetBool(md, enableCompression)
|
||||
|
||||
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
|
||||
hd := http.Header{}
|
||||
|
@ -59,36 +59,36 @@ func (l *mwsListener) parseMetadata(md mdata.Metadata) (err error) {
|
||||
)
|
||||
|
||||
l.md.tlsConfig, err = tls_util.LoadServerConfig(
|
||||
md.GetString(certFile),
|
||||
md.GetString(keyFile),
|
||||
md.GetString(caFile),
|
||||
mdata.GetString(md, certFile),
|
||||
mdata.GetString(md, keyFile),
|
||||
mdata.GetString(md, caFile),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
l.md.path = md.GetString(path)
|
||||
l.md.path = mdata.GetString(md, path)
|
||||
if l.md.path == "" {
|
||||
l.md.path = defaultPath
|
||||
}
|
||||
|
||||
l.md.backlog = md.GetInt(backlog)
|
||||
l.md.backlog = mdata.GetInt(md, backlog)
|
||||
if l.md.backlog <= 0 {
|
||||
l.md.backlog = defaultBacklog
|
||||
}
|
||||
|
||||
l.md.handshakeTimeout = md.GetDuration(handshakeTimeout)
|
||||
l.md.readHeaderTimeout = md.GetDuration(readHeaderTimeout)
|
||||
l.md.readBufferSize = md.GetInt(readBufferSize)
|
||||
l.md.writeBufferSize = md.GetInt(writeBufferSize)
|
||||
l.md.enableCompression = md.GetBool(enableCompression)
|
||||
l.md.handshakeTimeout = mdata.GetDuration(md, handshakeTimeout)
|
||||
l.md.readHeaderTimeout = mdata.GetDuration(md, readHeaderTimeout)
|
||||
l.md.readBufferSize = mdata.GetInt(md, readBufferSize)
|
||||
l.md.writeBufferSize = mdata.GetInt(md, writeBufferSize)
|
||||
l.md.enableCompression = mdata.GetBool(md, enableCompression)
|
||||
|
||||
l.md.muxKeepAliveDisabled = md.GetBool(muxKeepAliveDisabled)
|
||||
l.md.muxKeepAliveInterval = md.GetDuration(muxKeepAliveInterval)
|
||||
l.md.muxKeepAliveTimeout = md.GetDuration(muxKeepAliveTimeout)
|
||||
l.md.muxMaxFrameSize = md.GetInt(muxMaxFrameSize)
|
||||
l.md.muxMaxReceiveBuffer = md.GetInt(muxMaxReceiveBuffer)
|
||||
l.md.muxMaxStreamBuffer = md.GetInt(muxMaxStreamBuffer)
|
||||
l.md.muxKeepAliveDisabled = mdata.GetBool(md, muxKeepAliveDisabled)
|
||||
l.md.muxKeepAliveInterval = mdata.GetDuration(md, muxKeepAliveInterval)
|
||||
l.md.muxKeepAliveTimeout = mdata.GetDuration(md, muxKeepAliveTimeout)
|
||||
l.md.muxMaxFrameSize = mdata.GetInt(md, muxMaxFrameSize)
|
||||
l.md.muxMaxReceiveBuffer = mdata.GetInt(md, muxMaxReceiveBuffer)
|
||||
l.md.muxMaxStreamBuffer = mdata.GetInt(md, muxMaxStreamBuffer)
|
||||
|
||||
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
|
||||
hd := http.Header{}
|
||||
|
Reference in New Issue
Block a user