move size stats writer into vio

This commit is contained in:
Darien Raymond
2018-10-15 09:03:40 +02:00
parent 33becfe553
commit dcae6c63dd
3 changed files with 53 additions and 8 deletions
+6 -7
View File
@@ -15,12 +15,11 @@ import (
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/session"
"v2ray.com/core/common/stats"
"v2ray.com/core/common/vio"
"v2ray.com/core/features/outbound"
"v2ray.com/core/features/policy"
"v2ray.com/core/features/routing"
feature_stats "v2ray.com/core/features/stats"
"v2ray.com/core/features/stats"
"v2ray.com/core/transport/pipe"
)
@@ -87,7 +86,7 @@ type DefaultDispatcher struct {
ohm outbound.Manager
router routing.Router
policy policy.Manager
stats feature_stats.Manager
stats stats.Manager
}
// NewDefaultDispatcher create a new DefaultDispatcher.
@@ -144,8 +143,8 @@ func (d *DefaultDispatcher) getLink(ctx context.Context) (*vio.Link, *vio.Link)
p := d.policy.ForLevel(user.Level)
if p.Stats.UserUplink {
name := "user>>>" + user.Email + ">>>traffic>>>uplink"
if c, _ := feature_stats.GetOrRegisterCounter(d.stats, name); c != nil {
inboundLink.Writer = &stats.SizeStatWriter{
if c, _ := stats.GetOrRegisterCounter(d.stats, name); c != nil {
inboundLink.Writer = &vio.SizeStatWriter{
Counter: c,
Writer: inboundLink.Writer,
}
@@ -153,8 +152,8 @@ func (d *DefaultDispatcher) getLink(ctx context.Context) (*vio.Link, *vio.Link)
}
if p.Stats.UserDownlink {
name := "user>>>" + user.Email + ">>>traffic>>>downlink"
if c, _ := feature_stats.GetOrRegisterCounter(d.stats, name); c != nil {
outboundLink.Writer = &stats.SizeStatWriter{
if c, _ := stats.GetOrRegisterCounter(d.stats, name); c != nil {
outboundLink.Writer = &vio.SizeStatWriter{
Counter: c,
Writer: outboundLink.Writer,
}