lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-18 07:17:32 -05:00
Code Issues Releases Wiki Activity

rename acksegment

Browse Source
This commit is contained in:
v2ray 2016-07-02 22:17:41 +02:00
parent 32da784549
commit 3ad83da7cb
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport/internet/kcp/kcp.go
View File

@ -208,7 +208,7 @@ func (kcp *KCP) Input(data []byte) int {
kcp.HandleOption(seg.Opt) kcp.HandleOption(seg.Opt)
kcp.receivingWorker.ProcessSegment(seg) kcp.receivingWorker.ProcessSegment(seg)
kcp.lastPayloadTime = kcp.current kcp.lastPayloadTime = kcp.current
case *ACKSegment: case *AckSegment:
kcp.HandleOption(seg.Opt) kcp.HandleOption(seg.Opt)
if kcp.rmt_wnd < seg.ReceivingWindow { if kcp.rmt_wnd < seg.ReceivingWindow {
kcp.rmt_wnd = seg.ReceivingWindow kcp.rmt_wnd = seg.ReceivingWindow

4
transport/internet/kcp/receiving.go
View File

@ -182,7 +182,7 @@ func (this *AckList) Clear(una uint32) {
} }
func (this *AckList) Flush(current uint32) { func (this *AckList) Flush(current uint32) {
seg := new(ACKSegment) seg := new(AckSegment)
for i := 0; i < len(this.numbers); i++ { for i := 0; i < len(this.numbers); i++ {
if this.nextFlush[i] <= current { if this.nextFlush[i] <= current {
seg.Count++ seg.Count++
@ -292,7 +292,7 @@ func (this *ReceivingWorker) Flush() {
} }
func (this *ReceivingWorker) Write(seg ISegment) { func (this *ReceivingWorker) Write(seg ISegment) {
ackSeg := seg.(*ACKSegment) ackSeg := seg.(*AckSegment)
ackSeg.Conv = this.kcp.conv ackSeg.Conv = this.kcp.conv
ackSeg.ReceivingNext = this.nextNumber ackSeg.ReceivingNext = this.nextNumber
ackSeg.ReceivingWindow = this.nextNumber + this.windowSize ackSeg.ReceivingWindow = this.nextNumber + this.windowSize

10
transport/internet/kcp/segment.go
View File

@ -64,7 +64,7 @@ func (this *DataSegment) Release() {
this.Data.Release() this.Data.Release()
} }
type ACKSegment struct { type AckSegment struct {
Conv uint16 Conv uint16
Opt SegmentOption Opt SegmentOption
ReceivingWindow uint32 ReceivingWindow uint32
@ -74,11 +74,11 @@ type ACKSegment struct {
TimestampList []uint32 TimestampList []uint32
} }
func (this *ACKSegment) ByteSize() int { func (this *AckSegment) ByteSize() int {
return 2 + 1 + 1 + 4 + 4 + 1 + int(this.Count)*4 + int(this.Count)*4 return 2 + 1 + 1 + 4 + 4 + 1 + int(this.Count)*4 + int(this.Count)*4
} }
func (this *ACKSegment) Bytes(b []byte) []byte { func (this *AckSegment) Bytes(b []byte) []byte {
b = serial.Uint16ToBytes(this.Conv, b) b = serial.Uint16ToBytes(this.Conv, b)
b = append(b, byte(SegmentCommandACK), byte(this.Opt)) b = append(b, byte(SegmentCommandACK), byte(this.Opt))
b = serial.Uint32ToBytes(this.ReceivingWindow, b) b = serial.Uint32ToBytes(this.ReceivingWindow, b)
@ -91,7 +91,7 @@ func (this *ACKSegment) Bytes(b []byte) []byte {
return b return b
} }
func (this *ACKSegment) Release() {} func (this *AckSegment) Release() {}
type CmdOnlySegment struct { type CmdOnlySegment struct {
Conv uint16 Conv uint16
@ -157,7 +157,7 @@ func ReadSegment(buf []byte) (ISegment, []byte) {
} }
if cmd == SegmentCommandACK { if cmd == SegmentCommandACK {
seg := &ACKSegment{ seg := &AckSegment{
Conv: conv, Conv: conv,
Opt: opt, Opt: opt,
} }

4
transport/internet/kcp/segment_test.go
View File

@ -44,7 +44,7 @@ func TestDataSegment(t *testing.T) {
func TestACKSegment(t *testing.T) { func TestACKSegment(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
seg := &ACKSegment{ seg := &AckSegment{
Conv: 1, Conv: 1,
ReceivingWindow: 2, ReceivingWindow: 2,
ReceivingNext: 3, ReceivingNext: 3,
@ -59,7 +59,7 @@ func TestACKSegment(t *testing.T) {
assert.Int(len(bytes)).Equals(nBytes) assert.Int(len(bytes)).Equals(nBytes)
iseg, _ := ReadSegment(bytes) iseg, _ := ReadSegment(bytes)
seg2 := iseg.(*ACKSegment) seg2 := iseg.(*AckSegment)
assert.Uint16(seg2.Conv).Equals(seg.Conv) assert.Uint16(seg2.Conv).Equals(seg.Conv)
assert.Uint32(seg2.ReceivingWindow).Equals(seg.ReceivingWindow) assert.Uint32(seg2.ReceivingWindow).Equals(seg.ReceivingWindow)
assert.Uint32(seg2.ReceivingNext).Equals(seg.ReceivingNext) assert.Uint32(seg2.ReceivingNext).Equals(seg.ReceivingNext)