tcjlj/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2025-02-02 06:48:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix counter

Browse Source
This commit is contained in:
yuzuki999 2023-08-28 01:56:01 +08:00
parent 55b2642760
commit 13208c0541
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/counter/conn.go
View File

@ -24,23 +24,23 @@ func NewConnCounter(conn net.Conn, s *TrafficStorage) net.Conn {
ExtendedConn: bufio.NewExtendedConn(conn), ExtendedConn: bufio.NewExtendedConn(conn),
storage: s, storage: s,
readFunc: func(n int64) { readFunc: func(n int64) {
s.DownCounter.Add(n) s.UpCounter.Add(n)
}, },
writeFunc: func(n int64) { writeFunc: func(n int64) {
s.UpCounter.Add(n) s.DownCounter.Add(n)
}, },
} }
} }
func (c *ConnCounter) Read(b []byte) (n int, err error) { func (c *ConnCounter) Read(b []byte) (n int, err error) {
n, err = c.ExtendedConn.Read(b) n, err = c.ExtendedConn.Read(b)
c.storage.DownCounter.Store(int64(n)) c.storage.UpCounter.Store(int64(n))
return return
} }
func (c *ConnCounter) Write(b []byte) (n int, err error) { func (c *ConnCounter) Write(b []byte) (n int, err error) {
n, err = c.ExtendedConn.Write(b) n, err = c.ExtendedConn.Write(b)
c.storage.UpCounter.Store(int64(n)) c.storage.DownCounter.Store(int64(n))
return return
} }
@ -50,7 +50,7 @@ func (c *ConnCounter) ReadBuffer(buffer *buf.Buffer) error {
return err return err
} }
if buffer.Len() > 0 { if buffer.Len() > 0 {
c.storage.DownCounter.Add(int64(buffer.Len())) c.storage.UpCounter.Add(int64(buffer.Len()))
} }
return nil return nil
} }
@ -62,7 +62,7 @@ func (c *ConnCounter) WriteBuffer(buffer *buf.Buffer) error {
return err return err
} }
if dataLen > 0 { if dataLen > 0 {
c.storage.UpCounter.Add(dataLen) c.storage.DownCounter.Add(dataLen)
} }
return nil return nil
} }
@ -95,10 +95,10 @@ func NewPacketConnCounter(conn network.PacketConn, s *TrafficStorage) network.Pa
PacketConn: conn, PacketConn: conn,
storage: s, storage: s,
readFunc: func(n int64) { readFunc: func(n int64) {
s.DownCounter.Add(n) s.UpCounter.Add(n)
}, },
writeFunc: func(n int64) { writeFunc: func(n int64) {
s.UpCounter.Add(n) s.DownCounter.Add(n)
}, },
} }
} }
@ -108,7 +108,7 @@ func (p *PacketConnCounter) ReadPacket(buff *buf.Buffer) (destination M.Socksadd
if err != nil { if err != nil {
return return
} }
p.storage.DownCounter.Add(int64(buff.Len())) p.storage.UpCounter.Add(int64(buff.Len()))
return return
} }
@ -119,7 +119,7 @@ func (p *PacketConnCounter) WritePacket(buff *buf.Buffer, destination M.Socksadd
return return
} }
if n > 0 { if n > 0 {
p.storage.UpCounter.Add(int64(n)) p.storage.DownCounter.Add(int64(n))
} }
return return
} }

2
node/user.go
View File

@ -12,7 +12,7 @@ func (c *Controller) reportUserTrafficTask() (err error) {
// Get User traffic // Get User traffic
userTraffic := make([]panel.UserTraffic, 0) userTraffic := make([]panel.UserTraffic, 0)
for i := range c.userList { for i := range c.userList {
down, up := c.server.GetUserTraffic(c.tag, c.userList[i].Uuid, true) up, down := c.server.GetUserTraffic(c.tag, c.userList[i].Uuid, true)
if up > 0 || down > 0 { if up > 0 || down > 0 {
if c.LimitConfig.EnableDynamicSpeedLimit { if c.LimitConfig.EnableDynamicSpeedLimit {
if _, ok := c.traffic[c.userList[i].Uuid]; ok { if _, ok := c.traffic[c.userList[i].Uuid]; ok {