[openwrt/openwrt] ncm: sort config variables a little and fix minor bugs

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 12 03:17:23 PST 2024


blogic pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/650410fca4596328d0ec75cefd7e1b202e896a48

commit 650410fca4596328d0ec75cefd7e1b202e896a48
Author: Leon M. Busch-George <leon at georgemail.eu>
AuthorDate: Sat Oct 19 11:52:51 2024 +0200

    ncm: sort config variables a little and fix minor bugs
    
    Group 'local' declarations and 'json_get_vars', sort alphabetically within groups, and split off more generic parameters.
    
    - delegate and sourcefilter were not declared as local variables
    
    Signed-off-by: Leon M. Busch-George <leon at georgemail.eu>
---
 package/network/utils/comgt/files/ncm.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh
index e9412b28fe..761dafb24e 100644
--- a/package/network/utils/comgt/files/ncm.sh
+++ b/package/network/utils/comgt/files/ncm.sh
@@ -28,12 +28,13 @@ proto_ncm_init_config() {
 proto_ncm_setup() {
 	local interface="$1"
 
-	local manufacturer initialize setmode connect finalize devname devpath ifpath
+	local connect context_type devname devpath finalize ifpath initialize manufacturer setmode
 
-	local device ifname  apn auth username password pincode delay mode pdptype profile $PROTO_DEFAULT_OPTIONS
-	json_get_vars device ifname apn auth username password pincode delay mode pdptype sourcefilter delegate profile $PROTO_DEFAULT_OPTIONS
+	local delegate sourcefilter $PROTO_DEFAULT_OPTIONS
+	json_get_vars delegate sourcefilter $PROTO_DEFAULT_OPTIONS
 
-	local context_type
+	local apn auth delay device ifname mode password pdptype pincode profile username
+	json_get_vars apn auth delay device ifname mode password pdptype pincode profile username
 
 	[ "$metric" = "" ] && metric="0"
 




More information about the lede-commits mailing list