Merge pull request tylertreat#59 from aidanhs/aphs-fix-tests

Fix tests, add travis, no ips means all ips
vaporeyes · Sep 16, 2017 · b0d2c70 · b0d2c70
2 parents 2d6610c + 92d7d27
commit b0d2c70
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,7 @@
+language: go
+
+go:
+  - 1.8.x
+
+script:
+  - go test -v ./...
diff --git a/throttler/tc.go b/throttler/tc.go
@@ -131,6 +131,15 @@ func addNetemRule(cfg *Config, c commander) error {
 
 func addIptablesRules(cfg *Config, c commander) error {
 	var err error
+	if len(cfg.TargetIps) == 0 && len(cfg.TargetIps6) == 0 {
+		if err == nil {
+			err = addIptablesRulesForAddrs(cfg, c, ip4Tables, cfg.TargetIps)
+		}
+		if err == nil {
+			err = addIptablesRulesForAddrs(cfg, c, ip6Tables, cfg.TargetIps6)
+		}
+		return err
+	}
 	if err == nil && len(cfg.TargetIps) > 0 {
 		err = addIptablesRulesForAddrs(cfg, c, ip4Tables, cfg.TargetIps)
 	}

diff --git a/throttler/tc_test.go b/throttler/tc_test.go
@@ -50,7 +50,7 @@ func (r *cmdRecorder) verifyCommands(t *testing.T, expected []string) {
 
 	for i, cmd := range expected {
 		if actual := r.commands[i]; actual != cmd {
-			t.Fatalf("Expected to see command `%s`, got `%s`", i, cmd, actual)
+			t.Fatalf("Expected to see command `%s`, got `%s`", cmd, actual)
 		}
 	}
 }
@@ -76,14 +76,33 @@ func TestTcPacketLossSetup(t *testing.T) {
 	cfg.PacketLoss = 0.2
 	th.setup(&cfg)
 	r.verifyCommands(t, []string{
-		"sudo tc qdisc add dev eth1 handle 10: root htb",
+		"sudo tc qdisc add dev eth1 handle 10: root htb default 1",
 		"sudo tc class add dev eth1 parent 10: classid 10:1 htb rate 20000kbit",
-		"sudo tc class add dev eth1 parent 10:1 classid 10:10 htb rate 20000kbit",
+		"sudo tc class add dev eth1 parent 10: classid 10:10 htb rate 1000000kbit",
 		"sudo tc qdisc add dev eth1 parent 10:10 handle 100: netem loss 0.20%",
 		"sudo iptables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10 -p tcp --dport 80 -d 10.10.10.10",
 	})
 }
 
+func TestTcWildcardIps(t *testing.T) {
+	r := newCmdRecorder()
+	th := &tcThrottler{r}
+	cfg := defaultTestConfig
+	cfg.TargetIps = []string{}
+	cfg.TargetPorts  = []string{}
+	cfg.TargetProtos  = []string{}
+	cfg.PacketLoss = -1
+	th.setup(&cfg)
+	r.verifyCommands(t, []string{
+		"sudo tc qdisc add dev eth0 handle 10: root htb default 1",
+		"sudo tc class add dev eth0 parent 10: classid 10:1 htb rate 20000kbit",
+		"sudo tc class add dev eth0 parent 10: classid 10:10 htb rate 1000000kbit",
+		"sudo tc qdisc add dev eth0 parent 10:10 handle 100: netem",
+		"sudo iptables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10",
+		"sudo ip6tables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10",
+	})
+}
+
 func TestTcMultiplePortsAndIps(t *testing.T) {
 	r := newCmdRecorder()
 	th := &tcThrottler{r}
@@ -93,9 +112,9 @@ func TestTcMultiplePortsAndIps(t *testing.T) {
 	cfg.TargetProtos = []string{"tcp", "udp"}
 	th.setup(&cfg)
 	r.verifyCommands(t, []string{
-		"sudo tc qdisc add dev eth0 handle 10: root htb",
+		"sudo tc qdisc add dev eth0 handle 10: root htb default 1",
 		"sudo tc class add dev eth0 parent 10: classid 10:1 htb rate 20000kbit",
-		"sudo tc class add dev eth0 parent 10:1 classid 10:10 htb rate 20000kbit",
+		"sudo tc class add dev eth0 parent 10: classid 10:10 htb rate 1000000kbit",
 		"sudo tc qdisc add dev eth0 parent 10:10 handle 100: netem loss 0.10%",
 		"sudo iptables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10 -p tcp --match multiport --dports 80,8080 -d 1.1.1.1",
 		"sudo iptables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10 -p udp --match multiport --dports 80,8080 -d 1.1.1.1",
@@ -113,9 +132,9 @@ func TestTcMixedIPv6Setup(t *testing.T) {
 	cfg.TargetIps6 = []string{"2001:db8::1"}
 	th.setup(&cfg)
 	r.verifyCommands(t, []string{
-		"sudo tc qdisc add dev eth1 handle 10: root htb",
+		"sudo tc qdisc add dev eth1 handle 10: root htb default 1",
 		"sudo tc class add dev eth1 parent 10: classid 10:1 htb rate 20000kbit",
-		"sudo tc class add dev eth1 parent 10:1 classid 10:10 htb rate 20000kbit",
+		"sudo tc class add dev eth1 parent 10: classid 10:10 htb rate 1000000kbit",
 		"sudo tc qdisc add dev eth1 parent 10:10 handle 100: netem loss 0.20%",
 		"sudo iptables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10 -p tcp --dport 80 -d 10.10.10.10",
 		"sudo ip6tables -A POSTROUTING -t mangle -j CLASSIFY --set-class 10:10 -p tcp --dport 80 -d 2001:db8::1",