Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #10477 to 6.x: Update vendored tsg/gopacket #10549

Merged
merged 1 commit into from
Feb 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,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