mirror of
https://github.com/openlibrecommunity/olcrtc.git
synced 2026-06-04 03:19:44 +00:00
refactor: fix last perfsprint and revive issues
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
// Package server implements the olcrtc tunnel server logic.
|
||||
package server
|
||||
|
||||
import (
|
||||
@@ -10,6 +11,7 @@ import (
|
||||
"io"
|
||||
"log"
|
||||
"net"
|
||||
"strconv"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
@@ -425,7 +427,7 @@ func (s *Server) unmarkStreamPump(sid uint16, conn net.Conn) {
|
||||
|
||||
func (s *Server) handleConnect(ctx context.Context, sid uint16, req ConnectRequest) {
|
||||
startTime := time.Now()
|
||||
addr := net.JoinHostPort(req.Addr, fmt.Sprintf("%d", req.Port))
|
||||
addr := net.JoinHostPort(req.Addr, strconv.Itoa(req.Port))
|
||||
log.Printf("[SERVER] sid=%d CONNECT_START %s", sid, addr)
|
||||
|
||||
s.closeStreamConnection(sid)
|
||||
@@ -455,7 +457,7 @@ func (s *Server) handleConnect(ctx context.Context, sid uint16, req ConnectReque
|
||||
}
|
||||
|
||||
func (s *Server) dial(req ConnectRequest) (net.Conn, error) {
|
||||
addr := net.JoinHostPort(req.Addr, fmt.Sprintf("%d", req.Port))
|
||||
addr := net.JoinHostPort(req.Addr, strconv.Itoa(req.Port))
|
||||
if s.socksProxyAddr == "" {
|
||||
dialer := &net.Dialer{
|
||||
Timeout: 10 * time.Second,
|
||||
@@ -469,7 +471,7 @@ func (s *Server) dial(req ConnectRequest) (net.Conn, error) {
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
proxyAddr := net.JoinHostPort(s.socksProxyAddr, fmt.Sprintf("%d", s.socksProxyPort))
|
||||
proxyAddr := net.JoinHostPort(s.socksProxyAddr, strconv.Itoa(s.socksProxyPort))
|
||||
dialer := &net.Dialer{
|
||||
Timeout: 10 * time.Second,
|
||||
KeepAlive: 30 * time.Second,
|
||||
|
||||
@@ -409,7 +409,7 @@ func (p *Peer) sendHello() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *Peer) handleSignaling(ctx context.Context) { //nolint:revive,cyclop
|
||||
func (p *Peer) handleSignaling(ctx context.Context) { //nolint:cyclop
|
||||
pubSent := false
|
||||
|
||||
for {
|
||||
@@ -844,7 +844,7 @@ func (p *Peer) sendLeave(uid string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (p *Peer) Close() error { //nolint:revive,cyclop
|
||||
func (p *Peer) Close() error {
|
||||
log.Println("Closing peer...")
|
||||
alreadyClosing := p.closed.Swap(true)
|
||||
p.sendQueueClosed.Store(true)
|
||||
|
||||
Reference in New Issue
Block a user