ginuerzh
b8d9c79f72
When rtcp listener calls Router.Bind with ":8000" (port-only address), the relay AddrFeature.ParseFrom fails because net.SplitHostPort returns an empty host. This leaves AType at default 0, causing AddrFeature.Encode to return ErrBadAddrType. Fix by normalizing port-only addresses to "0.0.0.0:<port>" in both tunnel and relay connectors before ParseFrom. Also fix error check on resp.WriteTo in the tunnel handler's handleBind to prevent silent protocol desync.
113 lines
2.7 KiB
Go
113 lines
2.7 KiB
Go
package tunnel
|
|
|
|
import (
|
|
"context"
|
|
"crypto/md5"
|
|
"encoding/hex"
|
|
"net"
|
|
|
|
"github.com/go-gost/core/ingress"
|
|
"github.com/go-gost/core/logger"
|
|
"github.com/go-gost/core/observer/stats"
|
|
"github.com/go-gost/core/sd"
|
|
"github.com/go-gost/relay"
|
|
"github.com/go-gost/x/internal/util/mux"
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
func (h *tunnelHandler) handleBind(ctx context.Context, conn net.Conn, network, address string, tunnelID relay.TunnelID, log logger.Logger) (err error) {
|
|
resp := relay.Response{
|
|
Version: relay.Version1,
|
|
Status: relay.StatusOK,
|
|
}
|
|
|
|
uuid, err := uuid.NewRandom()
|
|
if err != nil {
|
|
resp.Status = relay.StatusInternalServerError
|
|
resp.WriteTo(conn)
|
|
return
|
|
}
|
|
connectorID := relay.NewConnectorID(uuid[:])
|
|
if network == "udp" {
|
|
connectorID = relay.NewUDPConnectorID(uuid[:])
|
|
}
|
|
// copy weight from tunnelID
|
|
connectorID = connectorID.SetWeight(tunnelID.Weight())
|
|
|
|
v := md5.Sum([]byte(tunnelID.String()))
|
|
endpoint := hex.EncodeToString(v[:8])
|
|
|
|
host, port, _ := net.SplitHostPort(address)
|
|
if host == "" || h.md.ingress == nil {
|
|
host = endpoint
|
|
} else if host != endpoint {
|
|
if rule := h.md.ingress.GetRule(ctx, host, ingress.WithService(h.options.Service)); rule != nil && rule.Endpoint != tunnelID.String() {
|
|
host = endpoint
|
|
}
|
|
}
|
|
addr := net.JoinHostPort(host, port)
|
|
|
|
af := &relay.AddrFeature{}
|
|
err = af.ParseFrom(addr)
|
|
if err != nil {
|
|
log.Warn(err)
|
|
}
|
|
resp.Features = append(resp.Features, af,
|
|
&relay.TunnelFeature{
|
|
ID: connectorID,
|
|
},
|
|
)
|
|
if _, err = resp.WriteTo(conn); err != nil {
|
|
log.Error(err)
|
|
return
|
|
}
|
|
|
|
// Upgrade connection to multiplex session.
|
|
session, err := mux.ClientSession(conn, h.md.muxCfg)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
var stats stats.Stats
|
|
if h.stats != nil {
|
|
stats = h.stats.Stats(tunnelID.String())
|
|
}
|
|
|
|
c := NewConnector(connectorID, tunnelID, h.id, session, &ConnectorOptions{
|
|
service: h.options.Service,
|
|
sd: h.md.sd,
|
|
stats: stats,
|
|
limiter: h.limiter,
|
|
})
|
|
|
|
h.pool.Add(tunnelID, c, h.md.tunnelTTL)
|
|
if h.md.ingress != nil {
|
|
h.md.ingress.SetRule(ctx, &ingress.Rule{
|
|
Hostname: endpoint,
|
|
Endpoint: tunnelID.String(),
|
|
}, ingress.WithService(h.options.Service))
|
|
if host != "" {
|
|
h.md.ingress.SetRule(ctx, &ingress.Rule{
|
|
Hostname: host,
|
|
Endpoint: tunnelID.String(),
|
|
}, ingress.WithService(h.options.Service))
|
|
}
|
|
}
|
|
if h.md.sd != nil {
|
|
err := h.md.sd.Register(ctx, &sd.Service{
|
|
ID: connectorID.String(),
|
|
Name: tunnelID.String(),
|
|
Node: h.id,
|
|
Network: network,
|
|
Address: h.md.entryPoint,
|
|
})
|
|
if err != nil {
|
|
h.log.Error(err)
|
|
}
|
|
}
|
|
|
|
log.Debugf("%s/%s: tunnel=%s, connector=%s, weight=%d established", addr, network, tunnelID, connectorID, connectorID.Weight())
|
|
|
|
return
|
|
}
|