go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tun/tap

Browse Source
This commit is contained in:
ginuerzh
2021-12-20 22:00:08 +08:00
parent a853d99d92
commit e21c35a47f
73 changed files with 1867 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/connector/http/metadata.go
View File

@ -22,9 +22,9 @@ func (c *httpConnector) parseMetadata(md mdata.Metadata) (err error) {
header = "header"
)
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])

10
pkg/connector/http2/metadata.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
const (
@ -18,20 +18,20 @@ type metadata struct {
User *url.Userinfo
}
func (c *http2Connector) parseMetadata(md md.Metadata) (err error) {
func (c *http2Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
userAgent = "userAgent"
user = "user"
)
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.UserAgent, _ = md.Get(userAgent).(string)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.UserAgent = mdata.GetString(md, userAgent)
if c.md.UserAgent == "" {
c.md.UserAgent = defaultUserAgent
}
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])

10
pkg/connector/relay/metadata.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -14,14 +14,14 @@ type metadata struct {
noDelay bool
}
func (c *relayConnector) parseMetadata(md md.Metadata) (err error) {
func (c *relayConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
connectTimeout = "connectTimeout"
noDelay = "nodelay"
)
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.user = url.User(ss[0])
@ -29,8 +29,8 @@ func (c *relayConnector) parseMetadata(md md.Metadata) (err error) {
c.md.user = url.UserPassword(ss[0], ss[1])
}
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.noDelay = md.GetBool(noDelay)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noDelay = mdata.GetBool(md, noDelay)
return
}

8
pkg/connector/sni/metadata.go
View File

@ -3,7 +3,7 @@ package sni
import (
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -11,14 +11,14 @@ type metadata struct {
connectTimeout time.Duration
}
func (c *sniConnector) parseMetadata(md md.Metadata) (err error) {
func (c *sniConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
host = "host"
connectTimeout = "timeout"
)
c.md.host = md.GetString(host)
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.host = mdata.GetString(md, host)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
return
}

10
pkg/connector/socks/v4/metadata.go
View File

@ -4,7 +4,7 @@ import (
"net/url"
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -13,18 +13,18 @@ type metadata struct {
disable4a bool
}
func (c *socks4Connector) parseMetadata(md md.Metadata) (err error) {
func (c *socks4Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
user = "user"
disable4a = "disable4a"
)
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
c.md.User = url.User(v)
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.disable4a = md.GetBool(disable4a)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.disable4a = mdata.GetBool(md, disable4a)
return
}

10
pkg/connector/socks/v5/metadata.go
View File

@ -6,7 +6,7 @@ import (
"strings"
"time"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
)
type metadata struct {
@ -16,14 +16,14 @@ type metadata struct {
noTLS bool
}
func (c *socks5Connector) parseMetadata(md md.Metadata) (err error) {
func (c *socks5Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
user = "user"
noTLS = "notls"
)
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])
@ -32,8 +32,8 @@ func (c *socks5Connector) parseMetadata(md md.Metadata) (err error) {
}
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.noTLS = md.GetBool(noTLS)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noTLS = mdata.GetBool(md, noTLS)
return
}

12
pkg/connector/ss/metadata.go
View File

@ -5,7 +5,7 @@ import (
"time"
"github.com/go-gost/gost/pkg/common/util/ss"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
"github.com/shadowsocks/go-shadowsocks2/core"
)
@ -15,7 +15,7 @@ type metadata struct {
noDelay bool
}
func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
func (c *ssConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
key = "key"
@ -24,7 +24,7 @@ func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
)
var method, password string
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
method = ss[0]
@ -32,13 +32,13 @@ func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
method, password = ss[0], ss[1]
}
}
c.md.cipher, err = ss.ShadowCipher(method, password, md.GetString(key))
c.md.cipher, err = ss.ShadowCipher(method, password, mdata.GetString(md, key))
if err != nil {
return
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.noDelay = md.GetBool(noDelay)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noDelay = mdata.GetBool(md, noDelay)
return
}

2
pkg/connector/ss/udp/connector.go
View File

@ -72,7 +72,7 @@ func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, addr
}
// standard UDP relay
return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.udpBufferSize), nil
return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.bufferSize), nil
}
if c.md.cipher != nil {

26
pkg/connector/ss/udp/metadata.go
View File

@ -1,30 +1,31 @@
package ss
import (
"math"
"strings"
"time"
"github.com/go-gost/gost/pkg/common/util/ss"
md "github.com/go-gost/gost/pkg/metadata"
mdata "github.com/go-gost/gost/pkg/metadata"
"github.com/shadowsocks/go-shadowsocks2/core"
)
type metadata struct {
cipher core.Cipher
connectTimeout time.Duration
udpBufferSize int
bufferSize int
}
func (c *ssuConnector) parseMetadata(md md.Metadata) (err error) {
func (c *ssuConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
key = "key"
connectTimeout = "timeout"
udpBufferSize = "udpBufferSize" // udp buffer size
bufferSize = "bufferSize" // udp buffer size
)
var method, password string
if v := md.GetString(user); v != "" {
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
method = ss[0]
@ -32,22 +33,17 @@ func (c *ssuConnector) parseMetadata(md md.Metadata) (err error) {
method, password = ss[0], ss[1]
}
}
c.md.cipher, err = ss.ShadowCipher(method, password, md.GetString(key))
c.md.cipher, err = ss.ShadowCipher(method, password, mdata.GetString(md, key))
if err != nil {
return
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
if c.md.udpBufferSize > 0 {
if c.md.udpBufferSize < 512 {
c.md.udpBufferSize = 512
}
if c.md.udpBufferSize > 65*1024 {
c.md.udpBufferSize = 65 * 1024
}
if bs := mdata.GetInt(md, bufferSize); bs > 0 {
c.md.bufferSize = int(math.Min(math.Max(float64(bs), 512), 64*1024))
} else {
c.md.udpBufferSize = 4096
c.md.bufferSize = 1024
}
return