merge develop into master #21
14
.drone.yml
14
.drone.yml
@ -1,8 +1,14 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: format
|
||||
image: golang:1.15
|
||||
commands:
|
||||
- bash -c "gofmt -l . | wc -l | cmp -s <(echo 0) || (gofmt -l . && exit 1)"
|
||||
|
||||
- name: install
|
||||
image: golang:1.15
|
||||
environment:
|
||||
@ -47,4 +53,10 @@ steps:
|
||||
|
||||
volumes:
|
||||
- name: cache
|
||||
temp: {}
|
||||
temp: { }
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 8c21312bcfbaa9b7d2d3c31b1a5c13b54b4ecd1da853aa66a8ed11d72154fcca
|
||||
|
||||
...
|
||||
|
@ -25,7 +25,7 @@ type Peer struct {
|
||||
RemoteHost string `validate:"required_with=RemotePort,omitempty,fqdn|ip"`
|
||||
RemotePort uint `validate:"required_with=RemoteHost,omitempty,max=65535"`
|
||||
|
||||
Congestion string `validate:"oneof=NewReno None"`
|
||||
Congestion string `validate:"required_unless=Method TCP,omitempty,oneof=NewReno None"`
|
||||
|
||||
KeepAlive uint
|
||||
Timeout uint
|
||||
|
@ -17,8 +17,8 @@ type NewReno struct {
|
||||
keepalive chan bool
|
||||
|
||||
outboundTimes, inboundTimes map[uint32]time.Time
|
||||
outboundTimesLock sync.Mutex
|
||||
inboundTimesLock sync.RWMutex
|
||||
outboundTimesLock sync.Mutex
|
||||
inboundTimesLock sync.RWMutex
|
||||
|
||||
ack, lastAck uint32
|
||||
nack, lastNack uint32
|
||||
@ -34,7 +34,7 @@ type NewReno struct {
|
||||
lastSent time.Time
|
||||
hasAcked bool
|
||||
|
||||
acksToSend utils.Uint32Heap
|
||||
acksToSend utils.Uint32Heap
|
||||
acksToSendLock sync.Mutex
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ func TestUnmarshalPacket(t *testing.T) {
|
||||
data: proxy.SimplePacket(testContent),
|
||||
}
|
||||
testMarshalled := testPacket.Marshal()
|
||||
|
||||
|
||||
t.Run("Length", func(t *testing.T) {
|
||||
p, err := UnmarshalPacket(testMarshalled)
|
||||
|
||||
@ -47,7 +47,7 @@ func TestUnmarshalPacket(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
assert.Equal(t, p.Contents(), testContent)
|
||||
})
|
||||
|
||||
|
||||
t.Run("Header", func(t *testing.T) {
|
||||
p, err := UnmarshalPacket(testMarshalled)
|
||||
require.Nil(t, err)
|
||||
|
Loading…
Reference in New Issue
Block a user