vendor: Update pfilter (fixes #4537)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4539
This commit is contained in:
Audrius Butkevicius 2017-11-22 21:16:49 +00:00 committed by Jakob Borg
parent 1e9769cdd7
commit 99b00b6a5e
3 changed files with 9 additions and 6 deletions

View File

@ -7,6 +7,9 @@ import (
) )
type FilteredConn struct { type FilteredConn struct {
// Alignment
deadline atomic.Value
source *PacketFilter source *PacketFilter
priority int priority int
@ -14,7 +17,6 @@ type FilteredConn struct {
filter Filter filter Filter
deadline atomic.Value
closed chan struct{} closed chan struct{}
} }

View File

@ -26,13 +26,14 @@ func NewPacketFilter(conn net.PacketConn) *PacketFilter {
// PacketFilter embeds a net.PacketConn to perform the filtering. // PacketFilter embeds a net.PacketConn to perform the filtering.
type PacketFilter struct { type PacketFilter struct {
// Alignment
dropped uint64
overflow uint64
net.PacketConn net.PacketConn
conns []*FilteredConn conns []*FilteredConn
mut sync.Mutex mut sync.Mutex
dropped uint64
overflow uint64
} }
// NewConn returns a new net.PacketConn object which filters packets based // NewConn returns a new net.PacketConn object which filters packets based

2
vendor/manifest vendored
View File

@ -29,7 +29,7 @@
"importpath": "github.com/AudriusButkevicius/pfilter", "importpath": "github.com/AudriusButkevicius/pfilter",
"repository": "https://github.com/AudriusButkevicius/pfilter", "repository": "https://github.com/AudriusButkevicius/pfilter",
"vcs": "git", "vcs": "git",
"revision": "09b3cfdd04de89f0196caecb0b335d7149a6593a", "revision": "56143fe9cebe95636de1275acf30fcca36a1383d",
"branch": "master", "branch": "master",
"notests": true "notests": true
}, },