Skip to content

Commit f7217ce

Browse files
yagoplxactions-user
authored andcommitted
[auto] ci: run beautysh
1 parent 3ff09e0 commit f7217ce

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

routertools

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ sqm_disable(){
11281128

11291129
for i in $ifaces; do
11301130
tc qdisc del dev $i root 2>/dev/null
1131-
tc qdisc del dev $i handle ffff: ingress 2>/dev/null
1131+
tc qdisc del dev $i handle ffff: ingress 2>/dev/null
11321132
# FQ-CoDel is a safe alternative
11331133
# if this fails system default (probably none) will stay
11341134
tc qdisc add dev $i root fq_codel 2>/dev/null
@@ -1197,7 +1197,7 @@ sqm_enable(){
11971197

11981198
# Apply qdisc in categories
11991199
for i in $ppp_ifaces; do
1200-
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1200+
ifnq echo "Applying queue discipline to $i (ethernet interface)"
12011201

12021202
restore_extra_arg=${extra_arg}
12031203

@@ -1218,7 +1218,7 @@ sqm_enable(){
12181218
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}$extra_arg
12191219
ifnq echo "Applying queue discipline to $i (ppp interface)"
12201220
fi
1221-
1221+
12221222
ip link add name ifb$i type ifb 2>/dev/null
12231223
tc qdisc del dev $i ingress 2>/dev/null
12241224
tc qdisc add dev $i handle ffff: ingress 2>/dev/null
@@ -1230,11 +1230,11 @@ sqm_enable(){
12301230
overhead=""
12311231
fi
12321232

1233-
if [[ "$sqm_wash_markings" == "true" ]]; then
1234-
wash="wash"
1235-
else
1236-
wash=""
1237-
fi
1233+
if [[ "$sqm_wash_markings" == "true" ]]; then
1234+
wash="wash"
1235+
else
1236+
wash=""
1237+
fi
12381238

12391239
if [[ "$sqm_inet_download" != "" ]]; then
12401240
tc qdisc add dev ifb$i root cake ${diffserv}nat $wash bandwidth "$sqm_inet_download"mbit ${overhead}split-gso $extra_arg
@@ -1263,52 +1263,52 @@ sqm_enable(){
12631263

12641264
if ! chk_qdisc $i ; then
12651265

1266-
if [[ "$sqm_enable_ifb_on_ethernet" == "true" ]]; then
1266+
if [[ "$sqm_enable_ifb_on_ethernet" == "true" ]]; then
12671267

1268-
restore_extra_arg=${extra_arg}
1268+
restore_extra_arg=${extra_arg}
12691269

1270-
ifb_check=$(tc qdisc | grep "ingress" | grep "$i");
1270+
ifb_check=$(tc qdisc | grep "ingress" | grep "$i");
12711271

1272-
if [[ "$ifb_check" = "" ]]; then
1272+
if [[ "$ifb_check" = "" ]]; then
12731273

1274-
tc qdisc del dev $i root 2>/dev/null
1274+
tc qdisc del dev $i root 2>/dev/null
12751275

1276-
if [[ "$sqm_inet_upload" != "" ]]; then
1277-
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}bandwidth "$sqm_inet_upload"mbit $extra_arg
1278-
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1279-
else
1280-
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}$extra_arg
1281-
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1282-
fi
1283-
1284-
ip link add name ifb$i type ifb 2>/dev/null
1285-
tc qdisc del dev $i ingress 2>/dev/null
1286-
tc qdisc add dev $i handle ffff: ingress 2>/dev/null
1287-
tc qdisc del dev ifb$i root 2>/dev/null
1276+
if [[ "$sqm_inet_upload" != "" ]]; then
1277+
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}bandwidth "$sqm_inet_upload"mbit $extra_arg
1278+
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1279+
else
1280+
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}$extra_arg
1281+
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1282+
fi
12881283

1289-
if [[ "$sqm_wash_markings" == "true" ]]; then
1290-
wash="wash"
1291-
else
1292-
wash=""
1293-
fi
1284+
ip link add name ifb$i type ifb 2>/dev/null
1285+
tc qdisc del dev $i ingress 2>/dev/null
1286+
tc qdisc add dev $i handle ffff: ingress 2>/dev/null
1287+
tc qdisc del dev ifb$i root 2>/dev/null
12941288

