vendor: Revert to github.com/jackpal/gateway instead of fork
It now includes all the fixes GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3246
This commit is contained in:
committed by
Audrius Butkevicius
parent
8709fec517
commit
6a67921e40
34
vendor/github.com/jackpal/gateway/gateway_linux.go
generated
vendored
Normal file
34
vendor/github.com/jackpal/gateway/gateway_linux.go
generated
vendored
Normal file
@@ -0,0 +1,34 @@
|
||||
package gateway
|
||||
|
||||
import (
|
||||
"net"
|
||||
"os/exec"
|
||||
)
|
||||
|
||||
func DiscoverGateway() (ip net.IP, err error) {
|
||||
ip, err = discoverGatewayUsingRoute()
|
||||
if err != nil {
|
||||
ip, err = discoverGatewayUsingIp()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func discoverGatewayUsingIp() (net.IP, error) {
|
||||
routeCmd := exec.Command("/usr/bin/ip", "route", "show")
|
||||
output, err := routeCmd.CombinedOutput()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return parseLinuxIPRoute(output)
|
||||
}
|
||||
|
||||
func discoverGatewayUsingRoute() (net.IP, error) {
|
||||
routeCmd := exec.Command("/usr/bin/route", "-n")
|
||||
output, err := routeCmd.CombinedOutput()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return parseLinuxRoute(output)
|
||||
}
|
||||
Reference in New Issue
Block a user