@@ -257,7 +257,7 @@ pbr_get_gateway4() {
257257}
258258pbr_get_gateway6 () {
259259 local iface=" $2 " " $3 "
260- [ " $iface " = " $uplink_interface " && iface=" $uplink_interface6 "
260+ [ " $iface " = " $uplink_interface " && iface=" $uplink_interface6 "
261261 network_get_gateway6 gw " $iface " true
262262 if [ -z " $gw " || [ " $gw " = ' ::/0' || [ " $gw " = ' ::0/0' || [ " $gw " = ' ::' ; then
263263 gw=" $( ip -6 a list dev " $dev " 2> /dev/null | grep inet6 | grep ' scope global' | awk ' {print $2}' ) "
@@ -813,7 +813,7 @@ nft_file() {
813813 ;;
814814 create)
815815 rm -f " $nftTempFile " " $nftPermFile "
816- for i in " $nftTempFile " " $nftPermFile " ; do
816+ for i in " $nftTempFile " " $nftPermFile " ; do
817817 mkdir -p " ${i%/* } "
818818 done
819819 { echo ' #!/usr/sbin/nft -f' ; echo ' ' ; } > " $nftTempFile "
@@ -847,7 +847,7 @@ nft_file() {
847847 ;;
848848 netifd_create)
849849 rm -f " $nftTempFile " " $nftNetifdPermFile "
850- for i in " $nftTempFile " " $nftNetifdPermFile " ; do
850+ for i in " $nftTempFile " " $nftNetifdPermFile " ; do
851851 mkdir -p " ${i%/* } "
852852 done
853853 { echo ' #!/usr/sbin/nft -f' ; echo ' ' ; } > " $nftTempFile "
@@ -884,7 +884,7 @@ nftset() {
884884 nftset4=" ${nftPrefix}${iface: +_$iface } _4${target: +_$target }${type: +_$type }${uid: +_$uid } "
885885 nftset6=" ${nftPrefix}${iface: +_$iface } _6${target: +_$target }${type: +_$type }${uid: +_$uid } "
886886
887- if [ " ${# nftset4} " -gt ' 255' ; then
887+ if [ " ${# nftset4} " -gt ' 255' ; then
888888 json add error ' errorNftsetNameTooLong' " $nftset4 "
889889 return 1
890890 fi
@@ -998,7 +998,7 @@ nftset() {
998998 fi
999999}
10001000
1001- cleanup_rt_tables () {
1001+ cleanup_rt_tables () {
10021002 local i
10031003# shellcheck disable=SC2013
10041004 for i in $( grep -oh " ${ipTablePrefix} _.*" " $rtTablesFile " ) ; do
@@ -1204,7 +1204,7 @@ resolver() {
12041204 ;;
12051205 compare_hash)
12061206 [ -z " $resolverSetSupported " && return 1
1207- uci_changes ' dhcp' && uci_commit ' dhcp'
1207+ uci_changes ' dhcp' && uci_commit ' dhcp'
12081208 local resolverNewHash
12091209 if [ -s " $packageDnsmasqFile " ; then
12101210 resolverNewHash=" $( md5sum " $packageDnsmasqFile " | awk ' { print $1; }' ) "
@@ -1238,8 +1238,8 @@ netifd() {
12381238 local iface=" $1 " " ${2:- install} "
12391239 local rt_name=" ${ipTablePrefix} _${iface% 6} "
12401240
1241- uci_remove ' network' " ${rt_name} _ipv4" 2> /dev/null
1242- uci_remove ' network' " ${rt_name} _ipv6" 2> /dev/null
1241+ uci_remove ' network' ' rule ' " ${rt_name} _ipv4" 2> /dev/null
1242+ uci_remove ' network' ' rule6 ' " ${rt_name} _ipv6" 2> /dev/null
12431243
12441244 if [ -n " $netifd_strict_enforcement " && str_contains " $netifd_interface_local " " $iface " ; then
12451245 if [ -n " $netifd_interface_default " ; then
@@ -1275,7 +1275,7 @@ netifd() {
12751275 uci_set ' network' " ${rt_name} _ipv4" ' lookup' " ${rt_name} "
12761276 uci_set ' network' " ${rt_name} _ipv4" ' mark' " ${mark} "
12771277 uci_set ' network' " ${rt_name} _ipv4" ' mask' " ${fw_mask} "
1278- if [ -n " $ipv6_enabled " ; then
1278+ if [ -n " $ipv6_enabled " ]; then
12791279 uci_add ' network' ' rule6' " ${rt_name} _ipv6"
12801280 uci_set ' network' " ${rt_name} _ipv6" ' priority' " ${priority} "
12811281 uci_set ' network' " ${rt_name} _ipv6" ' lookup' " ${rt_name} "
@@ -1408,7 +1408,7 @@ dns_policy_routing() {
14081408 fi
14091409
14101410 if { is_ipv4 " $( str_first_word " $src_addr " ) " && [ -z " $dest_dns_ipv4 " ; } || \
1411- { is_ipv6 " $( str_first_word " $src_addr " ) " && [ -z " $dest_dns_ipv6 " ; }; then
1411+ { is_ipv6 " $( str_first_word " $src_addr " ) " && [ -z " $dest_dns_ipv6 " ; }; then
14121412 processPolicyError=' true'
14131413 json add error ' errorPolicyProcessMismatchFamily' " ${name} : '$src_addr ' '$dest_dns ':'$dest_dns_port '"
14141414 return 1
@@ -1531,14 +1531,14 @@ policy_routing() {
15311531 fi
15321532
15331533 # TODO: implement actual family mismatch check on lists
1534- # if is_family_mismatch "$src_addr" "$dest_addr"; then
1534+ # if is_family_mismatch "$src_addr" "$dest_addr"; then
15351535# processPolicyError='true'
15361536# json add error 'errorPolicyProcessMismatchFamily' "${name}: '$src_addr' '$dest_addr'"
15371537# return 1
15381538# fi
15391539
15401540 if [ -z " $proto " ; then
1541- if [ -n " ${src_port}${dest_port} " ; then
1541+ if [ -n " ${src_port}${dest_port} " ; then
15421542 proto=' tcp udp'
15431543 else
15441544 proto=' all'
@@ -1594,7 +1594,7 @@ policy_routing() {
15941594 fi
15951595 fi
15961596
1597- if [ -n " $dest_addr " ; then
1597+ if [ -n " $dest_addr " ; then
15981598 if [ " ${dest_addr: 0: 1} " = " !" ; then
15991599 negation=' !=' ; value=" ${dest_addr// \! } " ; nftset_suffix=' _neg' ;
16001600 else
@@ -1917,7 +1917,7 @@ interface_routing() {
19171917 }
19181918 try ip -4 rule replace fwmark " ${mark} /${fw_mask} " " $tid " " $priority " || ipv4_error=1
19191919 fi
1920- try nft add chain inet " $nftTable " " ${nftPrefix} _mark_${mark} " || ipv4_error=1
1920+ try nft add chain inet " $nftTable " " ${nftPrefix} _mark_${mark} " || ipv4_error=1
19211921 try nft add rule inet " $nftTable " " ${nftPrefix} _mark_${mark} ${nftRuleParams} meta mark set (meta mark & ${fw_maskXor} ) | ${mark} " || ipv4_error=1
19221922 try nft add rule inet " $nftTable " " ${nftPrefix} _mark_${mark} return" || ipv4_error=1
19231923 if [ -n " $ipv6_enabled " ; then
@@ -2085,7 +2085,7 @@ process_interface() {
20852085 return 0
20862086 fi
20872087
2088- if [ " $iface " = ' tor' ; then
2088+ if [ " $iface " = ' tor' ; then
20892089 case " $action " in
20902090 create|reload|reload_interface)
20912091 torDnsPort=" $( get_tor_dns_port) "
@@ -2320,7 +2320,7 @@ boot() {
23202320 rc_procd start_service ' on_boot' && service_started ' on_boot'
23212321}
23222322
2323- on_interface_reload () {
2323+ on_interface_reload () {
23242324 if [ ! -e " $packageLockFile " ; then
23252325 logger -t " $packageName " " Reload on interface change aborted: service is stopped."
23262326 return 0
@@ -2570,7 +2570,7 @@ stop_service() {
25702570 output_okn
25712571 else
25722572 output_failn
2573- fi
2573+ fi
25742574 output 1 ' Resetting interfaces '
25752575 config_load ' network'
25762576 config_foreach process_interface ' interface' ' destroy'
0 commit comments