1295-
if [[ "$sqm_inet_download" != "" ]]; then
1296-
tc qdisc add dev ifb$i root cake ${diffserv}nat $wash bandwidth "$sqm_inet_download"mbit ${overhead}split-gso $extra_arg
1297-
ifnq echo "Applying queue discipline to ifb$i (ifb interface)"
1298-
else
1299-
tc qdisc add dev ifb$i root cake ${diffserv}nat $wash ${overhead}split-gso $extra_arg
1300-
ifnq echo "Applying queue discipline to ifb$i (ifb interface)"
1301-
fi
1289+
if [[ "$sqm_wash_markings" == "true" ]]; then
1290+
wash="wash"
1291+
else
1292+
wash=""
1293+
fi
13021294

1303-
ip link set ifb$i up
1304-
tc filter add dev $i parent ffff: protocol all prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$i
1295+
if [[ "$sqm_inet_download" != "" ]]; then
1296+
tc qdisc add dev ifb$i root cake ${diffserv}nat $wash bandwidth "$sqm_inet_download"mbit ${overhead}split-gso $extra_arg
1297+
ifnq echo "Applying queue discipline to ifb$i (ifb interface)"
1298+
else
1299+
tc qdisc add dev ifb$i root cake ${diffserv}nat $wash ${overhead}split-gso $extra_arg
1300+
ifnq echo "Applying queue discipline to ifb$i (ifb interface)"
1301+
fi
13051302

1306-
fi
1303+
ip link set ifb$i up
1304+
tc filter add dev $i parent ffff: protocol all prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$i
1305+
1306+
fi
1307+
1308+
extra_arg=${restore_extra_arg}
13071309

1308-
extra_arg=${restore_extra_arg}
1309-
13101310
else
1311-
ifnq echo "Applying queue discipline to $i (ethernet interface)"
1311+
ifnq echo "Applying queue discipline to $i (ethernet interface)"
13121312
tc qdisc del dev $i root 2>/dev/null
13131313
tc qdisc add dev $i root cake ${diffserv}nat ${overhead}split-gso $extra_arg
13141314

@@ -1416,9 +1416,9 @@ sqm_enable(){
14161416
fi
14171417
fi
14181418
else
1419-
if [[ $(sysctl net.ipv4.tcp_congestion_control | grep -i bbr | wc -l) -gt 0 ]]; then
1420-
sysctl net.ipv4.tcp_congestion_control=cubic
1421-
fi
1419+
if [[ $(sysctl net.ipv4.tcp_congestion_control | grep -i bbr | wc -l) -gt 0 ]]; then
1420+
sysctl net.ipv4.tcp_congestion_control=cubic
1421+
fi
14221422
fi
14231423

14241424

@@ -1620,26 +1620,26 @@ ap_start(){
16201620
ifv echo "storing hostapd pid in /dev/shm/hostapd_pid_$i"
16211621
ifv echo "hostapd pid for $i -> $hostapd_pid"
16221622

1623-
if [[ "$hostapd_wait_for_secs" == "auto" ]]; then
1624-
# timeouts in a minute
1625-
half_seconds=0
1626-
1627-
while [[ $half_seconds -lt 120 ]]; do
1628-
1629-
check_done=$(cat /var/log/hostapd_$i.log | grep -c "AP-ENABLED")
1630-
1631-
if [[ $check_done -gt 0 ]]; then
1632-
echo "hostapd is ready, waited $((half_seconds / 2)) seconds."
1633-
break
1634-
fi
1635-
1636-
sleep 0.5
1637-
half_seconds=$((half_seconds + 1))
1638-
done
1639-
1640-
else
1641-
echo "Waiting $hostapd_wait_for_secs seconds for hostapd to be ready (noauto)."
1642-
sleep $hostapd_wait_for_secs
1623+
if [[ "$hostapd_wait_for_secs" == "auto" ]]; then
1624+
# timeouts in a minute
1625+
half_seconds=0
1626+
1627+
while [[ $half_seconds -lt 120 ]]; do
1628+
1629+
check_done=$(cat /var/log/hostapd_$i.log | grep -c "AP-ENABLED")
1630+
1631+
if [[ $check_done -gt 0 ]]; then
1632+
echo "hostapd is ready, waited $((half_seconds / 2)) seconds."
1633+
break
1634+
fi
1635+
1636+
sleep 0.5
1637+
half_seconds=$((half_seconds + 1))
1638+
done
1639+
1640+
else
1641+
echo "Waiting $hostapd_wait_for_secs seconds for hostapd to be ready (noauto)."
1642+
sleep $hostapd_wait_for_secs
16431643
fi
16441644

16451645
setup_ap_networking $i || error "An error occourred trying to set up AP networking."

0 commit comments

Comments
 (0)