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

add network feature for relay

Browse Source
This commit is contained in:
ginuerzh
2023-09-16 21:47:40 +08:00
parent ee4f80b68d
commit 92db078642
13 changed files with 193 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
listener/com/conn.go
View File

@ -1,63 +0,0 @@
package com
import (
"context"
"errors"
"io"
"net"
"time"
)
type conn struct {
port io.ReadWriteCloser
laddr net.Addr
raddr net.Addr
cancel context.CancelFunc
}
func (c *conn) Read(b []byte) (n int, err error) {
return c.port.Read(b)
}
func (c *conn) Write(b []byte) (n int, err error) {
return c.port.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: "com", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetReadDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "com", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) SetWriteDeadline(t time.Time) error {
return &net.OpError{Op: "set", Net: "com", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
}
func (c *conn) Close() (err error) {
if c.cancel != nil {
c.cancel()
}
return c.port.Close()
}
type comAddr struct {
port string
}
func (a *comAddr) Network() string {
return "com"
}
func (a *comAddr) String() string {
return a.port
}

33
listener/com/metadata.go
View File

@ -1,33 +0,0 @@
package com
import (
"time"
md "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util"
)
const (
defaultPort = "COM1"
defaultBaudRate = 9600
defaultParity = "odd"
)
type metadata struct {
baudRate int
parity string
timeout time.Duration
}
func (l *comListener) parseMetadata(md md.Metadata) (err error) {
l.md.baudRate = mdutil.GetInt(md, "baud", "com.baud", "listener.com.baud")
if l.md.baudRate <= 0 {
l.md.baudRate = defaultBaudRate
}
l.md.parity = mdutil.GetString(md, "parity", "com.parity", "listener.com.parity")
if l.md.parity == "" {
l.md.parity = defaultParity
}
l.md.timeout = mdutil.GetDuration(md, "timeout", "com.timeout", "listener.com.timeout")
return
}

56
listener/com/listener.go → listener/serial/listener.go
View File

@ -1,14 +1,14 @@
package com
package serial
import (
"context"
"net"
"strings"
"time"
"github.com/go-gost/core/listener"
"github.com/go-gost/core/logger"
md "github.com/go-gost/core/metadata"
serial_util "github.com/go-gost/x/internal/util/serial"
limiter "github.com/go-gost/x/limiter/traffic/wrapper"
metrics "github.com/go-gost/x/metrics/wrapper"
"github.com/go-gost/x/registry"
@ -16,10 +16,10 @@ import (
)
func init() {
registry.ListenerRegistry().Register("com", NewListener)
registry.ListenerRegistry().Register("serial", NewListener)
}
type comListener struct {
type serialListener struct {
cqueue chan net.Conn
closed chan struct{}
addr net.Addr
@ -35,21 +35,21 @@ func NewListener(opts ...listener.Option) listener.Listener {
}
if options.Addr == "" {
options.Addr = defaultPort
options.Addr = serial_util.DefaultPort
}
return &comListener{
return &serialListener{
logger: options.Logger,
options: options,
}
}
func (l *comListener) Init(md md.Metadata) (err error) {
func (l *serialListener) Init(md md.Metadata) (err error) {
if err = l.parseMetadata(md); err != nil {
return
}
l.addr = &comAddr{port: l.options.Addr}
l.addr = &serial_util.Addr{Port: l.options.Addr}
l.cqueue = make(chan net.Conn)
l.closed = make(chan struct{})
@ -59,7 +59,7 @@ func (l *comListener) Init(md md.Metadata) (err error) {
return
}
func (l *comListener) Accept() (conn net.Conn, err error) {
func (l *serialListener) Accept() (conn net.Conn, err error) {
select {
case conn := <-l.cqueue:
return conn, nil
@ -69,11 +69,11 @@ func (l *comListener) Accept() (conn net.Conn, err error) {
return nil, listener.ErrClosed
}
func (l *comListener) Addr() net.Addr {
func (l *serialListener) Addr() net.Addr {
return l.addr
}
func (l *comListener) Close() error {
func (l *serialListener) Close() error {
select {
case <-l.closed:
return net.ErrClosed
@ -83,27 +83,18 @@ func (l *comListener) Close() error {
return nil
}
func (l *comListener) listenLoop() {
func (l *serialListener) listenLoop() {
for {
ctx, cancel := context.WithCancel(context.Background())
err := func() error {
port, err := goserial.OpenPort(&goserial.Config{
Name: l.options.Addr,
Baud: l.md.baudRate,
Parity: parseParity(l.md.parity),
ReadTimeout: l.md.timeout,
})
cfg := serial_util.ParseConfigFromAddr(l.options.Addr)
cfg.ReadTimeout = l.md.timeout
port, err := goserial.OpenPort(cfg)
if err != nil {
return err
}
var c net.Conn
c = &conn{
port: port,
laddr: l.addr,
raddr: l.addr,
cancel: cancel,
}
c := serial_util.NewConn(port, l.addr, cancel)
c = metrics.WrapConn(l.options.Service, c)
c = limiter.WrapConn(l.options.TrafficLimiter, c)
@ -125,18 +116,3 @@ func (l *comListener) listenLoop() {
time.Sleep(time.Second)
}
}
func parseParity(s string) goserial.Parity {
switch strings.ToLower(s) {
case "o", "odd":
return goserial.ParityOdd
case "e", "even":
return goserial.ParityEven
case "m", "mark":
return goserial.ParityMark
case "s", "space":
return goserial.ParitySpace
default:
return goserial.ParityNone
}
}

17
listener/serial/metadata.go Normal file
View File

@ -0,0 +1,17 @@
package serial
import (
"time"
md "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util"
)
type metadata struct {
timeout time.Duration
}
func (l *serialListener) parseMetadata(md md.Metadata) (err error) {
l.md.timeout = mdutil.GetDuration(md, "timeout", "serial.timeout", "listener.serial.timeout")
return
}