Skip to content

Commit 8c5b099

Browse files
committed
Refactor local variables Rel{Addr,Port}
1 parent 2d2407b commit 8c5b099

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

gather.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
542542
var (
543543
locConn net.PacketConn
544544
err error
545-
RelAddr string
546-
RelPort int
545+
relAddr string
546+
relPort int
547547
relayProtocol string
548548
)
549549

@@ -554,8 +554,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
554554
return
555555
}
556556

557-
RelAddr = locConn.LocalAddr().(*net.UDPAddr).IP.String() //nolint:forcetypeassert
558-
RelPort = locConn.LocalAddr().(*net.UDPAddr).Port //nolint:forcetypeassert
557+
relAddr = locConn.LocalAddr().(*net.UDPAddr).IP.String() //nolint:forcetypeassert
558+
relPort = locConn.LocalAddr().(*net.UDPAddr).Port //nolint:forcetypeassert
559559
relayProtocol = udp
560560
case a.proxyDialer != nil && url.Proto == ProtoTypeTCP &&
561561
(url.Scheme == SchemeTypeTURN || url.Scheme == SchemeTypeTURNS):
@@ -565,8 +565,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
565565
return
566566
}
567567

568-
RelAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
569-
RelPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
568+
relAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
569+
relPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
570570
if url.Scheme == SchemeTypeTURN {
571571
relayProtocol = tcp
572572
} else if url.Scheme == SchemeTypeTURNS {
@@ -587,8 +587,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
587587
return
588588
}
589589

590-
RelAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
591-
RelPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
590+
relAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
591+
relPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
592592
relayProtocol = tcp
593593
locConn = turn.NewSTUNConn(conn)
594594
case url.Proto == ProtoTypeUDP && url.Scheme == SchemeTypeTURNS:
@@ -613,8 +613,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
613613
return
614614
}
615615

616-
RelAddr = conn.LocalAddr().(*net.UDPAddr).IP.String() //nolint:forcetypeassert
617-
RelPort = conn.LocalAddr().(*net.UDPAddr).Port //nolint:forcetypeassert
616+
relAddr = conn.LocalAddr().(*net.UDPAddr).IP.String() //nolint:forcetypeassert
617+
relPort = conn.LocalAddr().(*net.UDPAddr).Port //nolint:forcetypeassert
618618
relayProtocol = "dtls"
619619
locConn = &fakenet.PacketConn{Conn: conn}
620620
case url.Proto == ProtoTypeTCP && url.Scheme == SchemeTypeTURNS:
@@ -643,8 +643,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
643643
return
644644
}
645645

646-
RelAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
647-
RelPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
646+
relAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
647+
relPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
648648
relayProtocol = "tls"
649649
locConn = turn.NewSTUNConn(conn)
650650
default:
@@ -684,8 +684,8 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
684684
Component: ComponentRTP,
685685
Address: rAddr.IP.String(),
686686
Port: rAddr.Port,
687-
RelAddr: RelAddr,
688-
RelPort: RelPort,
687+
RelAddr: relAddr,
688+
RelPort: relPort,
689689
RelayProtocol: relayProtocol,
690690
OnClose: func() error {
691691
client.Close()

0 commit comments

Comments
 (0)