Skip to content

Commit

Permalink
Bump version of gopacket to master to fix build on macOS, use gopacke…
Browse files Browse the repository at this point in the history
…t's pcapng support (#27)
  • Loading branch information
timpalpant authored Oct 26, 2018
1 parent 1fb8ade commit cd96921
Show file tree
Hide file tree
Showing 352 changed files with 196,983 additions and 1,680 deletions.
9 changes: 6 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
module github.com/timpalpant/go-iex

require (
github.com/google/go-cmp v0.2.0 // indirect
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
github.com/google/gopacket v1.1.14
github.com/kor44/pcapng v0.0.0-20180516064813-58a5fa376ac6
github.com/pkg/errors v0.8.0 // indirect
github.com/google/gopacket v1.1.16-0.20181023151400-a35e09f9f224
github.com/johnmccabe/go-bitbar v0.4.0
github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9 // indirect
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 // indirect
golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c // indirect
)
18 changes: 12 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gopacket v1.1.14 h1:1+TEhSu8Mh154ZBVjyd1Nt2Bb7cnyOeE3GQyb1WGLqI=
github.com/google/gopacket v1.1.14/go.mod h1:UCLx9mCmAwsVbn6qQl1WIEt2SO7Nd2fD0th1TBAsqBw=
github.com/kor44/pcapng v0.0.0-20180516064813-58a5fa376ac6 h1:2zXBIa0ofqfDe7hNTCXWCdcZOHExqEN2zZmD44xX/4g=
github.com/kor44/pcapng v0.0.0-20180516064813-58a5fa376ac6/go.mod h1:OV+CiJd0ifvz2MCU/BFcfKDc6hg5kY+Aq8hztA14voc=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/google/gopacket v1.1.16-0.20181023151400-a35e09f9f224 h1:78xLKlzgK/iEGI5iyrSMXEZu+kRRT+s08QqpSXonq7o=
github.com/google/gopacket v1.1.16-0.20181023151400-a35e09f9f224/go.mod h1:UCLx9mCmAwsVbn6qQl1WIEt2SO7Nd2fD0th1TBAsqBw=
github.com/johnmccabe/go-bitbar v0.4.0 h1:n2vBc0btNbDkdyEfovT9YjZE/QJvNUKCSASevTperhg=
github.com/johnmccabe/go-bitbar v0.4.0/go.mod h1:i67T2iQ7Ql/v6x4NbPLlW7eTs+3d/vZgVDl12pr03C8=
github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9 h1:tOtO8DXiNGj9NshRKHWiZuGlSldPFzFCFYhNtsKTBCs=
github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9/go.mod h1:rC/yE65s/DoHB6BzVOUBNYBGTg772JVytyAytffIZkY=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 h1:x6rhz8Y9CjbgQkccRGmELH6K+LJj7tOoh3XWeC1yaQM=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c h1:8QwKN2PcBeeHEiYIX6348SzigNWH9uHHP1EOEs5ExSc=
golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3 changes: 1 addition & 2 deletions pcap.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcapgo"
"github.com/kor44/pcapng"

"github.com/timpalpant/go-iex/iextp"
_ "github.com/timpalpant/go-iex/iextp/deep"
Expand Down Expand Up @@ -53,7 +52,7 @@ func NewPacketDataSource(r io.Reader) (PacketDataSource, error) {

var packetSource PacketDataSource
if magic == pcapNGMagic {
packetSource, err = pcapng.NewReader(input)
packetSource, err = pcapgo.NewNgReader(input, pcapgo.DefaultNgReaderOptions)
} else {
packetSource, err = pcapgo.NewReader(input)
}
Expand Down
11 changes: 7 additions & 4 deletions vendor/github.com/google/gopacket/.travis.golint.sh

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

2 changes: 1 addition & 1 deletion vendor/github.com/google/gopacket/.travis.govet.sh

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

4 changes: 4 additions & 0 deletions vendor/github.com/google/gopacket/.travis.yml

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

3 changes: 3 additions & 0 deletions vendor/github.com/google/gopacket/AUTHORS

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

2 changes: 1 addition & 1 deletion vendor/github.com/google/gopacket/doc.go

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

10 changes: 10 additions & 0 deletions vendor/github.com/google/gopacket/gc

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

39 changes: 39 additions & 0 deletions vendor/github.com/google/gopacket/layers/.lint_blacklist

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

40 changes: 0 additions & 40 deletions vendor/github.com/google/gopacket/layers/.linted

This file was deleted.

Loading

0 comments on commit cd96921

Please sign in to comment.