update cmd

This commit is contained in:
ginuerzh
2021-11-22 23:57:07 +08:00
parent fa8375f763
commit ece51cb0b8
18 changed files with 135 additions and 80 deletions

View File

@ -3,7 +3,6 @@ package relay
import (
"context"
"net"
"strconv"
"time"
"github.com/go-gost/gost/pkg/connector"
@ -72,29 +71,12 @@ func (c *relayConnector) Connect(ctx context.Context, conn net.Conn, network, ad
}
if address != "" {
host, port, _ := net.SplitHostPort(address)
nport, _ := strconv.ParseUint(port, 10, 16)
if host == "" {
host = net.IPv4zero.String()
af := &relay.AddrFeature{}
if err := af.ParseFrom(address); err != nil {
return nil, err
}
if nport > 0 {
var atype uint8
ip := net.ParseIP(host)
if ip == nil {
atype = relay.AddrDomain
} else if ip.To4() == nil {
atype = relay.AddrIPv6
} else {
atype = relay.AddrIPv4
}
req.Features = append(req.Features, &relay.TargetAddrFeature{
AType: atype,
Host: host,
Port: uint16(nport),
})
}
req.Features = append(req.Features, af)
}
return conn, nil

View File

@ -16,12 +16,12 @@ type metadata struct {
func (c *relayConnector) parseMetadata(md md.Metadata) (err error) {
const (
auth = "auth"
user = "user"
connectTimeout = "connectTimeout"
nodelay = "nodelay"
)
if v := md.GetString(auth); v != "" {
if v := md.GetString(user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.user = url.User(ss[0])