mirror of https://github.com/XTLS/Xray-core
DispatchLink(): Fix user stats
Fixes https://github.com/XTLS/Xray-core/pull/5076#issuecomment-3243431593pull/4283/merge
parent
19f8907296
commit
d20397c15d
|
@ -196,6 +196,47 @@ func (d *DefaultDispatcher) getLink(ctx context.Context) (*transport.Link, *tran
|
||||||
return inboundLink, outboundLink
|
return inboundLink, outboundLink
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *DefaultDispatcher) WrapLink(ctx context.Context, link *transport.Link) *transport.Link {
|
||||||
|
sessionInbound := session.InboundFromContext(ctx)
|
||||||
|
var user *protocol.MemoryUser
|
||||||
|
if sessionInbound != nil {
|
||||||
|
user = sessionInbound.User
|
||||||
|
}
|
||||||
|
|
||||||
|
link.Reader = &buf.TimeoutWrapperReader{Reader: link.Reader}
|
||||||
|
|
||||||
|
if user != nil && len(user.Email) > 0 {
|
||||||
|
p := d.policy.ForLevel(user.Level)
|
||||||
|
if p.Stats.UserUplink {
|
||||||
|
name := "user>>>" + user.Email + ">>>traffic>>>uplink"
|
||||||
|
if c, _ := stats.GetOrRegisterCounter(d.stats, name); c != nil {
|
||||||
|
link.Reader.(*buf.TimeoutWrapperReader).Counter = c
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if p.Stats.UserDownlink {
|
||||||
|
name := "user>>>" + user.Email + ">>>traffic>>>downlink"
|
||||||
|
if c, _ := stats.GetOrRegisterCounter(d.stats, name); c != nil {
|
||||||
|
link.Writer = &SizeStatWriter{
|
||||||
|
Counter: c,
|
||||||
|
Writer: link.Writer,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if p.Stats.UserOnline {
|
||||||
|
name := "user>>>" + user.Email + ">>>online"
|
||||||
|
if om, _ := stats.GetOrRegisterOnlineMap(d.stats, name); om != nil {
|
||||||
|
sessionInbounds := session.InboundFromContext(ctx)
|
||||||
|
userIP := sessionInbounds.Source.Address.String()
|
||||||
|
om.AddIP(userIP)
|
||||||
|
// log Online user with ips
|
||||||
|
// errors.LogDebug(ctx, "user>>>" + user.Email + ">>>online", om.Count(), om.List())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return link
|
||||||
|
}
|
||||||
|
|
||||||
func (d *DefaultDispatcher) shouldOverride(ctx context.Context, result SniffResult, request session.SniffingRequest, destination net.Destination) bool {
|
func (d *DefaultDispatcher) shouldOverride(ctx context.Context, result SniffResult, request session.SniffingRequest, destination net.Destination) bool {
|
||||||
domain := result.Domain()
|
domain := result.Domain()
|
||||||
if domain == "" {
|
if domain == "" {
|
||||||
|
@ -316,6 +357,7 @@ func (d *DefaultDispatcher) DispatchLink(ctx context.Context, destination net.De
|
||||||
content = new(session.Content)
|
content = new(session.Content)
|
||||||
ctx = session.ContextWithContent(ctx, content)
|
ctx = session.ContextWithContent(ctx, content)
|
||||||
}
|
}
|
||||||
|
outbound = d.WrapLink(ctx, outbound)
|
||||||
sniffingRequest := content.SniffingRequest
|
sniffingRequest := content.SniffingRequest
|
||||||
if !sniffingRequest.Enabled {
|
if !sniffingRequest.Enabled {
|
||||||
d.routedDispatch(ctx, outbound, destination)
|
d.routedDispatch(ctx, outbound, destination)
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/xtls/xray-core/app/dispatcher"
|
||||||
"github.com/xtls/xray-core/common/errors"
|
"github.com/xtls/xray-core/common/errors"
|
||||||
"github.com/xtls/xray-core/common/mux"
|
"github.com/xtls/xray-core/common/mux"
|
||||||
"github.com/xtls/xray-core/common/net"
|
"github.com/xtls/xray-core/common/net"
|
||||||
|
@ -200,6 +201,7 @@ func (w *BridgeWorker) DispatchLink(ctx context.Context, dest net.Destination, l
|
||||||
return w.dispatcher.DispatchLink(ctx, dest, link)
|
return w.dispatcher.DispatchLink(ctx, dest, link)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
link = w.dispatcher.(*dispatcher.DefaultDispatcher).WrapLink(ctx, link)
|
||||||
w.handleInternalConn(link)
|
w.handleInternalConn(link)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -30,6 +30,7 @@ type TimeoutReader interface {
|
||||||
|
|
||||||
type TimeoutWrapperReader struct {
|
type TimeoutWrapperReader struct {
|
||||||
Reader
|
Reader
|
||||||
|
stats.Counter
|
||||||
mb MultiBuffer
|
mb MultiBuffer
|
||||||
err error
|
err error
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
|
@ -39,11 +40,16 @@ func (r *TimeoutWrapperReader) ReadMultiBuffer() (MultiBuffer, error) {
|
||||||
if r.done != nil {
|
if r.done != nil {
|
||||||
<-r.done
|
<-r.done
|
||||||
r.done = nil
|
r.done = nil
|
||||||
|
if r.Counter != nil {
|
||||||
|
r.Counter.Add(int64(r.mb.Len()))
|
||||||
|
}
|
||||||
return r.mb, r.err
|
return r.mb, r.err
|
||||||
}
|
}
|
||||||
r.mb = nil
|
r.mb, r.err = r.Reader.ReadMultiBuffer()
|
||||||
r.err = nil
|
if r.Counter != nil {
|
||||||
return r.Reader.ReadMultiBuffer()
|
r.Counter.Add(int64(r.mb.Len()))
|
||||||
|
}
|
||||||
|
return r.mb, r.err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *TimeoutWrapperReader) ReadMultiBufferTimeout(duration time.Duration) (MultiBuffer, error) {
|
func (r *TimeoutWrapperReader) ReadMultiBufferTimeout(duration time.Duration) (MultiBuffer, error) {
|
||||||
|
@ -62,6 +68,9 @@ func (r *TimeoutWrapperReader) ReadMultiBufferTimeout(duration time.Duration) (M
|
||||||
select {
|
select {
|
||||||
case <-r.done:
|
case <-r.done:
|
||||||
r.done = nil
|
r.done = nil
|
||||||
|
if r.Counter != nil {
|
||||||
|
r.Counter.Add(int64(r.mb.Len()))
|
||||||
|
}
|
||||||
return r.mb, r.err
|
return r.mb, r.err
|
||||||
case <-timeout:
|
case <-timeout:
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
|
"github.com/xtls/xray-core/app/dispatcher"
|
||||||
"github.com/xtls/xray-core/common"
|
"github.com/xtls/xray-core/common"
|
||||||
"github.com/xtls/xray-core/common/buf"
|
"github.com/xtls/xray-core/common/buf"
|
||||||
"github.com/xtls/xray-core/common/errors"
|
"github.com/xtls/xray-core/common/errors"
|
||||||
|
@ -61,6 +62,7 @@ func (s *Server) DispatchLink(ctx context.Context, dest net.Destination, link *t
|
||||||
if dest.Address != muxCoolAddress {
|
if dest.Address != muxCoolAddress {
|
||||||
return s.dispatcher.DispatchLink(ctx, dest, link)
|
return s.dispatcher.DispatchLink(ctx, dest, link)
|
||||||
}
|
}
|
||||||
|
link = s.dispatcher.(*dispatcher.DefaultDispatcher).WrapLink(ctx, link)
|
||||||
_, err := NewServerWorker(ctx, s.dispatcher, link)
|
_, err := NewServerWorker(ctx, s.dispatcher, link)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -182,7 +182,7 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn st
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
||||||
Reader: &buf.TimeoutWrapperReader{Reader: reader},
|
Reader: reader,
|
||||||
Writer: writer},
|
Writer: writer},
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return errors.New("failed to dispatch request").Base(err)
|
return errors.New("failed to dispatch request").Base(err)
|
||||||
|
|
|
@ -193,7 +193,7 @@ func (s *Server) handleConnect(ctx context.Context, _ *http.Request, buffer *buf
|
||||||
inbound.CanSpliceCopy = 1
|
inbound.CanSpliceCopy = 1
|
||||||
}
|
}
|
||||||
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
||||||
Reader: &buf.TimeoutWrapperReader{Reader: reader},
|
Reader: reader,
|
||||||
Writer: buf.NewWriter(conn)},
|
Writer: buf.NewWriter(conn)},
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return errors.New("failed to dispatch request").Base(err)
|
return errors.New("failed to dispatch request").Base(err)
|
||||||
|
|
|
@ -161,7 +161,7 @@ func (s *Server) processTCP(ctx context.Context, conn stat.Connection, dispatche
|
||||||
inbound.CanSpliceCopy = 1
|
inbound.CanSpliceCopy = 1
|
||||||
}
|
}
|
||||||
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
if err := dispatcher.DispatchLink(ctx, dest, &transport.Link{
|
||||||
Reader: &buf.TimeoutWrapperReader{Reader: reader},
|
Reader: reader,
|
||||||
Writer: buf.NewWriter(conn)},
|
Writer: buf.NewWriter(conn)},
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return errors.New("failed to dispatch request").Base(err)
|
return errors.New("failed to dispatch request").Base(err)
|
||||||
|
|
|
@ -563,7 +563,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
|
||||||
bufferWriter.SetFlushNext()
|
bufferWriter.SetFlushNext()
|
||||||
|
|
||||||
if err := dispatcher.DispatchLink(ctx, request.Destination(), &transport.Link{
|
if err := dispatcher.DispatchLink(ctx, request.Destination(), &transport.Link{
|
||||||
Reader: &buf.TimeoutWrapperReader{Reader: clientReader},
|
Reader: clientReader,
|
||||||
Writer: clientWriter},
|
Writer: clientWriter},
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return errors.New("failed to dispatch request").Base(err)
|
return errors.New("failed to dispatch request").Base(err)
|
||||||
|
|
Loading…
Reference in New Issue