summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2019-06-29 15:41:47 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2019-06-29 15:41:47 +0200
commite8cc55d295aed71feec2d0a2f9d1a05e8995583f (patch)
treef38fbc2b237aa10f1af0099713fe6559a7022236
parentbf85573c4e88fc8e7f23a32c17a4f7b6118819fd (diff)
downloadchd_openwrt-master.zip
chd_openwrt-master.tar.gz
chd_openwrt-master.tar.bz2
Fix match for wanip4addr (missing 176.16.22.X)HEADmaster
* build-openwrt-dev.sh (wanip4addr): * build-openwrt.sh (wanip4addr): Fix rexexps in cases.
-rwxr-xr-xbuild-openwrt-dev.sh5
-rwxr-xr-xbuild-openwrt.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/build-openwrt-dev.sh b/build-openwrt-dev.sh
index 4338bfa..960dbe7 100755
--- a/build-openwrt-dev.sh
+++ b/build-openwrt-dev.sh
@@ -73,8 +73,9 @@ esac
wanip4addr=${9:-'no-nat'}
case "$wanip4addr" in
- 172.16.20.*|172.16.21.*) wanip4mask=255.255.0.0; wanip4gw=172.16.0.254 ;;
- *) wanip4addr=$ip4pub; wanip4mask=255.255.254.0; wanip4gw=185.131.40.1 ;;
+ 172.16.*) wanip4mask=255.255.0.0; wanip4gw=172.16.0.254 ;;
+ no-nat|185.131.*) wanip4addr=$ip4pub; wanip4mask=255.255.254.0; wanip4gw=185.131.40.1 ;;
+ *) echo "Unknown WAN IP address: $wanip4addr"; exit 6;;
esac
wanip6gw=fe80::31
diff --git a/build-openwrt.sh b/build-openwrt.sh
index 939d21d..5b35879 100755
--- a/build-openwrt.sh
+++ b/build-openwrt.sh
@@ -73,8 +73,9 @@ esac
wanip4addr=${9:-'no-nat'}
case "$wanip4addr" in
- 172.16.20.*|172.16.21.*) wanip4mask=255.255.0.0; wanip4gw=172.16.0.254 ;;
- *) wanip4addr=$ip4pub; wanip4mask=255.255.254.0; wanip4gw=185.131.40.1 ;;
+ 172.16.*) wanip4mask=255.255.0.0; wanip4gw=172.16.0.254 ;;
+ no-nat|185.131.*) wanip4addr=$ip4pub; wanip4mask=255.255.254.0; wanip4gw=185.131.40.1 ;;
+ *) echo "Unknown WAN IP address: $wanip4addr"; exit 6;;
esac
wanip6gw=fe80::31