Skip to content

Commit f5d26f6

Browse files
authored
make script backwards compatible for openwrt 23.05
1 parent 14043fb commit f5d26f6

File tree

1 file changed

+20
-8
lines changed
  • ffmuc-mesh-vpn-wireguard-vxlan/shsrc/lib/gluon/gluon-mesh-wireguard-vxlan

1 file changed

+20
-8
lines changed

ffmuc-mesh-vpn-wireguard-vxlan/shsrc/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,26 @@ customwget() {
147147
target=$(echo "$wget_infos" | sed -n 6p)
148148
fw_release=$(echo "$wget_infos" | sed -n 7p)
149149

150-
force_wan_connection wget -q -U "$user_agent" \
151-
--header="X-Gluon-Version: $gluon_version" \
152-
--header="X-Board-Name: $board_name" \
153-
--header="X-Openwrt-Version: $openwrt_version" \
154-
--header="X-Kernel-Version: $kernel" \
155-
--header="X-Target-Name: $target" \
156-
--header="X-Firmware-Version: $fw_release" \
157-
-O- "$@"
150+
151+
# This header check is only required for OpenWrt versions <= 23.05,
152+
# as headers are first available in OpenWrt 24.10.
153+
headerret=0
154+
wget -q "http://[::1]" --header="X: X" 2>/dev/null || headerret=$?
155+
# returns Network Failure =4 if headers for wget are available,
156+
# and Generic Error =1 if no headers for wget are available.
157+
if [ "$headerret" -eq 1 ]; then
158+
force_wan_connection wget -q -U "$user_agent" -O- "$@"
159+
160+
else
161+
force_wan_connection wget -q -U "$user_agent" \
162+
--header="X-Gluon-Version: $gluon_version" \
163+
--header="X-Board-Name: $board_name" \
164+
--header="X-Openwrt-Version: $openwrt_version" \
165+
--header="X-Kernel-Version: $kernel" \
166+
--header="X-Target-Name: $target" \
167+
--header="X-Firmware-Version: $fw_release" \
168+
-O- "$@"
169+
fi
158170
}
159171

160172
get_wgkex_data() {

0 commit comments

Comments
 (0)