diff options
| author | Audrius Butkevicius <audrius.butkevicius@gmail.com> | 2017-11-22 21:16:49 +0000 |
|---|---|---|
| committer | Jakob Borg <jakob@kastelo.net> | 2017-11-23 08:29:56 +0100 |
| commit | 99b00b6a5e723f7b8214273d694d4ffc7a609bbc (patch) | |
| tree | b159e11766ebb16695ebdef9d20ed2c2dcfcec64 | |
| parent | 1e9769cdd7c71e5cd9b2ed08b7ca5d9ac77e7d66 (diff) | |
| download | syncthing-0.14.41.tar.gz syncthing-0.14.41.zip | |
vendor: Update pfilter (fixes #4537)v0.14.41-rc.6v0.14.41
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4539
| -rw-r--r-- | vendor/github.com/AudriusButkevicius/pfilter/conn.go | 4 | ||||
| -rw-r--r-- | vendor/github.com/AudriusButkevicius/pfilter/filter.go | 7 | ||||
| -rw-r--r-- | vendor/manifest | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/vendor/github.com/AudriusButkevicius/pfilter/conn.go b/vendor/github.com/AudriusButkevicius/pfilter/conn.go index ea4ba2d28..5af73562f 100644 --- a/vendor/github.com/AudriusButkevicius/pfilter/conn.go +++ b/vendor/github.com/AudriusButkevicius/pfilter/conn.go @@ -7,6 +7,9 @@ import ( ) type FilteredConn struct { + // Alignment + deadline atomic.Value + source *PacketFilter priority int @@ -14,7 +17,6 @@ type FilteredConn struct { filter Filter - deadline atomic.Value closed chan struct{} } diff --git a/vendor/github.com/AudriusButkevicius/pfilter/filter.go b/vendor/github.com/AudriusButkevicius/pfilter/filter.go index d0c539b6d..f5e734772 100644 --- a/vendor/github.com/AudriusButkevicius/pfilter/filter.go +++ b/vendor/github.com/AudriusButkevicius/pfilter/filter.go @@ -26,13 +26,14 @@ func NewPacketFilter(conn net.PacketConn) *PacketFilter { // PacketFilter embeds a net.PacketConn to perform the filtering. type PacketFilter struct { + // Alignment + dropped uint64 + overflow uint64 + net.PacketConn conns []*FilteredConn mut sync.Mutex - - dropped uint64 - overflow uint64 } // NewConn returns a new net.PacketConn object which filters packets based diff --git a/vendor/manifest b/vendor/manifest index 1e0fe1808..0442405b5 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -29,7 +29,7 @@ "importpath": "github.com/AudriusButkevicius/pfilter", "repository": "https://github.com/AudriusButkevicius/pfilter", "vcs": "git", - "revision": "09b3cfdd04de89f0196caecb0b335d7149a6593a", + "revision": "56143fe9cebe95636de1275acf30fcca36a1383d", "branch": "master", "notests": true }, @@ -679,4 +679,4 @@ "notests": true } ] -} +}
\ No newline at end of file |