diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2018-04-12 10:27:00 +0200 |
|---|---|---|
| committer | Florian Eckert <fe@dev.tdt.de> | 2018-04-12 10:27:02 +0200 |
| commit | 6f96e30829e481ecfb47fc0942801f206439d194 (patch) | |
| tree | 2868b72b4d51f47959cc6760f1f47c4d72b7595c | |
| parent | b570344ee5cb4072a22e7d468ae0d64e2a516c12 (diff) | |
mwan3: in ubus rpcd script fix shell local issue
To fix the shell local issue in the ubus mwan3 rpcd shell script, move
the switch case statment into a function.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
| -rwxr-xr-x | net/mwan3/files/usr/libexec/rpcd/mwan3 | 113 |
1 files changed, 59 insertions, 54 deletions
diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3 index a772e133e..c30b6a1b9 100755 --- a/net/mwan3/files/usr/libexec/rpcd/mwan3 +++ b/net/mwan3/files/usr/libexec/rpcd/mwan3 @@ -74,60 +74,65 @@ get_mwan3_status() { fi } -case "$1" in - list) - json_init - json_add_object "status" - json_add_string "section" "x" - json_add_string "interface" "x" - json_close_object - json_dump - ;; - call) - case "$2" in - status) - local section iface - read input; - json_load "$input" - json_get_var section section - json_get_var iface interface - - config_load mwan3 +main () { + + case "$1" in + list) json_init - case "$section" in - interfaces) - json_add_object interfaces - config_foreach get_mwan3_status interface "${iface}" - json_close_object - ;; - connected) - json_add_object connected - json_add_array ipv4 - report_connected_v4 - json_close_array - json_add_array ipv6 - report_connected_v6 - json_close_array - json_close_object - ;; - *) - # interfaces - json_add_object interfaces - config_foreach get_mwan3_status interface - json_close_object - # connected - json_add_object connected - json_add_array ipv4 - report_connected_v4 - json_close_array - json_add_array ipv6 - report_connected_v6 - json_close_array - json_close_object - ;; - esac + json_add_object "status" + json_add_string "section" "x" + json_add_string "interface" "x" + json_close_object json_dump ;; - esac - ;; -esac + call) + case "$2" in + status) + local section iface + read input; + json_load "$input" + json_get_var section section + json_get_var iface interface + + config_load mwan3 + json_init + case "$section" in + interfaces) + json_add_object interfaces + config_foreach get_mwan3_status interface "${iface}" + json_close_object + ;; + connected) + json_add_object connected + json_add_array ipv4 + report_connected_v4 + json_close_array + json_add_array ipv6 + report_connected_v6 + json_close_array + json_close_object + ;; + *) + # interfaces + json_add_object interfaces + config_foreach get_mwan3_status interface + json_close_object + # connected + json_add_object connected + json_add_array ipv4 + report_connected_v4 + json_close_array + json_add_array ipv6 + report_connected_v6 + json_close_array + json_close_object + ;; + esac + json_dump + ;; + esac + ;; + esac +} + +main "$@" |