Skip to content

Commit

Permalink
Update vendored tsg/gopacket (#10477) (#10549)
Browse files Browse the repository at this point in the history
This fixes a Packetbeat crash under Linux when TPACKET_V3 af_packet
interface is used.

(cherry picked from commit c2227b5)
  • Loading branch information
adriansr committed Feb 5, 2019
1 parent 55c5e08 commit 0a680a6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]

- Fix issue with process monitor associating traffic to the wrong process. {issue}9151[9151] {pull}9443[9443]
- Fix DHCPv4 dashboard that wouldn't load in Kibana. {issue}9850[9850]
- Fixed a crash when using af_packet capture {pull}10477[10477]

*Winlogbeat*

Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2648,7 +2648,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 @@ -1859,32 +1859,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 0a680a6

Please sign in to comment.