@@ -121,15 +121,15 @@ func (transport *Transport) HandleServer(config tcp.ServerConfig, local string)
121121func (transport * Transport ) handleTCPConn (conn net.Conn ) error {
122122 transport .configureTCPConn (conn )
123123
124- target , err := transport .resolveTarget (conn )
124+ target , err := transport .targetFromTCPConn (conn )
125125 if err != nil {
126126 return err
127127 }
128128
129129 connectionLogger := transport .logger .With ().Str ("remoteAddress" , conn .RemoteAddr ().String ()).Str ("target" , string (target )).Logger ()
130130 connectionLogger .Info ().Msg ("new connection" )
131131
132- if err := transport .checkIfActiveConnection (target , conn , connectionLogger ); err != nil {
132+ if err := transport .rejectIfConnectedTCPConn (target , conn , connectionLogger ); err != nil {
133133 transport .errChan <- err
134134 return err
135135 }
@@ -140,13 +140,13 @@ func (transport *Transport) handleTCPConn(conn net.Conn) error {
140140 connectionLogger .Info ().Msg ("close" )
141141 }()
142142
143- cleanupConn := transport .addConnection (target , conn , connectionLogger )
143+ cleanupConn := transport .registerTCPConn (target , conn , connectionLogger )
144144 defer cleanupConn ()
145145
146146 transport .api .ConnectionUpdate (target , true )
147147 defer transport .api .ConnectionUpdate (target , false )
148148
149- transport .tcpReceiveLoop (conn , connectionLogger )
149+ transport .readLoopTCPConn (conn , connectionLogger )
150150
151151 err = <- errChan
152152 if err != nil {
@@ -180,9 +180,9 @@ func (transport *Transport) configureTCPConn(conn net.Conn) {
180180 }
181181}
182182
183- // resolveTarget maps the remote IP address of the connection to a TransportTarget
183+ // targetFromTCPConn maps the remote IP address of the connection to a TransportTarget
184184// using the ipToTarget map.
185- func (transport * Transport ) resolveTarget (conn net.Conn ) (abstraction.TransportTarget , error ) {
185+ func (transport * Transport ) targetFromTCPConn (conn net.Conn ) (abstraction.TransportTarget , error ) {
186186 remoteAddr := conn .RemoteAddr ().(* net.TCPAddr )
187187 ip := remoteAddr .IP .String ()
188188
@@ -199,8 +199,8 @@ func (transport *Transport) resolveTarget(conn net.Conn) (abstraction.TransportT
199199 return target , nil
200200}
201201
202- // checkIfActiveConnection closes and rejects conn if target already has an active connection.
203- func (transport * Transport ) checkIfActiveConnection (target abstraction.TransportTarget , conn net.Conn , logger zerolog.Logger ,) error {
202+ // rejectIfConnectedTCPConn closes and rejects conn if target already has an active connection.
203+ func (transport * Transport ) rejectIfConnectedTCPConn (target abstraction.TransportTarget , conn net.Conn , logger zerolog.Logger ,) error {
204204 transport .connectionsMx .Lock ()
205205 defer transport .connectionsMx .Unlock ()
206206
@@ -214,8 +214,8 @@ func (transport *Transport) checkIfActiveConnection(target abstraction.Transport
214214 return nil
215215}
216216
217- // addConnection stores conn for target and returns a cleanup that removes it.
218- func (transport * Transport ) addConnection (target abstraction.TransportTarget , conn net.Conn , logger zerolog.Logger ) func () {
217+ // registerTCPConn stores conn for target and returns a cleanup that removes it.
218+ func (transport * Transport ) registerTCPConn (target abstraction.TransportTarget , conn net.Conn , logger zerolog.Logger ) func () {
219219 transport .connectionsMx .Lock ()
220220 logger .Debug ().Msg ("added connection" )
221221 transport .connections [target ] = conn
@@ -229,8 +229,8 @@ func (transport *Transport) addConnection(target abstraction.TransportTarget, co
229229 }
230230}
231231
232- // tcpReceiveLoop reads packets from conn and forwards notifications until an error occurs.
233- func (transport * Transport ) tcpReceiveLoop (conn net.Conn , logger zerolog.Logger ) {
232+ // readLoopTCPConn reads packets from conn and forwards notifications until an error occurs.
233+ func (transport * Transport ) readLoopTCPConn (conn net.Conn , logger zerolog.Logger ) {
234234 from := conn .RemoteAddr ().String ()
235235 to := conn .LocalAddr ().String ()
236236
0 commit comments