SagerNet/sing-shadowsocks
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-shadowsocks.git synced 2025-04-04 20:37:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup code

Browse source
This commit is contained in:
世界 2022-06-02 18:32:57 +08:00
parent e4d76a44eb
commit a898f41c89
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shadowaead_2022/protocol.go
View file

@ -566,11 +566,11 @@ func (c *clientPacketConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
}
if sessionId == c.session.remoteSessionId {
if !c.session.filter.ValidateCounter(packetId, math.MaxUint64) {
if !c.session.filter.ValidateCounter(packetId) {
return M.Socksaddr{}, ErrPacketIdNotUnique
}
} else if sessionId == c.session.lastRemoteSessionId {
if !c.session.lastFilter.ValidateCounter(packetId, math.MaxUint64) {
if !c.session.lastFilter.ValidateCounter(packetId) {
return M.Socksaddr{}, ErrPacketIdNotUnique
}
remoteCipher = c.session.lastRemoteCipher
@ -589,7 +589,7 @@ func (c *clientPacketConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
}
c.session.remoteSessionId = sessionId
c.session.remoteCipher = remoteCipher
c.session.filter.ValidateCounter(packetId, math.MaxUint64)
c.session.filter.ValidateCounter(packetId)
}
var clientSessionId uint64

2
shadowaead_2022/service.go
View file

@ -361,7 +361,7 @@ returnErr:
return err
process:
if !session.filter.ValidateCounter(packetId, math.MaxUint64) {
if !session.filter.ValidateCounter(packetId) {
err = ErrPacketIdNotUnique
goto returnErr
}

2
shadowaead_2022/service_multi.go
View file

@ -299,7 +299,7 @@ returnErr:
return err
process:
if !session.filter.ValidateCounter(packetId, math.MaxUint64) {
if !session.filter.ValidateCounter(packetId) {
err = ErrPacketIdNotUnique
goto returnErr
}

11
shadowaead_2022/wg_replay/replay.go
View file

@ -26,18 +26,9 @@ type Filter struct {
ring [ringBlocks]block
}
// Reset resets the filter to empty state.
func (f *Filter) Reset() {
f.last = 0
f.ring[0] = 0
}
// ValidateCounter checks if the counter should be accepted.
// Overlimit counters (>= limit) are always rejected.
func (f *Filter) ValidateCounter(counter, limit uint64) bool {
if counter >= limit {
return false
}
func (f *Filter) ValidateCounter(counter uint64) bool {
indexBlock := counter >> blockBitLog
if counter > f.last { // move window forward
current := f.last >> blockBitLog