Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  vampire: Allow incoming I2P traffic.

diff --git a/numbers.m4 b/numbers.m4
index 6738dfc193a0fd84070cd66c072fc9a2aa0f34b5..18ab0461f6b2a4eb1afb1559cd500986beb2eeba 100644 (file)
--- a/numbers.m4
+++ b/numbers.m4
@@ -48,6 +48,7 @@ defport mpd 6600
 defport tor_public 9001
 defport tor_directory 9030
 defport git 9418
+defport i2p 16911
 defport disorder 23599
 
 m4_divert(-1)

diff --git a/vampire.m4 b/vampire.m4
index b7bf1fa41d33460b27fb7ec0f2286d5da735467b..d25bf4923a12fc60b63fd8a4ed76be151fcbb1a2 100644 (file)
--- a/vampire.m4
+++ b/vampire.m4
@@ -49,13 +49,13 @@ allowservices inbound tcp \
        rsync \
        disorder mpd \
        http https \
-       git     
-allowservices inbound tcp \
-       tor_public tor_directory
+       git \
+       tor_public tor_directory i2p
 allowservices inbound udp \
        dns iodine \
        tripe \
-       gnutella_svc
+       gnutella_svc \
+       i2p
 
 ## Provide DNS resolution to local untrusted hosts.
 for p in tcp udp; do