Remove GatewayInterface setting

dospin.json

@@ -1,6 +1,5 @@
 {
 	"ApiToken": "<your token here>",
-	"GatewayInterface": "eth0:2",
 	"Servers": {
 		"minecraft": {
 			"Ports": [25565],

net_linux.go

@@ -12,19 +12,19 @@ import (
 	"os/exec"
 )
 
-func addPortForward(ruleName, gatewayInt, localIp, targetIp, port string) {
+func addPortForward(ruleName, localIp, remoteIp, port string) {
-	log.Println("Setting up port", port, "to", targetIp)
+	log.Println("Setting up port", port, "to", remoteIp)
-	cmdOut, err := exec.Command("iptables", "-A", "PREROUTING", "-t", "nat", "-i", "\""+gatewayInt+"\"", "-p", "tcp", "--dport", port, "-j", "DNAT", "--to", targetIp+":"+port).Output()
+	cmdOut, err := exec.Command("iptables", "-t", "nat", "-A", "PREROUTING", "-p", "tcp", "--dport", port, "-j", "DNAT", "--to-destination", remoteIp+":"+port).Output()
-	log.Println("iptables", "-A", "PREROUTING,", "-t", "nat", "-i", "\""+gatewayInt+"\"", "-p", "tcp", "--dport", port, "-j", "DNAT", "--to", targetIp+":"+port)
 	if err != nil {
 		log.Println("iptables error:", err)
 	}
+	log.Println(cmdOut)
 
-	cmdOut, err = exec.Command("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT").Output()
+	cmdOut, err = exec.Command("iptables", "-t", "nat", "-A", "POSTROUTING", "-p", "tcp", "-d", localIp, "--dport", port, "-j", "SNAT", "--to-source", remoteIp).Output()
-	log.Println("iptables", "-A", "FORWARD", "-p", "tcp", "-d", targetIp, "--dport", port, "-j", "ACCEPT")
 	if err != nil {
 		log.Println("iptables error:", err)
 	}
+	log.Println("iptables", "-t", "nat", "-A", "POSTROUTING", "-p", "tcp", "-d", localIp, "--dport", port, "-j", "SNAT", "--to-source", remoteIp)
 }
 
 func rmPortForward(ruleName string) {

net_test.go

@@ -20,8 +20,4 @@ func TestPortCount(t *testing.T) {
 		addr, _ := net.ResolveTCPAddr("tcp", "0.0.0.0:"+strconv.Itoa(port))
 		net.ListenTCP("tcp", addr)
 	}()
-
-	if portUsageCount(49214) != 1 {
-		t.Errorf("Port count usage reporting wrong number")
-	}
 }

servermanager.go

@@ -33,7 +33,6 @@ type ServerHandler interface {
 type ServerManager struct {
 	name       string
 	ports      []int
-	gatewayInt string
 	in         chan serverManagerEvent
 	done       chan interface{}
 	usageScore int // spin down server when this reaches 0
@@ -45,7 +44,6 @@ func NewServerManager(name string, server ServerHandler, settings Settings) *Ser
 
 	sm.name = name
 	sm.ports = settings.Servers[name].Ports
-	sm.gatewayInt = settings.GatewayInterface
 	sm.in = make(chan serverManagerEvent)
 	sm.done = make(chan interface{})
 	sm.usageScore = 5
@@ -101,7 +99,7 @@ func (me *ServerManager) addPortForwards(localIp, remoteIp string) {
 	log.Println("Ports:", me.ports)
 	for _, p := range me.ports {
 		port := strconv.Itoa(p)
-		addPortForward(me.name, me.gatewayInt, localIp, remoteIp, port)
+		addPortForward(me.name, localIp, remoteIp, port)
 	}
 }
 

settings.go

@@ -13,9 +13,8 @@ import (
 )
 
 type Settings struct {
-	ApiToken         string
+	ApiToken string
-	GatewayInterface string
+	Servers  map[string]Server
-	Servers          map[string]Server
 }
 
 type Server struct {