Skip to content

Commit 2b0b967

Browse files
committed
bump to 0.14
fix peeraddr / peeraddrdomain ....
1 parent 41a806a commit 2b0b967

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
33
PKG_NAME:=luci-app-fleth
44
LUCI_TITLE:=LuCI Support for Flet'h
55
LUCI_DESCRIPTION:=luci-app-fleth is a helper that can configure IPv4 over IPv6 tunnel automatically in Japan.
6-
PKG_VERSION:=0.13
6+
PKG_VERSION:=0.14
77
PKG_RELEASE:=1
88

99
LUCI_PKGARCH:=all

root/usr/sbin/fleth

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ get_dslite_provider(){
277277

278278
set_interface() {
279279
current_proto=$(uci get network.${h_TUNNEL_INTERFACE}.proto 2>/dev/null)
280-
current_peeraddrdomain=$(uci get network.${h_TUNNEL_INTERFACE}.peeraddrdomain 2>/dev/null)
281280
current_tunlink=$(uci get network.${h_TUNNEL_INTERFACE}.tunlink 2>/dev/null)
282281
current_mtu=$(uci get network.${h_TUNNEL_INTERFACE}.mtu 2>/dev/null)
283282
current_zone_index=$(uci show firewall | grep -E "firewall.@zone\[[0-9]+\].network=.*'$h_TUNNEL_INTERFACE'" | sed -n "s/.*@zone\[\([0-9]\+\)\].*/\1/p")
@@ -288,7 +287,7 @@ set_interface() {
288287
echo "Failed to retrieve one or more configuration values"
289288
exit 1
290289
fi
291-
290+
current_peeraddrdomain=$(uci get network.${h_TUNNEL_INTERFACE}.peeraddrdomain 2>/dev/null)
292291
if [ "$current_peeraddrdomain" != "$r_AFTR_DOMAIN" ] ||
293292
[ "$current_tunlink" != "$h_UPLINK_INTERFACE" ] ||
294293
[ "$current_proto" != 'dslite' ] ||
@@ -312,6 +311,7 @@ EOF
312311
logger -t fleth "New ds-lite configuratin committed ${h_TUNNEL_INTERFACE}=${r_AFTR}"
313312
fi
314313
elif [ "$r_TYPE" = 'map-e' ]; then
314+
current_peeraddr=$(uci get network.${h_TUNNEL_INTERFACE}.peeraddr 2>/dev/null)
315315
current_ipaddr=$(uci get network.${h_TUNNEL_INTERFACE}.ipaddr 2>/dev/null)
316316
current_ip4prefixlen=$(uci get network.${h_TUNNEL_INTERFACE}.ip4prefixlen 2>/dev/null)
317317
current_ip6prefix=$(uci get network.${h_TUNNEL_INTERFACE}.ip6prefix 2>/dev/null)

0 commit comments

Comments
 (0)