zishuo/stun-1
1
0
Fork 0
mirror of https://github.com/gortc/stun.git synced 2025-09-26 20:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

all: fix linters warnings; update makefile

Browse Source
This commit is contained in:
Aleksandr Razumov
2016-04-29 21:37:10 +03:00
parent 7560d0b17b
commit e951cc2b59
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -11,7 +11,9 @@ fuzz-msg:
fuzz-typ: fuzz-typ:
go-fuzz -bin=./stun-typ-fuzz.zip -workdir=examples/stun-typ go-fuzz -bin=./stun-typ-fuzz.zip -workdir=examples/stun-typ
lint: lint:
@gometalinter -e "AttrType.+gocyclo" -e "_test.go.+(gocyclo|errcheck|dupl)" --disable=gotype @gometalinter -e "AttrType.+gocyclo" \
-e "_test.go.+(gocyclo|errcheck|dupl)" \
--enable="lll" --line-length=80
escape: escape:
@echo "Not escapes, except autogenerated:" @echo "Not escapes, except autogenerated:"
@go build -gcflags '-m -l' 2>&1 \ @go build -gcflags '-m -l' 2>&1 \
@@ -27,3 +29,10 @@ bench-compare:
go test -bench . > bench.go-16 go test -bench . > bench.go-16
go-tip test -bench . > bench.go-tip go-tip test -bench . > bench.go-tip
@benchcmp bench.go-16 bench.go-tip @benchcmp bench.go-16 bench.go-tip
install:
go get -u sourcegraph.com/sqs/goreturns
go get -u github.com/alecthomas/gometalinter
gometalinter --install --update
go get -u github.com/cydev/go-fuzz/go-fuzz-build
go get -u github.com/dvyukov/go-fuzz/go-fuzz

4
attributes_test.go
View File

@@ -145,7 +145,7 @@ func TestMessage_GetXORMappedAddressBad(t *testing.T) {
mRes := AcquireMessage() mRes := AcquireMessage()
defer ReleaseMessage(mRes) defer ReleaseMessage(mRes)
binary.BigEndian.PutUint16(m.buf.B[20+4:20+4+2], 0x21) binary.BigEndian.PutUint16(m.buf.B[20+4:20+4+2], 0x21)
if err := mRes.Get(m.buf.B); err != nil { if err = mRes.Get(m.buf.B); err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, _, err = m.GetXORMappedAddress() _, _, err = m.GetXORMappedAddress()
@@ -169,7 +169,7 @@ func TestMessage_AddXORMappedAddress(t *testing.T) {
mRes := AcquireMessage() mRes := AcquireMessage()
defer ReleaseMessage(mRes) defer ReleaseMessage(mRes)
if err := mRes.Get(m.buf.B); err != nil { if err = mRes.Get(m.buf.B); err != nil {
t.Fatal(err) t.Fatal(err)
} }
ip, port, err := m.GetXORMappedAddress() ip, port, err := m.GetXORMappedAddress()

6
client_test.go
View File

@@ -63,6 +63,10 @@ func TestClientSend(t *testing.T) {
timeout *= 2 timeout *= 2
} }
n, err := conn.Read(recvBuf) n, err := conn.Read(recvBuf)
var (
ip net.IP
port int
)
if err == nil { if err == nil {
mRec := AcquireMessage() mRec := AcquireMessage()
if err = mRec.Get(recvBuf[:n]); err != nil { if err = mRec.Get(recvBuf[:n]); err != nil {
@@ -75,7 +79,7 @@ func TestClientSend(t *testing.T) {
} }
v := mRec.getAttrValue(AttrXORMappedAddress) v := mRec.getAttrValue(AttrXORMappedAddress)
log.Println(v) log.Println(v)
ip, port, err := mRec.GetXORMappedAddress() ip, port, err = mRec.GetXORMappedAddress()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

5
xor_test.go
View File

@@ -1,8 +1,8 @@
package stun package stun
import ( import (
"testing"
"math/rand" "math/rand"
"testing"
) )
func TestXORSafe(t *testing.T) { func TestXORSafe(t *testing.T) {
@@ -83,7 +83,6 @@ func TestXORFallback(t *testing.T) {
} }
} }
func BenchmarkXOR(b *testing.B) { func BenchmarkXOR(b *testing.B) {
rand.Seed(666) rand.Seed(666)
a := make([]byte, 1024) a := make([]byte, 1024)
@@ -130,4 +129,4 @@ func BenchmarkXORFast(b *testing.B) {
fastXORBytes(dst, a, c) fastXORBytes(dst, a, c)
} }
}) })
} }