Bläddra i källkod

vendor: Update pfilter (fixes #4537)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4539
Audrius Butkevicius 8 år sedan
förälder
incheckning
99b00b6a5e

+ 3 - 1
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{}
 }
 

+ 4 - 3
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

+ 2 - 2
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
 		}
 	]
-}
+}