Merge branch 'master' into emergency

* master:
  fender.m4: Define an address to be a guaranteed black hole.

diff --git a/fender.m4 b/fender.m4
index a6c736201d6a89505559ccbfe7f114b772e2d433..c8b2ee76a764e2b7258b37a8bb98735e2c7613ea 100644 (file)
--- a/fender.m4
+++ b/fender.m4
@@ -33,5 +33,9 @@ allowservices inbound tcp \
 ## We have to provide NTP service.  The guests sync to our clock.
 ntpclient inbound $ntp_servers
 
+## Guaranteed black hole.  Put this at the very front of the chain.
+run iptables -I INPUT -d 212.13.198.78 -j DROP
+run ip6tables -I INPUT -d 2001:ba8:0:1d9::ffff -j DROP
+
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------