mirror of
https://github.com/pion/ice.git
synced 2025-10-18 13:30:44 +08:00
Harmonize capitalization of variable names
As most variable names are using camelCase.
This commit is contained in:
@@ -484,7 +484,7 @@ func UnmarshalCandidate(raw string) (Candidate, error) {
|
|||||||
relatedPort = int(rawRelatedPort)
|
relatedPort = int(rawRelatedPort)
|
||||||
} else if split[0] == "tcptype" {
|
} else if split[0] == "tcptype" {
|
||||||
if len(split) < 2 {
|
if len(split) < 2 {
|
||||||
return nil, fmt.Errorf("%w: incorrect length", errParseTypType)
|
return nil, fmt.Errorf("%w: incorrect length", errParseTCPType)
|
||||||
}
|
}
|
||||||
|
|
||||||
tcpType = NewTCPType(split[1])
|
tcpType = NewTCPType(split[1])
|
||||||
|
@@ -118,7 +118,7 @@ var (
|
|||||||
errParsePriority = errors.New("could not parse priority")
|
errParsePriority = errors.New("could not parse priority")
|
||||||
errParsePort = errors.New("could not parse port")
|
errParsePort = errors.New("could not parse port")
|
||||||
errParseRelatedAddr = errors.New("could not parse related addresses")
|
errParseRelatedAddr = errors.New("could not parse related addresses")
|
||||||
errParseTypType = errors.New("could not parse typtype")
|
errParseTCPType = errors.New("could not parse TCP type")
|
||||||
errGetXorMappedAddrResponse = errors.New("failed to get XOR-MAPPED-ADDRESS response")
|
errGetXorMappedAddrResponse = errors.New("failed to get XOR-MAPPED-ADDRESS response")
|
||||||
errConnectionAddrAlreadyExist = errors.New("connection with same remote address already exists")
|
errConnectionAddrAlreadyExist = errors.New("connection with same remote address already exists")
|
||||||
errReadingStreamingPacket = errors.New("error reading streaming packet")
|
errReadingStreamingPacket = errors.New("error reading streaming packet")
|
||||||
|
@@ -16,11 +16,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestMultiTCPMux_Recv(t *testing.T) {
|
func TestMultiTCPMux_Recv(t *testing.T) {
|
||||||
for name, buffersize := range map[string]int{
|
for name, bufSize := range map[string]int{
|
||||||
"no buffer": 0,
|
"no buffer": 0,
|
||||||
"buffered 4MB": 4 * 1024 * 1024,
|
"buffered 4MB": 4 * 1024 * 1024,
|
||||||
} {
|
} {
|
||||||
bufSize := buffersize
|
bufSize := bufSize
|
||||||
t.Run(name, func(t *testing.T) {
|
t.Run(name, func(t *testing.T) {
|
||||||
report := test.CheckRoutines(t)
|
report := test.CheckRoutines(t)
|
||||||
defer report()
|
defer report()
|
||||||
|
@@ -18,11 +18,11 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestTCPMux_Recv(t *testing.T) {
|
func TestTCPMux_Recv(t *testing.T) {
|
||||||
for name, buffersize := range map[string]int{
|
for name, bufSize := range map[string]int{
|
||||||
"no buffer": 0,
|
"no buffer": 0,
|
||||||
"buffered 4MB": 4 * 1024 * 1024,
|
"buffered 4MB": 4 * 1024 * 1024,
|
||||||
} {
|
} {
|
||||||
bufSize := buffersize
|
bufSize := bufSize
|
||||||
t.Run(name, func(t *testing.T) {
|
t.Run(name, func(t *testing.T) {
|
||||||
report := test.CheckRoutines(t)
|
report := test.CheckRoutines(t)
|
||||||
defer report()
|
defer report()
|
||||||
|
@@ -27,9 +27,9 @@ func TestStressDuplex(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func testTimeout(t *testing.T, c *Conn, timeout time.Duration) {
|
func testTimeout(t *testing.T, c *Conn, timeout time.Duration) {
|
||||||
const pollrate = 100 * time.Millisecond
|
const pollRate = 100 * time.Millisecond
|
||||||
const margin = 20 * time.Millisecond // allow 20msec error in time
|
const margin = 20 * time.Millisecond // allow 20msec error in time
|
||||||
ticker := time.NewTicker(pollrate)
|
ticker := time.NewTicker(pollRate)
|
||||||
defer func() {
|
defer func() {
|
||||||
ticker.Stop()
|
ticker.Stop()
|
||||||
err := c.Close()
|
err := c.Close()
|
||||||
@@ -40,7 +40,7 @@ func testTimeout(t *testing.T, c *Conn, timeout time.Duration) {
|
|||||||
|
|
||||||
startedAt := time.Now()
|
startedAt := time.Now()
|
||||||
|
|
||||||
for cnt := time.Duration(0); cnt <= timeout+defaultKeepaliveInterval+pollrate; cnt += pollrate {
|
for cnt := time.Duration(0); cnt <= timeout+defaultKeepaliveInterval+pollRate; cnt += pollRate {
|
||||||
<-ticker.C
|
<-ticker.C
|
||||||
|
|
||||||
var cs ConnectionState
|
var cs ConnectionState
|
||||||
|
@@ -200,18 +200,18 @@ func (c *udpMuxedConn) writePacket(data []byte, addr *net.UDPAddr) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func encodeUDPAddr(addr *net.UDPAddr, buf []byte) (int, error) {
|
func encodeUDPAddr(addr *net.UDPAddr, buf []byte) (int, error) {
|
||||||
ipdata, err := addr.IP.MarshalText()
|
ipData, err := addr.IP.MarshalText()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
total := 2 + len(ipdata) + 2 + len(addr.Zone)
|
total := 2 + len(ipData) + 2 + len(addr.Zone)
|
||||||
if total > len(buf) {
|
if total > len(buf) {
|
||||||
return 0, io.ErrShortBuffer
|
return 0, io.ErrShortBuffer
|
||||||
}
|
}
|
||||||
|
|
||||||
binary.LittleEndian.PutUint16(buf, uint16(len(ipdata)))
|
binary.LittleEndian.PutUint16(buf, uint16(len(ipData)))
|
||||||
offset := 2
|
offset := 2
|
||||||
n := copy(buf[offset:], ipdata)
|
n := copy(buf[offset:], ipData)
|
||||||
offset += n
|
offset += n
|
||||||
binary.LittleEndian.PutUint16(buf[offset:], uint16(addr.Port))
|
binary.LittleEndian.PutUint16(buf[offset:], uint16(addr.Port))
|
||||||
offset += 2
|
offset += 2
|
||||||
|
4
util.go
4
util.go
@@ -94,8 +94,8 @@ func getXORMappedAddr(conn net.PacketConn, serverAddr net.Addr, deadline time.Du
|
|||||||
}()
|
}()
|
||||||
resp, err := stunRequest(
|
resp, err := stunRequest(
|
||||||
func(p []byte) (int, error) {
|
func(p []byte) (int, error) {
|
||||||
n, _, errr := conn.ReadFrom(p)
|
n, _, err := conn.ReadFrom(p)
|
||||||
return n, errr
|
return n, err
|
||||||
},
|
},
|
||||||
func(b []byte) (int, error) {
|
func(b []byte) (int, error) {
|
||||||
return conn.WriteTo(b, serverAddr)
|
return conn.WriteTo(b, serverAddr)
|
||||||
|
Reference in New Issue
Block a user