him411/nss-packages-breeze303
1
0
Fork 0
mirror of https://github.com/breeze303/nss-packages.git synced 2025-12-16 16:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qca-nss-ecm: parse and load mod depends

Browse Source 
Since many of ECM's module depends are dynamic and chosen at build time
`kmodloader` seems to have trouble properly loading its dependencies.

Attempt to parse ecm's module depends and load them prior to installing
the module.

This commit also replaces error prone `uci get` command with `config_get`,
in case certain options are missing from `/etc/config/ecm`
This commit is contained in:
Qosmio 2024-04-01 06:35:42 -04:00
parent c7ed1c790c
commit c39093e475
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qca-nss-ecm/files/qca-nss-ecm.init
View File

@ -68,6 +68,7 @@ load_ecm() {
[ -d /sys/module/ecm ] || { [ -d /sys/module/ecm ] || {
local get_front_end_mode local get_front_end_mode
get_front_end_mode="$(get_front_end_mode)" get_front_end_mode="$(get_front_end_mode)"
modinfo ecm | awk '/depends/{gsub(",","\n",$NF);print $NF}' | xargs -r -n 1 modprobe
insmod ecm front_end_selection="$get_front_end_mode" insmod ecm front_end_selection="$get_front_end_mode"
echo 1 > /sys/kernel/debug/ecm/ecm_classifier_default/accel_delay_pkts echo 1 > /sys/kernel/debug/ecm/ecm_classifier_default/accel_delay_pkts
} }
@ -116,6 +117,12 @@ unload_ecm() {
fi fi
} }
parse_opt() {
local cfg="$1"
config_get_bool enable_bridge_filtering "$cfg" enable_bridge_filtering 0
}
start() { start() {
load_ecm load_ecm
@ -123,9 +130,10 @@ start() {
[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=1 [ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=1
# If bridge filtering is enabled, apply and persist the sysctl flags # If bridge filtering is enabled, apply and persist the sysctl flags
local bridge_filtering_enabled config_load ecm
bridge_filtering_enabled="$(uci get ecm.@general[0].enable_bridge_filtering)" config_foreach parse_opt general
if [ "$bridge_filtering_enabled" -eq 1 ]; then
if [ "$enable_bridge_filtering" -eq 1 ]; then
echo "Bridge filtering is enabled in the ECM config, this will cause issues with NAT loopback!" echo "Bridge filtering is enabled in the ECM config, this will cause issues with NAT loopback!"
enable_bridge_filtering enable_bridge_filtering
else else