adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/iproute: ignore error if tunnel exists

Browse Source
This commit is contained in:
Lucas Serven 2019-01-21 19:54:09 +01:00
parent e989f0a25f
commit 630bced657
No known key found for this signature in database
GPG Key ID: 586FEAF680DA74AD
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/iproute/ipip.go
View File

@ -18,6 +18,7 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"os/exec" "os/exec"
"strings"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
) )
@ -36,7 +37,9 @@ func NewIPIP(baseIndex int) (int, error) {
cmd := exec.Command("ip", "tunnel", "add", tunnelName, "mode", "ipip") cmd := exec.Command("ip", "tunnel", "add", tunnelName, "mode", "ipip")
var stderr bytes.Buffer var stderr bytes.Buffer
cmd.Stderr = &stderr cmd.Stderr = &stderr
if err := cmd.Run(); err != nil { // Sometimes creating a tunnel returns the error "File exists,"
// in which case the interface exists and we can ignore the error.
if err := cmd.Run(); err != nil && !strings.Contains(stderr.String(), "File exists") {
return 0, fmt.Errorf("failed to create IPIP tunnel: %s", stderr.String()) return 0, fmt.Errorf("failed to create IPIP tunnel: %s", stderr.String())
} }
link, err = netlink.LinkByName(tunnelName) link, err = netlink.LinkByName(tunnelName)