From d29cc73898f02d8ada26683081aa142b5bae64d4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 25 Sep 2017 17:18:59 +0100
Subject: [PATCH] Move external ip function
---
src/freedombone-utils-firewall | 13 -------------
src/freedombone-utils-network | 13 +++++++++++++
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index 574faffae..803ed5e5f 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -110,19 +110,6 @@ function enable_ipv6 {
echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
}
-function update_external_ip {
- ip_update_script=/usr/bin/externalipupdate
- echo '#!/bin/bash' >> $ip_update_script
- echo "existing_ip=\$(cat $CONFIGURATION_FILE | grep \"EXTERNAL_IPV4_ADDRESS=\" | head -n 1 | awk -F '=' '{print \$2}')'" >> $ip_update_script
- echo "curr_ip=\$(nslookup . $EXTERNAL_IP_LOOKUP_URL | grep Address | tail -n 1 | awk -F ' ' '{print \$2}')" >> $ip_update_script
- echo 'if [[ "$curr_ip" != "$existing_ip" ]]; then' >> $ip_update_script
- echo " sed -i \"s|EXTERNAL_IPV4_ADDRESS=.*|EXTERNAL_IPV4_ADDRESS=\${curr_ip}|g\" $CONFIGURATION_FILE" >> $ip_update_script
- echo ' iptables-save > /etc/firewall.conf' >> $ip_update_script
- echo 'fi' >> $ip_update_script
-
- cron_add_mins 10 $ip_update_script
-}
-
function firewall_disable_vpn {
iptables -D INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p udp --dport 1194 -j ACCEPT
iptables -D INPUT -i tun+ -j ACCEPT
diff --git a/src/freedombone-utils-network b/src/freedombone-utils-network
index 9812a9b8f..f1e45ceae 100755
--- a/src/freedombone-utils-network
+++ b/src/freedombone-utils-network
@@ -85,4 +85,17 @@ function get_ipv6_address {
echo $(echo "$retval" | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
}
+function update_external_ip {
+ ip_update_script=/usr/bin/externalipupdate
+ echo '#!/bin/bash' >> $ip_update_script
+ echo "existing_ip=\$(cat $CONFIGURATION_FILE | grep \"EXTERNAL_IPV4_ADDRESS=\" | head -n 1 | awk -F '=' '{print \$2}')'" >> $ip_update_script
+ echo "curr_ip=\$(nslookup . $EXTERNAL_IP_LOOKUP_URL | grep Address | tail -n 1 | awk -F ' ' '{print \$2}')" >> $ip_update_script
+ echo 'if [[ "$curr_ip" != "$existing_ip" ]]; then' >> $ip_update_script
+ echo " sed -i \"s|EXTERNAL_IPV4_ADDRESS=.*|EXTERNAL_IPV4_ADDRESS=\${curr_ip}|g\" $CONFIGURATION_FILE" >> $ip_update_script
+ echo ' iptables-save > /etc/firewall.conf' >> $ip_update_script
+ echo 'fi' >> $ip_update_script
+
+ cron_add_mins 10 $ip_update_script
+}
+
# NOTE: deliberately no exit 0
--
GitLab