From 2dc7c6d6e132dbfc7926eaf57732554a7c047c17 Mon Sep 17 00:00:00 2001
From: Andy Wang <cbeuw.andy@gmail.com>
Date: Wed, 8 Apr 2020 15:15:08 +0100
Subject: [PATCH] Correct switchboard valve's scope

---
 internal/multiplex/session.go     |  2 +-
 internal/multiplex/switchboard.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/multiplex/session.go b/internal/multiplex/session.go
index e16f90c..2c8a141 100644
--- a/internal/multiplex/session.go
+++ b/internal/multiplex/session.go
@@ -82,7 +82,7 @@ func MakeSession(id uint32, config SessionConfig) *Session {
 	}
 
 	sbConfig := switchboardConfig{
-		Valve:          sesh.Valve,
+		valve:          sesh.Valve,
 		recvBufferSize: sesh.ReceiveBufferSize,
 	}
 	if sesh.Unordered {
diff --git a/internal/multiplex/switchboard.go b/internal/multiplex/switchboard.go
index f75cf71..00d67ce 100644
--- a/internal/multiplex/switchboard.go
+++ b/internal/multiplex/switchboard.go
@@ -15,7 +15,7 @@ const (
 )
 
 type switchboardConfig struct {
-	Valve
+	valve          Valve
 	strategy       switchboardStrategy
 	recvBufferSize int
 }
@@ -68,11 +68,11 @@ func (sb *switchboard) send(data []byte, connId *uint32) (n int, err error) {
 			sb.close("failed to write to remote " + err.Error())
 			return n, err
 		}
-		sb.AddTx(int64(n))
+		sb.valve.AddTx(int64(n))
 		return n, nil
 	}
 
-	sb.Valve.txWait(len(data))
+	sb.valve.txWait(len(data))
 	connCount := sb.connsCount()
 	if atomic.LoadUint32(&sb.broken) == 1 || connCount == 0 {
 		return 0, errBrokenSwitchboard
@@ -157,8 +157,8 @@ func (sb *switchboard) deplex(connId uint32, conn net.Conn) {
 	buf := make([]byte, sb.recvBufferSize)
 	for {
 		n, err := sb.session.UnitRead(conn, buf)
-		sb.rxWait(n)
-		sb.Valve.AddRx(int64(n))
+		sb.valve.rxWait(n)
+		sb.valve.AddRx(int64(n))
 		if err != nil {
 			log.Debugf("a connection for session %v has closed: %v", sb.session.id, err)
 			sb.close("a connection has dropped unexpectedly")