Renaming

Author: ashellunts

gather.go

@@ -161,18 +161,18 @@ func (a *Agent) gatherCandidatesLocal(ctx context.Context, networkTypes []Networ
 		}
 
 		for network := range networks {
-			var conns []connAndPort
+			var connectionConfigurations []connAndPort
 
 			switch network {
 			case tcp:
 				// Handle ICE TCP active mode
-				conns = append(conns, connAndPort{nil, 0, TCPTypeActive})
+				connectionConfigurations = append(connectionConfigurations, connAndPort{nil, 0, TCPTypeActive})
 
 				// Handle ICE TCP passive mode
 				if a.tcpMux != nil {
-					conns = a.getTCPMuxConnections(mappedIP, ip, network, conns)
+					connectionConfigurations = a.getTCPMuxConnections(mappedIP, ip, network, connectionConfigurations)
 				}
-				if len(conns) == 0 {
+				if len(connectionConfigurations) == 0 {
 					// Didn't succeed with any, try the next network.
 					continue
 				}
@@ -186,36 +186,36 @@ func (a *Agent) gatherCandidatesLocal(ctx context.Context, networkTypes []Networ
 				}
 
 				if udpConn, ok := conn.LocalAddr().(*net.UDPAddr); ok {
-					conns = append(conns, connAndPort{conn, udpConn.Port, TCPTypeUnspecified})
+					connectionConfigurations = append(connectionConfigurations, connAndPort{conn, udpConn.Port, TCPTypeUnspecified})
 				} else {
 					a.log.Warnf("Failed to get port of UDPAddr from ListenUDPInPortRange: %s %s %s", network, ip, a.localUfrag)
 					continue
 				}
 			}
 
-			for _, connAndPort := range conns {
+			for _, connectionConfiguration := range connectionConfigurations {
 				hostConfig := CandidateHostConfig{
 					Network:   network,
 					Address:   address,
-					Port:      connAndPort.port,
+					Port:      connectionConfiguration.port,
 					Component: ComponentRTP,
-					TCPType:   connAndPort.tcpType,
+					TCPType:   connectionConfiguration.tcpType,
 				}
 
 				c, err := NewCandidateHost(&hostConfig)
 				if err != nil {
-					closeConnAndLog(connAndPort.conn, a.log, "failed to create host candidate: %s %s %d: %v", network, mappedIP, connAndPort.port, err)
+					closeConnAndLog(connectionConfiguration.conn, a.log, "failed to create host candidate: %s %s %d: %v", network, mappedIP, connectionConfiguration.port, err)
 					continue
 				}
 
 				if a.mDNSMode == MulticastDNSModeQueryAndGather {
 					if err = c.setIP(ip); err != nil {
-						closeConnAndLog(connAndPort.conn, a.log, "failed to create host candidate: %s %s %d: %v", network, mappedIP, connAndPort.port, err)
+						closeConnAndLog(connectionConfiguration.conn, a.log, "failed to create host candidate: %s %s %d: %v", network, mappedIP, connectionConfiguration.port, err)
 						continue
 					}
 				}
 
-				if err := a.addCandidate(ctx, c, connAndPort.conn); err != nil {
+				if err := a.addCandidate(ctx, c, connectionConfiguration.conn); err != nil {
 					if closeErr := c.close(); closeErr != nil {
 						a.log.Warnf("Failed to close candidate: %v", closeErr)
 					}