Skip to content

*cake.qos: support unlimited bandwidth #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
intelfx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

*cake.qos: support unlimited bandwidth #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ sqm_start_default() {

[ -z "$DEV" ] && DEV=$( get_ifb_for_if ${IFACE} )

if [ "${UPLINK}" -ne 0 ];
if [ "${UPLINK}" = "unlimited" ] || [ "${UPLINK}" -ne 0 ];
then
CUR_DIRECTION="egress"
fn_exists egress && egress || sqm_warn "sqm_start_default: ${SCRIPT} lacks an egress() function"
Expand All @@ -522,7 +522,7 @@ sqm_start_default() {
sqm_debug "sqm_start_default: egress shaping deactivated"
SILENT=1 $TC qdisc del dev ${IFACE} root
fi
if [ "${DOWNLINK}" -ne 0 ];
if [ "${DOWNLINK}" = "unlimited" ] || [ "${DOWNLINK}" -ne 0 ];
then
CUR_DIRECTION="ingress"
verify_qdisc ingress "ingress" || return 1
Expand Down
16 changes: 14 additions & 2 deletions src/layer_cake.qos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ QDISC=cake


egress() {
if [ "$UPLINK" = "unlimited" ]; then
EGRESS_BW="unlimited"
else
EGRESS_BW="bandwidth ${UPLINK}kbit"
fi

SILENT=1 $TC qdisc del dev $IFACE root
$TC qdisc add dev $IFACE root $( get_stab_string ) cake \
bandwidth ${UPLINK}kbit $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}
${EGRESS_BW} $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}

}

Expand All @@ -35,8 +41,14 @@ ingress() {
[ "$IGNORE_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS besteffort"
[ "$ZERO_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"

if [ "$DOWNLINK" = "unlimited" ]; then
INGRSS_BW="unlimited"
else
INGRESS_BW="bandwidth ${DOWNLINK}kbit"
fi

$TC qdisc add dev $DEV root $( get_stab_string ) cake \
bandwidth ${DOWNLINK}kbit $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}
${INGRESS_BW} $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}

$IP link set dev $DEV up

Expand Down
16 changes: 14 additions & 2 deletions src/piece_of_cake.qos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ EGRESS_CAKE_OPTS="${EGRESS_CAKE_OPTS} besteffort"

egress() {
sqm_debug "egress"
if [ "$UPLINK" = "unlimited" ]; then
EGRESS_BW="unlimited"
else
EGRESS_BW="bandwidth ${UPLINK}kbit"
fi

SILENT=1 $TC qdisc del dev $IFACE root
$TC qdisc add dev $IFACE root $( get_stab_string ) cake \
bandwidth ${UPLINK}kbit $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}
${EGRESS_BW} $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}
}


Expand All @@ -37,8 +43,14 @@ ingress() {

[ "$ZERO_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"

if [ "$DOWNLINK" = "unlimited" ]; then
INGRSS_BW="unlimited"
else
INGRESS_BW="bandwidth ${DOWNLINK}kbit"
fi

$TC qdisc add dev $DEV root $( get_stab_string ) cake \
bandwidth ${DOWNLINK}kbit $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}
${INGRESS_BW} $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}

$IP link set dev $DEV up

Expand Down