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

remove unnecessary conn

Browse Source
This commit is contained in:
ginuerzh
2022-03-15 15:45:22 +08:00
parent 422e07f4e7
commit 073ad80ce4
17 changed files with 287 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
listener/http2/conn.go
View File

@ -5,12 +5,17 @@ import (
"net"
"net/http"
"time"
mdata "github.com/go-gost/gost/v3/pkg/metadata"
)
// a dummy HTTP2 server conn used by HTTP2 handler
type conn struct {
md mdata.Metadata
r *http.Request
w http.ResponseWriter
laddr net.Addr
raddr net.Addr
closed chan struct{}
}
@ -32,13 +37,11 @@ func (c *conn) Close() error {
}
func (c *conn) LocalAddr() net.Addr {
addr, _ := net.ResolveTCPAddr("tcp", c.r.Host)
return addr
return c.raddr
}
func (c *conn) RemoteAddr() net.Addr {
addr, _ := net.ResolveTCPAddr("tcp", c.r.RemoteAddr)
return addr
return c.raddr
}
func (c *conn) SetDeadline(t time.Time) error {
@ -52,3 +55,12 @@ func (c *conn) SetReadDeadline(t time.Time) error {
func (c *conn) SetWriteDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "http2", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) Done() <-chan struct{} {
return c.closed
}
// GetMetadata implements metadata.Metadatable interface.
func (c *conn) GetMetadata() mdata.Metadata {
return c.md
}

11
listener/http2/listener.go
View File

@ -11,7 +11,6 @@ import (
md "github.com/go-gost/gost/v3/pkg/metadata"
"github.com/go-gost/gost/v3/pkg/registry"
metrics "github.com/go-gost/metrics/wrapper"
http2_util "github.com/go-gost/x/internal/util/http2"
"golang.org/x/net/http2"
)
@ -108,7 +107,15 @@ func (l *http2Listener) Close() (err error) {
func (l *http2Listener) handleFunc(w http.ResponseWriter, r *http.Request) {
raddr, _ := net.ResolveTCPAddr("tcp", r.RemoteAddr)
conn := http2_util.NewServerConn(w, r, l.addr, raddr)
conn := &conn{
laddr: l.addr,
raddr: raddr,
closed: make(chan struct{}),
md: md.MapMetadata{
"r": r,
"w": w,
},
}
select {
case l.cqueue <- conn:
default:

60
listener/tap/conn.go Normal file
View File

@ -0,0 +1,60 @@
package tap
import (
"errors"
"net"
"time"
mdata "github.com/go-gost/gost/v3/pkg/metadata"
"github.com/songgao/water"
)
type conn struct {
ifce *water.Interface
laddr net.Addr
raddr net.Addr
}
func (c *conn) Read(b []byte) (n int, err error) {
return c.ifce.Read(b)
}
func (c *conn) Write(b []byte) (n int, err error) {
return c.ifce.Write(b)
}
func (c *conn) LocalAddr() net.Addr {
return c.laddr
}
func (c *conn) RemoteAddr() net.Addr {
return c.raddr
}
func (c *conn) SetDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetReadDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetWriteDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tap", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) Close() (err error) {
return c.ifce.Close()
}
type metadataConn struct {
net.Conn
md mdata.Metadata
}
func withMetadata(md mdata.Metadata, c net.Conn) net.Conn {
return &metadataConn{
Conn: c,
md: md,
}
}

41
listener/tap/listener.go
View File

@ -5,9 +5,9 @@ import (
"github.com/go-gost/gost/v3/pkg/listener"
"github.com/go-gost/gost/v3/pkg/logger"
md "github.com/go-gost/gost/v3/pkg/metadata"
mdata "github.com/go-gost/gost/v3/pkg/metadata"
"github.com/go-gost/gost/v3/pkg/registry"
tap_util "github.com/go-gost/x/internal/util/tap"
metrics "github.com/go-gost/metrics/wrapper"
)
func init() {
@ -15,26 +15,28 @@ func init() {
}
type tapListener struct {
saddr string
addr net.Addr
cqueue chan net.Conn
closed chan struct{}
logger logger.Logger
md metadata
saddr string
addr net.Addr
cqueue chan net.Conn
closed chan struct{}
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &tapListener{
saddr: options.Addr,
logger: options.Logger,
saddr: options.Addr,
logger: options.Logger,
options: options,
}
}
func (l *tapListener) Init(md md.Metadata) (err error) {
func (l *tapListener) Init(md mdata.Metadata) (err error) {
if err = l.parseMetadata(md); err != nil {
return
}
@ -64,9 +66,18 @@ func (l *tapListener) Init(md md.Metadata) (err error) {
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})
var c net.Conn
c = &conn{
ifce: ifce,
laddr: l.addr,
raddr: &net.IPAddr{IP: ip},
}
c = metrics.WrapConn(l.options.Service, c)
c = withMetadata(mdata.MapMetadata{
"config": l.md.config,
}, c)
l.cqueue <- conn
l.cqueue <- c
return
}

60
listener/tun/conn.go Normal file
View File

@ -0,0 +1,60 @@
package tun
import (
"errors"
"net"
"time"
mdata "github.com/go-gost/gost/v3/pkg/metadata"
"github.com/songgao/water"
)
type conn struct {
ifce *water.Interface
laddr net.Addr
raddr net.Addr
}
func (c *conn) Read(b []byte) (n int, err error) {
return c.ifce.Read(b)
}
func (c *conn) Write(b []byte) (n int, err error) {
return c.ifce.Write(b)
}
func (c *conn) LocalAddr() net.Addr {
return c.laddr
}
func (c *conn) RemoteAddr() net.Addr {
return c.raddr
}
func (c *conn) SetDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tun", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetReadDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tun", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetWriteDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "tun", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) Close() (err error) {
return c.ifce.Close()
}
type metadataConn struct {
net.Conn
md mdata.Metadata
}
func withMetadata(md mdata.Metadata, c net.Conn) net.Conn {
return &metadataConn{
Conn: c,
md: md,
}
}

19
listener/tun/listener.go
View File

@ -3,11 +3,11 @@ package tun
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/v3/pkg/listener"
"github.com/go-gost/gost/v3/pkg/logger"
md "github.com/go-gost/gost/v3/pkg/metadata"
mdata "github.com/go-gost/gost/v3/pkg/metadata"
"github.com/go-gost/gost/v3/pkg/registry"
tun_util "github.com/go-gost/x/internal/util/tun"
)
func init() {
@ -34,7 +34,7 @@ func NewListener(opts ...listener.Option) listener.Listener {
}
}
func (l *tunListener) Init(md md.Metadata) (err error) {
func (l *tunListener) Init(md mdata.Metadata) (err error) {
if err = l.parseMetadata(md); err != nil {
return
}
@ -64,9 +64,18 @@ func (l *tunListener) Init(md md.Metadata) (err error) {
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})
var c net.Conn
c = &conn{
ifce: ifce,
laddr: l.addr,
raddr: &net.IPAddr{IP: ip},
}
c = metrics.WrapConn(l.options.Service, c)
c = withMetadata(mdata.MapMetadata{
"config": l.md.config,
}, c)
l.cqueue <- conn
l.cqueue <- c
return
}