lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenEthernet → NewEthernetHandle, remove kludge

Browse Source
This commit is contained in:
Michael Stapelberg 2018-09-07 00:50:41 +02:00
parent aa404c3c54
commit ea4ffa7bec
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -11,8 +11,6 @@ go:
install: install:
- go get -t -v -d ./... - go get -t -v -d ./...
# TODO: get rid of this once https://github.com/google/gopacket/pull/470 is merged
- (cd $GOPATH/src/github.com/google/gopacket && wget -qO- https://patch-diff.githubusercontent.com/raw/google/gopacket/pull/470.patch | patch -p1)
script: script:
# Check whether files are syntactically correct. # Check whether files are syntactically correct.

2
cmd/captured/captured.go
View File

@ -45,7 +45,7 @@ var (
func capturePackets(ctx context.Context) (chan gopacket.Packet, error) { func capturePackets(ctx context.Context) (chan gopacket.Packet, error) {
packets := make(chan gopacket.Packet) packets := make(chan gopacket.Packet)
for _, ifname := range []string{"uplink0", "lan0"} { for _, ifname := range []string{"uplink0", "lan0"} {
handle, err := pcapgo.OpenEthernet(ifname) handle, err := pcapgo.NewEthernetHandle(ifname)
if err != nil { if err != nil {
return nil, err return nil, err
} }