From 92db078642da596ecc860a80de6c38f745aed84c Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Sat, 16 Sep 2023 21:47:40 +0800 Subject: [PATCH] add network feature for relay --- connector/relay/connector.go | 18 +++++- go.mod | 4 +- go.sum | 16 ++--- handler/com/metadata.go | 32 ---------- handler/relay/connect.go | 29 +++++++-- handler/relay/handler.go | 7 ++- handler/{com => serial}/handler.go | 60 +++++++------------ handler/serial/metadata.go | 22 +++++++ .../com => internal/util/serial}/conn.go | 23 ++++--- internal/util/serial/serial.go | 50 ++++++++++++++++ listener/com/metadata.go | 33 ---------- listener/{com => serial}/listener.go | 56 +++++------------ listener/serial/metadata.go | 17 ++++++ 13 files changed, 193 insertions(+), 174 deletions(-) delete mode 100644 handler/com/metadata.go rename handler/{com => serial}/handler.go (65%) create mode 100644 handler/serial/metadata.go rename {listener/com => internal/util/serial}/conn.go (76%) create mode 100644 internal/util/serial/serial.go delete mode 100644 listener/com/metadata.go rename listener/{com => serial}/listener.go (58%) create mode 100644 listener/serial/metadata.go diff --git a/connector/relay/connector.go b/connector/relay/connector.go index 10a9130..5a8c904 100644 --- a/connector/relay/connector.go +++ b/connector/relay/connector.go @@ -55,8 +55,13 @@ func (c *relayConnector) Connect(ctx context.Context, conn net.Conn, network, ad Version: relay.Version1, Cmd: relay.CmdConnect, } - if network == "udp" || network == "udp4" || network == "udp6" { + + switch network { + case "udp", "udp4", "udp6": req.Cmd |= relay.FUDP + req.Features = append(req.Features, &relay.NetworkFeature{ + Network: relay.NetworkUDP, + }) // UDP association if address == "" { @@ -68,6 +73,15 @@ func (c *relayConnector) Connect(ctx context.Context, conn net.Conn, network, ad return relay_util.UDPTunClientConn(conn, nil), nil } + + case "unix": + req.Features = append(req.Features, &relay.NetworkFeature{ + Network: relay.NetworkUnix, + }) + case "serial": + req.Features = append(req.Features, &relay.NetworkFeature{ + Network: relay.NetworkSerial, + }) } if c.options.Auth != nil { @@ -103,7 +117,7 @@ func (c *relayConnector) Connect(ctx context.Context, conn net.Conn, network, ad } switch network { - case "tcp", "tcp4", "tcp6": + case "tcp", "tcp4", "tcp6", "unix", "serial": if !c.md.noDelay { cc := &tcpConn{ Conn: conn, diff --git a/go.mod b/go.mod index fdfccba..639c397 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d github.com/gin-contrib/cors v1.3.1 github.com/gin-gonic/gin v1.9.1 - github.com/go-gost/core v0.0.0-20230418124644-a2115a3d3876 + github.com/go-gost/core v0.0.0-20230916134612-801f835e9ac1 github.com/go-gost/gosocks4 v0.0.1 github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 github.com/go-gost/plugin v0.0.0-20230418123101-d221a4ec9a98 - github.com/go-gost/relay v0.4.0 + github.com/go-gost/relay v0.4.1-0.20230916134211-828f314ddfe7 github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 github.com/go-redis/redis/v8 v8.11.5 github.com/gobwas/glob v0.2.3 diff --git a/go.sum b/go.sum index ea97b09..07d1c7c 100644 --- a/go.sum +++ b/go.sum @@ -99,16 +99,16 @@ github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SU github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gost/core v0.0.0-20230418124644-a2115a3d3876 h1:SnrPPRt+IEHhxWmVwsiVu8yrfM8TS8ItYG3WRR5P/7c= -github.com/go-gost/core v0.0.0-20230418124644-a2115a3d3876/go.mod h1:pKIGDCHZSnxTUmBNMjVogJ+EjUdvaRdqMIJzQhEVOGQ= +github.com/go-gost/core v0.0.0-20230916134612-801f835e9ac1 h1:2B5ir4WZUv5EI+5sKsvSP6GDbrvx/b2+/BnQDPFV1Kg= +github.com/go-gost/core v0.0.0-20230916134612-801f835e9ac1/go.mod h1:db6lBY+DkC3ct4OJfclsKnQwQmcv1B9NnMnpI2MNUwY= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= github.com/go-gost/plugin v0.0.0-20230418123101-d221a4ec9a98 h1:dOtNcxZbMDwtowa8b91nK2JcTL1lG0EIv0sXqSbvTc4= github.com/go-gost/plugin v0.0.0-20230418123101-d221a4ec9a98/go.mod h1:IGQawP0E9B36VZ0AfDOpBK23bW4rOSiHtnU7mtafpAM= -github.com/go-gost/relay v0.4.0 h1:zSOqJqnwV63oRiQ6fuurDYvehAVi3PizzFeE1gT+qo4= -github.com/go-gost/relay v0.4.0/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= +github.com/go-gost/relay v0.4.1-0.20230916134211-828f314ddfe7 h1:qAG1OyjvdA5h221CfFSS3J359V3d2E7dJWyP29QoDSI= +github.com/go-gost/relay v0.4.1-0.20230916134211-828f314ddfe7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZGYO3nb5+6Bjw9+tsFkA9sYynrOvDvvC4uDV2I= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -201,8 +201,6 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb h1:LCMfzVg3sflxTs4UvuP4D8CkoZnfHLe2qzqgDn/4OHs= -github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 h1:gpptm606MZYGaMHMsB4Srmb6EbW/IVHnt04rcMXnkBQ= github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -330,8 +328,6 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/qtls-go1-20 v0.3.3 h1:17/glZSLI9P9fDAeyCHBFSWSqJcwx1byhLwP5eUIDCM= -github.com/quic-go/qtls-go1-20 v0.3.3/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/quic-go v0.38.1 h1:M36YWA5dEhEeT+slOu/SwMEucbYd0YFidxG3KlGPZaE= @@ -451,8 +447,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 h1:5oN1Pz/eDhCpbMbLstvIPa0b/BEQo6g6nwV3pLjfM6w= -golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -682,8 +676,6 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/handler/com/metadata.go b/handler/com/metadata.go deleted file mode 100644 index d3c2554..0000000 --- a/handler/com/metadata.go +++ /dev/null @@ -1,32 +0,0 @@ -package com - -import ( - "time" - - mdata "github.com/go-gost/core/metadata" - mdutil "github.com/go-gost/core/metadata/util" -) - -const ( - defaultBaudRate = 9600 - defaultParity = "odd" -) - -type metadata struct { - baudRate int - parity string - timeout time.Duration -} - -func (h *comHandler) parseMetadata(md mdata.Metadata) (err error) { - h.md.baudRate = mdutil.GetInt(md, "baud", "com.baud", "handler.com.baud") - if h.md.baudRate <= 0 { - h.md.baudRate = defaultBaudRate - } - h.md.parity = mdutil.GetString(md, "parity", "com.parity", "handler.com.parity") - if h.md.parity == "" { - h.md.parity = defaultParity - } - h.md.timeout = mdutil.GetDuration(md, "timeout", "com.timeout", "handler.com.timeout") - return -} diff --git a/handler/relay/connect.go b/handler/relay/connect.go index 04efd3d..9eab3d4 100644 --- a/handler/relay/connect.go +++ b/handler/relay/connect.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "io" "net" "strconv" "time" @@ -12,9 +13,17 @@ import ( "github.com/go-gost/relay" xnet "github.com/go-gost/x/internal/net" sx "github.com/go-gost/x/internal/util/selector" + serial_util "github.com/go-gost/x/internal/util/serial" + goserial "github.com/tarm/serial" ) -func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) error { +func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) (err error) { + if network == "unix" || network == "serial" { + if host, _, _ := net.SplitHostPort(address); host != "" { + address = host + } + } + log = log.WithFields(map[string]any{ "dst": fmt.Sprintf("%s/%s", address, network), "cmd": "connect", @@ -30,23 +39,31 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network if address == "" { resp.Status = relay.StatusBadRequest resp.WriteTo(conn) - err := errors.New("target not specified") + err = errors.New("target not specified") log.Error(err) - return err + return } if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, address) { log.Debug("bypass: ", address) resp.Status = relay.StatusForbidden - _, err := resp.WriteTo(conn) - return err + _, err = resp.WriteTo(conn) + return } switch h.md.hash { case "host": ctx = sx.ContextWithHash(ctx, &sx.Hash{Source: address}) } - cc, err := h.router.Dial(ctx, network, address) + + var cc io.ReadWriteCloser + + switch network { + case "serial": + cc, err = goserial.OpenPort(serial_util.ParseConfigFromAddr(address)) + default: + cc, err = h.router.Dial(ctx, network, address) + } if err != nil { resp.Status = relay.StatusNetworkUnreachable resp.WriteTo(conn) diff --git a/handler/relay/handler.go b/handler/relay/handler.go index 71e6f6e..6bb596d 100644 --- a/handler/relay/handler.go +++ b/handler/relay/handler.go @@ -173,6 +173,7 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle var user, pass string var address string + var networkID relay.NetworkID var tunnelID relay.TunnelID for _, f := range req.Features { switch f.Type() { @@ -188,6 +189,10 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle if feature, _ := f.(*relay.TunnelFeature); feature != nil { tunnelID = relay.NewTunnelID(feature.ID[:]) } + case relay.FeatureNetwork: + if feature, _ := f.(*relay.NetworkFeature); feature != nil { + networkID = feature.Network + } } } @@ -202,7 +207,7 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle return ErrUnauthorized } - network := "tcp" + network := networkID.String() if (req.Cmd & relay.FUDP) == relay.FUDP { network = "udp" } diff --git a/handler/com/handler.go b/handler/serial/handler.go similarity index 65% rename from handler/com/handler.go rename to handler/serial/handler.go index 20c44bf..d18b21a 100644 --- a/handler/com/handler.go +++ b/handler/serial/handler.go @@ -1,10 +1,10 @@ -package com +package serial import ( "context" "errors" + "io" "net" - "strings" "time" "github.com/go-gost/core/chain" @@ -12,15 +12,17 @@ import ( "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" xnet "github.com/go-gost/x/internal/net" + serial_util "github.com/go-gost/x/internal/util/serial" "github.com/go-gost/x/registry" goserial "github.com/tarm/serial" ) func init() { + registry.HandlerRegistry().Register("serial", NewHandler) registry.HandlerRegistry().Register("com", NewHandler) } -type comHandler struct { +type serialHandler struct { hop chain.Hop router *chain.Router md metadata @@ -33,12 +35,12 @@ func NewHandler(opts ...handler.Option) handler.Handler { opt(&options) } - return &comHandler{ + return &serialHandler{ options: options, } } -func (h *comHandler) Init(md md.Metadata) (err error) { +func (h *serialHandler) Init(md md.Metadata) (err error) { if err = h.parseMetadata(md); err != nil { return } @@ -52,28 +54,20 @@ func (h *comHandler) Init(md md.Metadata) (err error) { } // Forward implements handler.Forwarder. -func (h *comHandler) Forward(hop chain.Hop) { +func (h *serialHandler) Forward(hop chain.Hop) { h.hop = hop } -func (h *comHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error { +func (h *serialHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error { defer conn.Close() log := h.options.Logger - start := time.Now() log = log.WithFields(map[string]any{ "remote": conn.RemoteAddr().String(), "local": conn.LocalAddr().String(), }) - log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr()) - defer func() { - log.WithFields(map[string]any{ - "duration": time.Since(start), - }).Infof("%s >< %s", conn.RemoteAddr(), conn.LocalAddr()) - }() - var target *chain.Node if h.hop != nil { target = h.hop.Select(ctx) @@ -94,7 +88,7 @@ func (h *comHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler. // serial port if _, _, err := net.SplitHostPort(target.Addr); err != nil { - return h.forwardCom(ctx, conn, target, log) + return h.forwardSerial(ctx, conn, target, log) } cc, err := h.router.Dial(ctx, "tcp", target.Addr) @@ -120,17 +114,20 @@ func (h *comHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler. return nil } -func (h *comHandler) forwardCom(ctx context.Context, conn net.Conn, target *chain.Node, log logger.Logger) error { - port, err := goserial.OpenPort(&goserial.Config{ - Name: target.Addr, - Baud: h.md.baudRate, - Parity: parseParity(h.md.parity), - ReadTimeout: h.md.timeout, - }) +func (h *serialHandler) forwardSerial(ctx context.Context, conn net.Conn, target *chain.Node, log logger.Logger) (err error) { + var port io.ReadWriteCloser + + if opts := h.router.Options(); opts != nil && opts.Chain != nil { + port, err = h.router.Dial(ctx, "serial", target.Addr) + } else { + cfg := serial_util.ParseConfigFromAddr(target.Addr) + cfg.ReadTimeout = h.md.timeout + port, err = goserial.OpenPort(cfg) + } if err != nil { + log.Error(err) return err } - defer port.Close() t := time.Now() @@ -142,18 +139,3 @@ func (h *comHandler) forwardCom(ctx context.Context, conn net.Conn, target *chai return nil } - -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 - } -} diff --git a/handler/serial/metadata.go b/handler/serial/metadata.go new file mode 100644 index 0000000..4a0f081 --- /dev/null +++ b/handler/serial/metadata.go @@ -0,0 +1,22 @@ +package serial + +import ( + "time" + + mdata "github.com/go-gost/core/metadata" + mdutil "github.com/go-gost/core/metadata/util" +) + +const ( + defaultPort = "COM1" + defaultBaudRate = 9600 +) + +type metadata struct { + timeout time.Duration +} + +func (h *serialHandler) parseMetadata(md mdata.Metadata) (err error) { + h.md.timeout = mdutil.GetDuration(md, "timeout", "serial.timeout", "handler.serial.timeout") + return +} diff --git a/listener/com/conn.go b/internal/util/serial/conn.go similarity index 76% rename from listener/com/conn.go rename to internal/util/serial/conn.go index f589ee6..d329ee0 100644 --- a/listener/com/conn.go +++ b/internal/util/serial/conn.go @@ -1,4 +1,4 @@ -package com +package serial import ( "context" @@ -15,6 +15,15 @@ type conn struct { cancel context.CancelFunc } +func NewConn(port io.ReadWriteCloser, addr net.Addr, cancel context.CancelFunc) net.Conn { + return &conn{ + port: port, + laddr: addr, + raddr: addr, + cancel: cancel, + } +} + func (c *conn) Read(b []byte) (n int, err error) { return c.port.Read(b) } @@ -50,14 +59,14 @@ func (c *conn) Close() (err error) { return c.port.Close() } -type comAddr struct { - port string +type Addr struct { + Port string } -func (a *comAddr) Network() string { - return "com" +func (a *Addr) Network() string { + return "serial" } -func (a *comAddr) String() string { - return a.port +func (a *Addr) String() string { + return a.Port } diff --git a/internal/util/serial/serial.go b/internal/util/serial/serial.go new file mode 100644 index 0000000..17dc5b3 --- /dev/null +++ b/internal/util/serial/serial.go @@ -0,0 +1,50 @@ +package serial + +import ( + "strconv" + "strings" + + goserial "github.com/tarm/serial" +) + +const ( + DefaultPort = "COM1" + DefaultBaudRate = 9600 + DefaultParity = "none" +) + +// COM1,9600,odd +func ParseConfigFromAddr(addr string) *goserial.Config { + cfg := &goserial.Config{ + Name: DefaultPort, + Baud: DefaultBaudRate, + } + ss := strings.Split(addr, ",") + switch len(ss) { + case 1: + cfg.Name = ss[0] + case 2: + cfg.Name = ss[0] + cfg.Baud, _ = strconv.Atoi(ss[1]) + case 3: + cfg.Name = ss[0] + cfg.Baud, _ = strconv.Atoi(ss[1]) + cfg.Parity = parseParity(ss[2]) + } + return cfg +} + +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 + } +} diff --git a/listener/com/metadata.go b/listener/com/metadata.go deleted file mode 100644 index 769bc74..0000000 --- a/listener/com/metadata.go +++ /dev/null @@ -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 -} diff --git a/listener/com/listener.go b/listener/serial/listener.go similarity index 58% rename from listener/com/listener.go rename to listener/serial/listener.go index 8589ab9..a378bc2 100644 --- a/listener/com/listener.go +++ b/listener/serial/listener.go @@ -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 - } -} diff --git a/listener/serial/metadata.go b/listener/serial/metadata.go new file mode 100644 index 0000000..9aef02c --- /dev/null +++ b/listener/serial/metadata.go @@ -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 +}