From 6dbcf2ab2f0f4422ccd404c2532b69a2a3b01fd5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 14 Jan 2018 22:31:26 +0000 Subject: [PATCH] Add traceroute for mesh testing --- src/freedombone-image-customise | 12 ++++++++++++ src/freedombone-mesh-bmx6 | 8 ++++++-- src/freedombone-mesh-bmx7 | 8 ++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index cc2fb1a4..a881d4f0 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -844,9 +844,21 @@ initialise_mesh() { # dhcp daemon for hotspot on secondary wifi adapter chroot "$rootdir" apt-get -yq install dnsmasq + # for debugging + chroot "$rootdir" apt-get -yq install traceroute + # set the default protocol to be used echo 'batman-adv' > $rootdir$MESH_DEFAULT_PROTOCOL + sed -i 's|#net.ipv6.conf.all.forwarding.*|net.ipv6.conf.all.forwarding=1|g' $rootdir/etc/sysctl.conf + sed -i 's|net.ipv6.conf.all.forwarding.*|net.ipv6.conf.all.forwarding=1|g' $rootdir/etc/sysctl.conf + + sed -i 's|#net.ipv6.conf.all.accept_redirects.*|net.ipv6.conf.all.accept_redirects=1|g' $rootdir/etc/sysctl.conf + sed -i 's|net.ipv6.conf.all.accept_redirects.*|net.ipv6.conf.all.accept_redirects=1|g' $rootdir/etc/sysctl.conf + + sed -i 's|#net.ipv6.conf.all.accept_source_route.*|net.ipv6.conf.all.accept_source_route=1|g' $rootdir/etc/sysctl.conf + sed -i 's|net.ipv6.conf.all.accept_source_route.*|net.ipv6.conf.all.accept_source_route=1|g' $rootdir/etc/sysctl.conf + configure_firewall install_avahi install_batman diff --git a/src/freedombone-mesh-bmx6 b/src/freedombone-mesh-bmx6 index 9f3cc552..fb839222 100755 --- a/src/freedombone-mesh-bmx6 +++ b/src/freedombone-mesh-bmx6 @@ -180,11 +180,14 @@ function start { # avahi on ipv6 sed -i 's|use-ipv4=.*|use-ipv4=no|g' /etc/avahi/avahi-daemon.conf sed -i 's|use-ipv6=.*|use-ipv6=yes|g' /etc/avahi/avahi-daemon.conf + sed -i 's|#disallow-other-stacks=.*|disallow-other-stacks=no|g' /etc/avahi/avahi-daemon.conf + sed -i 's|disallow-other-stacks=.*|disallow-other-stacks=no|g' /etc/avahi/avahi-daemon.conf + sed -i 's|#publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g' /etc/avahi/avahi-daemon.conf + sed -i 's|publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g' /etc/avahi/avahi-daemon.conf systemctl restart avahi-daemon systemctl daemon-reload systemctl enable bmx6 - systemctl start bmx6 # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself @@ -213,6 +216,7 @@ function start { sed -i "s|server_name .*|server_name ${HOSTNAME}.local;|g" /etc/nginx/sites-available/git_ssb systemctl restart nginx + systemctl restart bmx6 verify @@ -296,7 +300,7 @@ case "$1" in start ;; ping) - ping -v -6 $2 + ping6 -v $2 ;; data) bmx6 -lc traffic=$IFACE diff --git a/src/freedombone-mesh-bmx7 b/src/freedombone-mesh-bmx7 index be83952b..3a4b22c2 100755 --- a/src/freedombone-mesh-bmx7 +++ b/src/freedombone-mesh-bmx7 @@ -178,11 +178,14 @@ function start { # avahi on ipv6 sed -i 's|use-ipv4=.*|use-ipv4=no|g' /etc/avahi/avahi-daemon.conf sed -i 's|use-ipv6=.*|use-ipv6=yes|g' /etc/avahi/avahi-daemon.conf + sed -i 's|#disallow-other-stacks=.*|disallow-other-stacks=no|g' /etc/avahi/avahi-daemon.conf + sed -i 's|disallow-other-stacks=.*|disallow-other-stacks=no|g' /etc/avahi/avahi-daemon.conf + sed -i 's|#publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g' /etc/avahi/avahi-daemon.conf + sed -i 's|publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g' /etc/avahi/avahi-daemon.conf systemctl restart avahi-daemon systemctl daemon-reload systemctl enable bmx7 - systemctl start bmx7 # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself @@ -211,6 +214,7 @@ function start { sed -i "s|server_name .*|server_name ${HOSTNAME}.local;|g" /etc/nginx/sites-available/git_ssb systemctl restart nginx + systemctl restart bmx7 verify @@ -294,7 +298,7 @@ case "$1" in start ;; ping) - ping -v -6 $2 + ping6 -v $2 ;; data) bmx7 -lc traffic=$IFACE