Skip to content

Commit

Permalink
Cherry-pick elastic#10477 to 6.6: Update vendored tsg/gopacket (elast…
Browse files Browse the repository at this point in the history
…ic#10550)

This fixes a Packetbeat crash under Linux when TPACKET_V3 af_packet
interface is used.

(cherry picked from commit d7b658b)
  • Loading branch information
adriansr authored Feb 5, 2019
1 parent d3a31f1 commit 8eadc43
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 16 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ https://github.com/elastic/beats/compare/1035569addc4a3b29ffa14f8a08c27c1ace16ef

*Packetbeat*

- Fixed a crash when using af_packet capture {pull}10477[10477]

*Winlogbeat*

*Functionbeat*
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2647,7 +2647,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/tsg/gopacket
Revision: f289b3ea3e41a01b2822be9caf5f40c01fdda05c
Revision: 7c5392a5f2b5c5fa393c71e1f9064e22b5408995
License type (autodetected): BSD-3-Clause
./vendor/github.com/tsg/gopacket/LICENSE:
--------------------------------------------------------------------
Expand Down
9 changes: 7 additions & 2 deletions vendor/github.com/tsg/gopacket/afpacket/afpacket.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1835,32 +1835,32 @@
{
"checksumSHA1": "M0S9278lG9Fztu+ZUsLUi40GDJU=",
"path": "github.com/tsg/gopacket",
"revision": "f289b3ea3e41a01b2822be9caf5f40c01fdda05c",
"revisionTime": "2018-03-16T21:03:30Z"
"revision": "7c5392a5f2b5c5fa393c71e1f9064e22b5408995",
"revisionTime": "2019-01-31T17:02:46Z"
},
{
"checksumSHA1": "STY8i3sZLdZfFcKiyOdpV852nls=",
"checksumSHA1": "OQEk9avpNRDRyZVvYy08R+PEuFA=",
"path": "github.com/tsg/gopacket/afpacket",
"revision": "8e703b9968693c15f25cabb6ba8be4370cf431d0",
"revisionTime": "2016-08-17T18:24:57Z"
"revision": "7c5392a5f2b5c5fa393c71e1f9064e22b5408995",
"revisionTime": "2019-01-31T17:02:46Z"
},
{
"checksumSHA1": "+NwKULkolGgMn67wFYf+n0wz+a8=",
"checksumSHA1": "hXo0d2jF8bqVFHq37TfqpKvRO5M=",
"path": "github.com/tsg/gopacket/layers",
"revision": "8e703b9968693c15f25cabb6ba8be4370cf431d0",
"revisionTime": "2016-08-17T18:24:57Z"
"revision": "7c5392a5f2b5c5fa393c71e1f9064e22b5408995",
"revisionTime": "2019-01-31T17:02:46Z"
},
{
"checksumSHA1": "pDfiWUxZQdXap4CR6ASDvblChLU=",
"checksumSHA1": "C1AMG/E1pIW6kHrxi4+iNm1Fa9Y=",
"path": "github.com/tsg/gopacket/pcap",
"revision": "8e703b9968693c15f25cabb6ba8be4370cf431d0",
"revisionTime": "2016-08-17T18:24:57Z"
"revision": "7c5392a5f2b5c5fa393c71e1f9064e22b5408995",
"revisionTime": "2019-01-31T17:02:46Z"
},
{
"checksumSHA1": "nGCIgH3ohqLru6ivQSSiY6YWEow=",
"path": "github.com/tsg/gopacket/pfring",
"revision": "8e703b9968693c15f25cabb6ba8be4370cf431d0",
"revisionTime": "2016-08-17T18:24:57Z"
"revision": "7c5392a5f2b5c5fa393c71e1f9064e22b5408995",
"revisionTime": "2019-01-31T17:02:46Z"
},
{
"checksumSHA1": "H7tCgNt2ajKK4FBJIDNlevu9MAc=",
Expand Down

0 comments on commit 8eadc43

Please sign in to comment.