Merge branch 'stretch' of https://github.com/bashrc/freedombone
This commit is contained in:
Bob Mottram
commit
4e77ed90b4
|
|
@ -125,6 +125,9 @@ ENABLE_ZERONET=
|
|||
|
||||
MESH_TEXT_EDITOR='pluma'
|
||||
|
||||
BABEL_REPO="https://github.com/jech/babeld"
|
||||
BABEL_COMMIT='d9390d1fee337c464e67255bbbd879d975e126e2'
|
||||
|
||||
OLSR2_REPO="https://github.com/OLSR/OONF"
|
||||
OLSR2_COMMIT='81033251c4ee1c5699bfee9d2985112c6266ab0a'
|
||||
|
||||
|
|
@ -671,6 +674,42 @@ mesh_shutdown_script() {
|
|||
chroot "$rootdir" systemctl enable meshshutdown
|
||||
}
|
||||
|
||||
install_babel() {
|
||||
git clone $BABEL_REPO $rootdir/etc/babel
|
||||
|
||||
cat <<EOF > $rootdir/usr/bin/install_babel
|
||||
#!/bin/bash
|
||||
cd /etc/babel
|
||||
git checkout $BABEL_COMMIT -b $BABEL_COMMIT
|
||||
cd /etc/babel
|
||||
make
|
||||
make install
|
||||
EOF
|
||||
chroot "$rootdir" chmod +x /usr/bin/install_babel
|
||||
chroot "$rootdir" /usr/bin/install_babel
|
||||
|
||||
if [ ! -f $rootdir/usr/local/bin/babeld ]; then
|
||||
echo $'Unable to build Babel'
|
||||
exit 52382524
|
||||
fi
|
||||
|
||||
rm $rootdir/usr/bin/install_babel
|
||||
|
||||
echo '[Unit]' > $rootdir/etc/systemd/system/babel.service
|
||||
echo 'Description=Babel mesh routing protocol' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'Requires=network.target' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'After=network.target' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo '' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo '[Service]' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'User=root' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'Group=root' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'ExecStart=/usr/local/bin/babeld wlan0' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'Restart=on-failure' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo '' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo '[Install]' >> $rootdir/etc/systemd/system/babel.service
|
||||
echo 'WantedBy=multi-user.target' >> $rootdir/etc/systemd/system/babel.service
|
||||
}
|
||||
|
||||
install_olsr2() {
|
||||
chroot "$rootdir" apt-get -yq install cmake libnl-3-dev
|
||||
|
||||
|
|
@ -896,6 +935,7 @@ initialise_mesh() {
|
|||
install_bmx6
|
||||
install_bmx7
|
||||
install_olsr2
|
||||
install_babel
|
||||
mesh_shutdown_script
|
||||
install_vpn
|
||||
install_tomb
|
||||
|
|
@ -919,6 +959,11 @@ initialise_mesh() {
|
|||
install_zeronet
|
||||
fi
|
||||
|
||||
# ssh server not available on mesh peers
|
||||
if [ -f $rootdir/etc/avahi/services/ssh.service ]; then
|
||||
rm $rootdir/etc/avahi/services/ssh.service
|
||||
fi
|
||||
|
||||
MESH_SERVICE='mesh-setup.service'
|
||||
MESH_SETUP_DAEMON=$rootdir/etc/systemd/system/$MESH_SERVICE
|
||||
|
||||
|
|
@ -1489,9 +1534,6 @@ else
|
|||
if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
|
||||
rm /home/$MY_USERNAME/Desktop/tox.desktop
|
||||
fi
|
||||
if [ -f /home/$MY_USERNAME/Desktop/routing.desktop ]; then
|
||||
rm /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
fi
|
||||
pkill qtox
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -810,6 +810,35 @@ function show_desktop_icons {
|
|||
#echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
|
||||
#echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
|
||||
|
||||
echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name=Routing Protocol' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[el]=Πρωτόκολλο δρομολόγησης' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[ar]=بروتوكول التوجيه' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo "Name[ca]=Protocol d'enrutament" >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[hi]=रूटिंग प्रोटोकॉल' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[fr]=Protocole de routage' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[de]=Routingprotokoll' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[es]=Protocolo de enrutamiento' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[it]=Protocollo di routing' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[ru]=Протокол маршрутизации' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Name[zh]=路由协议' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment=Select the mesh routing protocol' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[el]=Επιλέξτε το πρωτόκολλο δρομολόγησης πλέγματος' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[ar]=حدد بروتوكول توجيه الشبكة' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo "Comment[ca]=Seleccioneu el protocol d'enrutament de malles" >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[hi]=जाल रूटिंग प्रोटोकॉल का चयन करें' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[fr]=Sélectionnez le protocole de routage de maillage' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[de]=Wählen Sie das Mesh-Routing-Protokoll' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[es]=Seleccione el protocolo de enrutamiento de malla' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo "Comment[it]=Seleziona il protocollo di instradamento della mesh" >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[ru]=Выберите протокол маршрутизации сетки' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Comment[zh]=选择网状路由协议' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo "Exec=mate-terminal -e \"/usr/local/bin/${PROJECT_NAME}-mesh-routing\"" >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_routing.png' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
echo 'Categories=Application' >> /home/$MY_USERNAME/Desktop/routing.desktop
|
||||
|
||||
# set permissions
|
||||
chmod +x /home/$MY_USERNAME/Desktop/*.desktop
|
||||
chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
|
||||
|
|
@ -1427,6 +1456,10 @@ if [ -f $MESH_INSTALL_SETUP ]; then
|
|||
systemctl disable olsr2
|
||||
echo $'OLSR2 disabled' >> $INSTALL_LOG
|
||||
|
||||
systemctl stop babel
|
||||
systemctl disable babel
|
||||
echo $'Babel disabled' >> $INSTALL_LOG
|
||||
|
||||
#tomb slam all
|
||||
tmp_ram_disk 100
|
||||
enable_predictable_device_names
|
||||
|
|
|
|||
|
|
@ -73,9 +73,11 @@ function stop {
|
|||
systemctl stop bmx6
|
||||
systemctl stop bmx7
|
||||
systemctl stop olsr2
|
||||
systemctl stop babel
|
||||
systemctl disable bmx6
|
||||
systemctl disable bmx7
|
||||
systemctl disable olsr2
|
||||
systemctl disable babel
|
||||
systemctl stop dnsmasq
|
||||
systemctl disable dnsmasq
|
||||
|
||||
|
|
@ -210,6 +212,7 @@ function start {
|
|||
sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx6 dev=${IFACE}|g" /etc/systemd/system/bmx6.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx7 dev=${IFACE}|g" /etc/systemd/system/bmx7.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/local/sbin/olsrd2_static ${IFACE}|g" /etc/systemd/system/olsr2.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/local/bin/babeld ${IFACE}|g" /etc/systemd/system/babel.service
|
||||
systemctl daemon-reload
|
||||
|
||||
add_wifi_interface $IFACE $WIFI_SSID ad-hoc $CHANNEL
|
||||
|
|
@ -234,6 +237,7 @@ function start {
|
|||
sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx6 dev=${IFACE} dev=${EIFACE}|g" /etc/systemd/system/bmx6.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/sbin/bmx7 dev=${IFACE} dev=${EIFACE}|g" /etc/systemd/system/bmx7.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/local/sbin/olsrd2_static ${IFACE} ${EIFACE}|g" /etc/systemd/system/olsr2.service
|
||||
sed -i "s|ExecStart=.*|ExecStart=/usr/local/bin/babeld ${IFACE} ${EIFACE}|g" /etc/systemd/system/babel.service
|
||||
systemctl daemon-reload
|
||||
else
|
||||
echo $"$EIFACE is not connected"
|
||||
|
|
@ -270,11 +274,23 @@ function start {
|
|||
fi
|
||||
|
||||
if grep -q "olsr" $MESH_DEFAULT_PROTOCOL; then
|
||||
IFACE=$(cat /etc/systemd/system/olsr2.service | grep ExecStart | awk -F ' ' '{print $2}')
|
||||
mesh_generate_ipv6_address $IFACE
|
||||
|
||||
systemctl enable olsr2
|
||||
systemctl restart olsr2
|
||||
sed -i 's|<type>.*|<type>_olsr2._tcp</type>|g' /etc/avahi/services/routing.service
|
||||
fi
|
||||
|
||||
if grep -q "babel" $MESH_DEFAULT_PROTOCOL; then
|
||||
IFACE=$(cat /etc/systemd/system/babel.service | grep ExecStart | awk -F ' ' '{print $2}')
|
||||
mesh_generate_ipv6_address $IFACE
|
||||
|
||||
systemctl enable babel
|
||||
systemctl restart babel
|
||||
sed -i 's|<type>.*|<type>_babel._tcp</type>|g' /etc/avahi/services/routing.service
|
||||
fi
|
||||
|
||||
systemctl restart avahi-daemon
|
||||
|
||||
verify
|
||||
|
|
|
|||
|
|
@ -233,6 +233,10 @@ function mesh_firewall {
|
|||
echo 'ip6tables -A INPUT -p udp --dport 269 -j ACCEPT' >> $MESH_FIREWALL_SCRIPT
|
||||
echo 'iptables -A INPUT -p tcp --dport 138 -j ACCEPT' >> $MESH_FIREWALL_SCRIPT
|
||||
echo 'ip6tables -A INPUT -p tcp --dport 138 -j ACCEPT' >> $MESH_FIREWALL_SCRIPT
|
||||
|
||||
echo '# Babel' >> $MESH_FIREWALL_SCRIPT
|
||||
echo 'iptables -A INPUT -p udp --dport 6696 -j ACCEPT' >> $MESH_FIREWALL_SCRIPT
|
||||
echo 'ip6tables -A INPUT -p udp --dport 6696 -j ACCEPT' >> $MESH_FIREWALL_SCRIPT
|
||||
chmod +x $MESH_FIREWALL_SCRIPT
|
||||
|
||||
echo '[Unit]' > $FIREWALL_FILENAME
|
||||
|
|
|
|||
|
|
@ -34,10 +34,24 @@ export TEXTDOMAINDIR="/usr/share/locale"
|
|||
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
|
||||
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
|
||||
|
||||
clear
|
||||
echo ''
|
||||
echo $'Scanning for BMX6 protocol...'
|
||||
bmx6_peers=$(avahi-browse -at | grep routing | grep bmx6 | wc -l)
|
||||
|
||||
clear
|
||||
echo ''
|
||||
echo $'Scanning for OLSR2 protocol...'
|
||||
olsr2_peers=$(avahi-browse -at | grep routing | grep olsr2 | wc -l)
|
||||
|
||||
data=$(zenity --list 1 $"BMX6 ($bmx6_peers)" 2 $"OLSR2 ($olsr2_peers)" $"Select Mesh Protocol" --column="id" --title $"Mesh Protocol" --column=$"Choose the mesh protocol:" --hide-column=1 --print-column=1 --height=150)
|
||||
clear
|
||||
echo ''
|
||||
echo $'Scanning for Babel protocol...'
|
||||
babel_peers=$(avahi-browse -at | grep routing | grep babel | wc -l)
|
||||
|
||||
clear
|
||||
|
||||
data=$(zenity --list 1 $"BMX6 ($bmx6_peers)" 2 $"OLSR2 ($olsr2_peers)" 3 $"Babel ($babel_peers)" $"Select Mesh Protocol" --column="id" --title $"Mesh Protocol" --column=$"Choose the mesh protocol:" --hide-column=1 --print-column=1 --height=150)
|
||||
|
||||
sel=$?
|
||||
case $sel in
|
||||
|
|
@ -63,6 +77,8 @@ case $data in
|
|||
sudo systemctl disable bmx7
|
||||
sudo systemctl stop olsr2
|
||||
sudo systemctl disable olsr2
|
||||
sudo systemctl stop babel
|
||||
sudo systemctl disable babel
|
||||
sudo systemctl enable bmx6
|
||||
sudo systemctl start bmx6
|
||||
;;
|
||||
|
|
@ -71,9 +87,25 @@ case $data in
|
|||
sudo systemctl disable bmx7
|
||||
sudo systemctl stop bmx6
|
||||
sudo systemctl disable bmx6
|
||||
sudo systemctl stop babel
|
||||
sudo systemctl disable babel
|
||||
IFACE=$(cat /etc/systemd/system/olsr2.service | grep ExecStart | awk -F ' ' '{print $2}')
|
||||
mesh_generate_ipv6_address $IFACE
|
||||
sudo systemctl enable olsr2
|
||||
sudo systemctl start olsr2
|
||||
;;
|
||||
3) sudo /tmp/change_routing 'babel'
|
||||
sudo systemctl stop bmx7
|
||||
sudo systemctl disable bmx7
|
||||
sudo systemctl stop bmx6
|
||||
sudo systemctl disable bmx6
|
||||
sudo systemctl stop olsr2
|
||||
sudo systemctl disable olsr2
|
||||
IFACE=$(cat /etc/systemd/system/babel.service | grep ExecStart | awk -F ' ' '{print $2}')
|
||||
mesh_generate_ipv6_address $IFACE
|
||||
sudo systemctl enable babel
|
||||
sudo systemctl start babel
|
||||
;;
|
||||
esac
|
||||
|
||||
rm /tmp/change_routing
|
||||
|
|
|
|||
|
|
@ -32,6 +32,28 @@
|
|||
MESH_CURRENT_PROTOCOL=/root/.mesh_protocol
|
||||
MESH_DEFAULT_PROTOCOL=/root/.mesh_protocol_default
|
||||
|
||||
function mesh_generate_ipv6_address {
|
||||
network=fd66:66:66
|
||||
|
||||
if [ $1 ]; then
|
||||
search_ipv6=$(ifconfig $1 | grep $network)
|
||||
if [ $search_ipv6 ]; then
|
||||
result=$(ifconfig $1 | grep $network | awk -F ' ' '{print $2}')
|
||||
ip -6 addr add ${result}/128 dev $1
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
ipv6_array=( 1 2 3 4 5 6 7 8 9 0 a b c d e f )
|
||||
a=${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}
|
||||
b=${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}
|
||||
c=${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}
|
||||
d=${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}
|
||||
e=${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}${ipv6_array[$RANDOM%16]}
|
||||
result=$network:$a:$b:$c:$d:$e
|
||||
ip -6 addr add ${result}/128 dev $1
|
||||
}
|
||||
|
||||
function mesh_protocol_init {
|
||||
if [[ $1 == "start" ]]; then
|
||||
# install avahi
|
||||
|
|
@ -198,6 +220,9 @@ function enable_mesh_firewall {
|
|||
# OLSR2/MANET
|
||||
iptables -A INPUT -p udp --dport 269 -j ACCEPT
|
||||
iptables -A INPUT -p tcp --dport 138 -j ACCEPT
|
||||
# Babel
|
||||
iptables -A INPUT -p udp --dport 6696 -j ACCEPT
|
||||
ip6tables -A INPUT -p udp --dport 6696 -j ACCEPT
|
||||
|
||||
|
||||
ip6tables -A INPUT -p ipv6-icmp -j ACCEPT
|
||||
|
|
@ -231,6 +256,9 @@ function enable_mesh_firewall {
|
|||
# OLSR2/MANET
|
||||
ip6tables -A INPUT -p udp --dport 269 -j ACCEPT
|
||||
ip6tables -A INPUT -p tcp --dport 138 -j ACCEPT
|
||||
# Babel
|
||||
iptables -A INPUT -p udp --dport 6696 -j ACCEPT
|
||||
ip6tables -A INPUT -p udp --dport 6696 -j ACCEPT
|
||||
|
||||
|
||||
# vpn over the internet
|
||||
|
|
@ -282,6 +310,9 @@ function disable_mesh_firewall {
|
|||
# OLSR2/MANET
|
||||
iptables -D INPUT -p udp --dport 269 -j ACCEPT
|
||||
iptables -D INPUT -p tcp --dport 138 -j ACCEPT
|
||||
# Babel
|
||||
iptables -D INPUT -p udp --dport 6696 -j ACCEPT
|
||||
ip6tables -D INPUT -p udp --dport 6696 -j ACCEPT
|
||||
|
||||
|
||||
ip6tables -D INPUT -p tcp --dport $TRACKER_PORT -j ACCEPT
|
||||
|
|
@ -314,7 +345,9 @@ function disable_mesh_firewall {
|
|||
# OLSR2/MANET
|
||||
ip6tables -D INPUT -p udp --dport 269 -j ACCEPT
|
||||
ip6tables -D INPUT -p tcp --dport 138 -j ACCEPT
|
||||
|
||||
# Babel
|
||||
iptables -D INPUT -p udp --dport 6696 -j ACCEPT
|
||||
ip6tables -D INPUT -p udp --dport 6696 -j ACCEPT
|
||||
|
||||
# vpn over the internet
|
||||
iptables -D INPUT -p tcp --dport 653 -j ACCEPT
|
||||
|
|
|
|||
Loading…
Reference in New Issue