fix internal port redirect

- handles #105. corectld now respects all sorts of custom host pf settings Signed-off-by: António Meireles <[email protected]>
TheNewNormal · Dec 1, 2016 · bc54447 · bc54447
1 parent 6f074a1
commit bc54447
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 85 deletions.
diff --git a/components/server/dns.go b/components/server/dns.go
@@ -139,7 +139,8 @@ func (dns *DNSServer) PortForward() (err error) {
 		session.Caller.Network.Address, EmbeddedDNSport)
 	pfR.Close()
 	exec.Command("/sbin/pfctl", "-e").Run()
-	return exec.Command("/sbin/pfctl", "-f", pfC.Name()).Run()
+	return exec.Command("/sbin/pfctl", "-a", "com.apple/corectl-dns-forwarding",
+		"-f", pfC.Name()).Run()
 }
 
 func (dns *DNSServer) Start() {
@@ -169,7 +170,8 @@ type runner interface {
 }
 
 func teardownService() {
-	exec.Command("/sbin/pfctl", "-f", "/etc/pf.conf").Run()
+	exec.Command("/sbin/pfctl", "-a", "com.apple/corectl-dns-forwarding",
+		"-Fa").Run()
 	Daemon.DNSServer.rmRecord("corectld", session.Caller.Network.Address)
 	os.Remove("/etc/resolver/corectld")
 }

diff --git a/components/server/vpn.go b/components/server/vpn.go