From f34c092a06e7110209792952c476d614fa0006ae Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Mon, 22 Jun 2020 22:49:25 -0400 Subject: [PATCH] Rename fields in StatCouterConnection The fields will be used by Outbounds as well in the next commit --- app/proxyman/inbound/worker.go | 6 +++--- transport/internet/connection.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/proxyman/inbound/worker.go b/app/proxyman/inbound/worker.go index 81d262344..b10a5867b 100644 --- a/app/proxyman/inbound/worker.go +++ b/app/proxyman/inbound/worker.go @@ -91,9 +91,9 @@ func (w *tcpWorker) callback(conn internet.Connection) { ctx = session.ContextWithContent(ctx, content) if w.uplinkCounter != nil || w.downlinkCounter != nil { conn = &internet.StatCouterConnection{ - Connection: conn, - Uplink: w.uplinkCounter, - Downlink: w.downlinkCounter, + Connection: conn, + ReadCounter: w.uplinkCounter, + WriteCounter: w.downlinkCounter, } } if err := w.proxy.Process(ctx, net.Network_TCP, conn, w.dispatcher); err != nil { diff --git a/transport/internet/connection.go b/transport/internet/connection.go index 0c627042b..b55b0606e 100644 --- a/transport/internet/connection.go +++ b/transport/internet/connection.go @@ -12,14 +12,14 @@ type Connection interface { type StatCouterConnection struct { Connection - Uplink stats.Counter - Downlink stats.Counter + ReadCounter stats.Counter + WriteCounter stats.Counter } func (c *StatCouterConnection) Read(b []byte) (int, error) { nBytes, err := c.Connection.Read(b) - if c.Uplink != nil { - c.Uplink.Add(int64(nBytes)) + if c.ReadCounter != nil { + c.ReadCounter.Add(int64(nBytes)) } return nBytes, err @@ -27,8 +27,8 @@ func (c *StatCouterConnection) Read(b []byte) (int, error) { func (c *StatCouterConnection) Write(b []byte) (int, error) { nBytes, err := c.Connection.Write(b) - if c.Downlink != nil { - c.Downlink.Add(int64(nBytes)) + if c.WriteCounter != nil { + c.WriteCounter.Add(int64(nBytes)) } return nBytes, err }