From 1eb6b530423fff95c9475467d3258ca30f5e7e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20B=C3=B6hm?= <alexander.boehm@malbolge.net>
Date: Fri, 10 Dec 2021 02:20:17 +0100
Subject: [PATCH] Working batman + dhcp

---
 batman/entry-point.sh | 8 +++++++-
 debug/Dockerfile      | 2 +-
 docker-compose.yml    | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/batman/entry-point.sh b/batman/entry-point.sh
index 6fa0606..9fdcadd 100644
--- a/batman/entry-point.sh
+++ b/batman/entry-point.sh
@@ -24,7 +24,13 @@ ip rule add iif ${BATMAN_BRIDGE} table ${BATMAN_FORWARD_TABLE}
     ip -4 route add table ${BATMAN_FORWARD_TABLE} default via ${BATMAN_FORWARD_GATEWAY4}
 [ "${BATMAN_FORWARD_GATEWAY6}" ] && \
     ip -6 route add table ${BATMAN_FORWARD_TABLE} default via ${BATMAN_FORWARD_GATEWAY6}
-nft add rule nat POSTROUTING counter masquerade
+
+nft add table ip nat || true
+nft add chain 'ip nat POSTROUTING { type nat hook postrouting priority srcnat; policy accept; }' || true
+nft add rule nat POSTROUTING counter masquerade || true
+nft add table ip6 nat || true
+nft add chain 'ip6 nat POSTROUTING { type nat hook postrouting priority srcnat; policy accept; }' || true
+nft add rule ip6 nat counter masquerade || true
 
 while true ; do
     sleep 1
diff --git a/debug/Dockerfile b/debug/Dockerfile
index 7a93ff4..a51862d 100644
--- a/debug/Dockerfile
+++ b/debug/Dockerfile
@@ -3,6 +3,6 @@ FROM docker.io/library/debian:bullseye
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
-    && apt-get install -y fastd isc-dhcp-server radvd radvdump batctl iproute2 curl traceroute bind9-host tcpdump \
+    && apt-get install -y fastd isc-dhcp-server radvd radvdump batctl iproute2 curl traceroute bind9-host tcpdump nftables inetutils-ping \
     && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 ENTRYPOINT ["/bin/bash"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d2b5c2b..935e164 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,7 @@ services:
     cap_add:
       - NET_ADMIN
     sysctls:
+      - net.ipv6.conf.default.disable_ipv6=0
       - net.ipv4.ip_forward=1
       - net.ipv4.conf.all.forwarding=1
       - net.ipv4.conf.all.src_valid_mark=1