fix: fixed compilation issue related to mdlayher/raw dependency (ref #468)

This commit is contained in:
evilsocket 2019-04-21 13:37:53 +02:00
commit 64d316af5b
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
5 changed files with 9 additions and 47 deletions

6
Gopkg.lock generated
View file

@ -237,12 +237,11 @@
revision = "2a67805d7d0b0bad6c1103058981afdea583b459" revision = "2a67805d7d0b0bad6c1103058981afdea583b459"
[[projects]] [[projects]]
branch = "master" digest = "1:34fe44dd2bbe5723068e0a7a266847965a88297d383fe611e0358e556d82de09"
digest = "1:34bd596081cc218eb9f14ddcc712015bed5b9b84917c6279640397f534565e72"
name = "github.com/mdlayher/raw" name = "github.com/mdlayher/raw"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "b0647ab7d8b35d5b8b734462042628e5af82f7f4" revision = "480b93709cce56651807d3fdeb260a5a7c4e2d5f"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -354,6 +353,7 @@
"github.com/malfunkt/iprange", "github.com/malfunkt/iprange",
"github.com/mdlayher/dhcp6", "github.com/mdlayher/dhcp6",
"github.com/mdlayher/dhcp6/dhcp6opts", "github.com/mdlayher/dhcp6/dhcp6opts",
"github.com/mdlayher/raw",
"github.com/robertkrimen/otto", "github.com/robertkrimen/otto",
"github.com/tarm/serial", "github.com/tarm/serial",
] ]

View file

@ -1,3 +1,5 @@
required = ["github.com/mdlayher/raw"]
[[constraint]] [[constraint]]
name = "github.com/evilsocket/islazy" name = "github.com/evilsocket/islazy"
version = "1.9.1" version = "1.9.1"
@ -58,6 +60,10 @@
name = "github.com/malfunkt/iprange" name = "github.com/malfunkt/iprange"
version = "0.9.0" version = "0.9.0"
[[constraint]]
revision = "480b93709cce56651807d3fdeb260a5a7c4e2d5f"
name = "github.com/mdlayher/raw"
[[constraint]] [[constraint]]
branch = "master" branch = "master"
name = "github.com/mdlayher/dhcp6" name = "github.com/mdlayher/dhcp6"

View file

@ -1,9 +0,0 @@
module github.com/mdlayher/raw
go 1.12
require (
github.com/google/go-cmp v0.2.0
golang.org/x/net v0.0.0-20190313220215-9f648a60d977
golang.org/x/sys v0.0.0-20190312061237-fead79001313
)

View file

@ -1,9 +0,0 @@
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I=
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjWsBSzdaQiKzUyf3DTTc=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

View file

@ -1,26 +0,0 @@
// +build darwin dragonfly freebsd netbsd openbsd
package raw
import (
"time"
)
const (
// Maximum read timeout per syscall.
// It is required because read/recvfrom won't be interrupted on closing of the file descriptor.
readTimeout = 200 * time.Millisecond
)
// Copyright (c) 2012 The Go Authors. All rights reserved.
// Source code in this file is based on src/net/interface_linux.go,
// from the Go standard library. The Go license can be found here:
// https://golang.org/LICENSE.
// Taken from:
// https://github.com/golang/go/blob/master/src/net/net.go#L417-L421.
type timeoutError struct{}
func (e *timeoutError) Error() string { return "i/o timeout" }
func (e *timeoutError) Timeout() bool { return true }
func (e *timeoutError) Temporary() bool { return true }