Browse Source

Fix CI-testing

- Change minimum go version due to sys/unix. This fixes #704
- Use npcap instead of nmap on windows (fixes abuse errors on travis)
- Fix gofmt error introduced in #689
Gernot Vormayr 4 months ago
parent
commit
8c861fbb4d
5 changed files with 23498 additions and 23498 deletions
  1. 2 2
      .travis.yml
  2. 1 1
      README.md
  3. 23493 23493
      macs/valid_mac_prefixes.go
  4. 1 1
      pcapgo/capture.go
  5. 1 1
      pcapgo/capture_test.go

+ 2 - 2
.travis.yml

@@ -40,8 +40,8 @@ jobs:
       go: 1.x
     - os: windows
       go: 1.x
-      # winpcap does not work on travis ci - so install nmap to get libpcap
-      before_install: choco install nmap
+      # winpcap does not work on travis ci - so install npcap (package is unlisted -> version)
+      before_install: choco install npcap --version 0.86
     - stage: style
       name: "fmt/vet/lint"
       go: 1.x

+ 1 - 1
README.md

@@ -6,7 +6,7 @@ See [godoc](https://godoc.org/github.com/google/gopacket) for more details.
 [![Build Status](https://travis-ci.org/google/gopacket.svg?branch=master)](https://travis-ci.org/google/gopacket)
 [![GoDoc](https://godoc.org/github.com/google/gopacket?status.svg)](https://godoc.org/github.com/google/gopacket)
 
-Minimum Go version required is 1.5 except for pcapgo/EthernetHandle, afpacket, and bsdbpf which need at least 1.7 due to x/sys/unix dependencies.
+Minimum Go version required is 1.5 except for pcapgo/EthernetHandle, afpacket, and bsdbpf which need at least 1.9 due to x/sys/unix dependencies.
 
 Originally forked from the gopcap project written by Andreas
 Krennmair <[email protected]> (http://github.com/akrennmair/gopcap).

File diff suppressed because it is too large
+ 23493 - 23493
macs/valid_mac_prefixes.go


+ 1 - 1
pcapgo/capture.go

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license
 // that can be found in the LICENSE file in the root of the source
 // tree.
-// +build linux,go1.7
+// +build linux,go1.9
 
 package pcapgo
 

+ 1 - 1
pcapgo/capture_test.go

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license
 // that can be found in the LICENSE file in the root of the source
 // tree.
-// +build linux,go1.7
+// +build linux,go1.9
 
 package pcapgo_test