fix binding address calculation for all commands (issue #1)

reddec · Jan 22, 2020 · aef0d00 · aef0d00
1 parent 93ef724
commit aef0d00
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 57 deletions.
diff --git a/cmd/tinc-boot/forget/main.go b/cmd/tinc-boot/forget/main.go
@@ -4,10 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	cmd2 "github.com/reddec/tinc-boot/cmd"
 	"github.com/reddec/tinc-boot/types"
-	"net"
 	"net/http"
-	"strconv"
 )
 
 type Cmd struct {
@@ -43,13 +42,5 @@ func (cmd *Cmd) Execute(args []string) error {
 }
 
 func (cmd *Cmd) binding() (string, error) {
-	ief, err := net.InterfaceByName(cmd.Iface)
-	if err != nil {
-		return "", err
-	}
-	addrs, err := ief.Addrs()
-	if err != nil {
-		return "", err
-	}
-	return addrs[0].(*net.IPNet).IP.String() + ":" + strconv.Itoa(cmd.Port), nil
+	return cmd2.BindingByName(cmd.Iface, cmd.Port)
 }
diff --git a/cmd/tinc-boot/kill/main.go b/cmd/tinc-boot/kill/main.go
@@ -2,10 +2,9 @@ package kill
 
 import (
 	"errors"
+	cmd2 "github.com/reddec/tinc-boot/cmd"
 	"io"
-	"net"
 	"net/http"
-	"strconv"
 )
 
 type Cmd struct {
@@ -34,13 +33,5 @@ func (cmd *Cmd) Execute(args []string) error {
 }
 
 func (cmd *Cmd) binding() (string, error) {
-	ief, err := net.InterfaceByName(cmd.Iface)
-	if err != nil {
-		return "", err
-	}
-	addrs, err := ief.Addrs()
-	if err != nil {
-		return "", err
-	}
-	return addrs[0].(*net.IPNet).IP.String() + ":" + strconv.Itoa(cmd.Port), nil
+	return cmd2.BindingByName(cmd.Iface, cmd.Port)
 }
diff --git a/cmd/tinc-boot/watch/main.go b/cmd/tinc-boot/watch/main.go
@@ -4,10 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	cmd2 "github.com/reddec/tinc-boot/cmd"
 	"github.com/reddec/tinc-boot/types"
-	"net"
 	"net/http"
-	"strconv"
 )
 
 type Cmd struct {
@@ -43,13 +42,5 @@ func (cmd *Cmd) Execute(args []string) error {
 }
 
 func (cmd *Cmd) binding() (string, error) {
-	ief, err := net.InterfaceByName(cmd.Iface)
-	if err != nil {
-		return "", err
-	}
-	addrs, err := ief.Addrs()
-	if err != nil {
-		return "", err
-	}
-	return addrs[0].(*net.IPNet).IP.String() + ":" + strconv.Itoa(cmd.Port), nil
+	return cmd2.BindingByName(cmd.Iface, cmd.Port)
 }
diff --git a/cmd/tools.go b/cmd/tools.go
@@ -2,8 +2,11 @@ package cmd
 
 import (
 	"context"
+	"errors"
+	"net"
 	"os"
 	"os/signal"
+	"strconv"
 )
 
 func SignalContext(parent context.Context) context.Context {
@@ -22,3 +25,20 @@ func SignalContext(parent context.Context) context.Context {
 	}()
 	return ctx
 }
+
+func BindingByName(iface string, port int) (string, error) {
+	ief, err := net.InterfaceByName(iface)
+	if err != nil {
+		return "", err
+	}
+	addrs, err := ief.Addrs()
+	if err != nil {
+		return "", err
+	}
+	for _, addr := range addrs {
+		if v, ok := addr.(*net.IPNet); ok && v.IP.IsGlobalUnicast() {
+			return v.IP.String() + ":" + strconv.Itoa(port), nil
+		}
+	}
+	return "127.0.0.1:0", errors.New("unable to detect binding address")
+}
diff --git a/domain/monitor/config.go b/domain/monitor/config.go
@@ -1,10 +1,8 @@
 package monitor
 
 import (
-	"errors"
-	"net"
+	cmd2 "github.com/reddec/tinc-boot/cmd"
 	"path/filepath"
-	"strconv"
 	"time"
 )
 
@@ -27,24 +25,8 @@ func (cfg *Config) Root() string {
 	}
 	return r
 }
-func (cfg *Config) Hosts() string    { return filepath.Join(cfg.Root(), "hosts") }
-func (cfg *Config) HostFile() string { return filepath.Join(cfg.Hosts(), cfg.Name) }
-func (cfg *Config) TincConf() string { return filepath.Join(cfg.Root(), "tinc.conf") }
-func (cfg *Config) Network() string  { return filepath.Base(cfg.Root()) }
-
-func (cfg *Config) Binding() (string, error) {
-	ief, err := net.InterfaceByName(cfg.Iface)
-	if err != nil {
-		return "", err
-	}
-	addrs, err := ief.Addrs()
-	if err != nil {
-		return "", err
-	}
-	for _, addr := range addrs {
-		if v, ok := addr.(*net.IPNet); ok && v.IP.IsGlobalUnicast() {
-			return v.IP.String() + ":" + strconv.Itoa(cfg.Port), nil
-		}
-	}
-	return "127.0.0.1:0", errors.New("unable to detect binding address")
-}
+func (cfg *Config) Hosts() string            { return filepath.Join(cfg.Root(), "hosts") }
+func (cfg *Config) HostFile() string         { return filepath.Join(cfg.Hosts(), cfg.Name) }
+func (cfg *Config) TincConf() string         { return filepath.Join(cfg.Root(), "tinc.conf") }
+func (cfg *Config) Network() string          { return filepath.Base(cfg.Root()) }
+func (cfg *Config) Binding() (string, error) { return cmd2.BindingByName(cfg.Iface, cfg.Port) }