From 2d9764d026286e7618c89ce5e5e5d674b557b811 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Tue, 6 Feb 2018 15:58:26 +0100
Subject: [PATCH] refact: simplified firewall interface

---
 firewall/firewall.go        |  2 --
 firewall/firewall_darwin.go |  8 --------
 firewall/firewall_linux.go  | 12 +-----------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/firewall/firewall.go b/firewall/firewall.go
index 402c1543..3b4d5cd9 100644
--- a/firewall/firewall.go
+++ b/firewall/firewall.go
@@ -3,8 +3,6 @@ package firewall
 type FirewallManager interface {
 	IsForwardingEnabled() bool
 	EnableForwarding(enabled bool) error
-	EnableIcmpBcast(enabled bool) error
-	EnableSendRedirects(enabled bool) error
 	EnableRedirection(r *Redirection, enabled bool) error
 	Restore()
 }
diff --git a/firewall/firewall_darwin.go b/firewall/firewall_darwin.go
index 41433627..d2d8fdd2 100644
--- a/firewall/firewall_darwin.go
+++ b/firewall/firewall_darwin.go
@@ -89,14 +89,6 @@ func (f PfFirewall) EnableForwarding(enabled bool) error {
 	return f.enableParam("net.inet.ip.forwarding", enabled)
 }
 
-func (f PfFirewall) EnableIcmpBcast(enabled bool) error {
-	return f.enableParam("net.inet.icmp.bmcastecho", enabled)
-}
-
-func (f PfFirewall) EnableSendRedirects(enabled bool) error {
-	return nil
-}
-
 func (f PfFirewall) generateRule(r *Redirection) string {
 	src_a := "any"
 	dst_a := "any"
diff --git a/firewall/firewall_linux.go b/firewall/firewall_linux.go
index b10e8a9a..b2e328a8 100644
--- a/firewall/firewall_linux.go
+++ b/firewall/firewall_linux.go
@@ -14,9 +14,7 @@ type LinuxFirewall struct {
 }
 
 const (
-	IPV4ForwardingFile    = "/proc/sys/net/ipv4/ip_forward"
-	IPV4ICMPBcastFile     = "/proc/sys/net/ipv4/icmp_echo_ignore_broadcasts"
-	IPV4SendRedirectsFile = "/proc/sys/net/ipv4/conf/all/send_redirects"
+	IPV4ForwardingFile = "/proc/sys/net/ipv4/ip_forward"
 )
 
 func Make() FirewallManager {
@@ -64,14 +62,6 @@ func (f LinuxFirewall) EnableForwarding(enabled bool) error {
 	return f.enableFeature(IPV4ForwardingFile, enabled)
 }
 
-func (f LinuxFirewall) EnableIcmpBcast(enabled bool) error {
-	return f.enableFeature(IPV4ICMPBcastFile, enabled)
-}
-
-func (f LinuxFirewall) EnableSendRedirects(enabled bool) error {
-	return f.enableFeature(IPV4SendRedirectsFile, enabled)
-}
-
 func (f *LinuxFirewall) EnableRedirection(r *Redirection, enabled bool) error {
 	var opts []string