wireless: call an initial cleanup function

[project/netifd.git] / scripts / netifd-wireless.sh

diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index a67e350..7ae3695 100644 (file)
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -15,11 +15,13 @@ add_driver() {
 
 wireless_setup_vif_failed() {
        local error="$1"
+       echo "Interface $_w_iface setup failed: $error"
 }
 
 wireless_setup_failed() {
        local error="$1"
 
+       echo "Device setup failed: $error"
        wireless_set_retry 0
 }
 
@@ -156,9 +158,13 @@ _wireless_set_data() {
 
 _wireless_add_process() {
        _wdev_notify_init $CMD_PROCESS_ADD
+       local exe="$2"
+       [ -L "$exe" ] && exe="$(readlink -f "$exe")"
        json_add_int pid "$1"
-       json_add_string exe "$2"
+       json_add_string exe "$exe"
        [ -n "$3" ] && json_add_boolean required 1
+       exe2="$(readlink -f /proc/$pid/exe)"
+       [ "$exe" = "$exe2" ] && echo "WARNING (wireless_add_process): executable path $exe does not match process $1 path ($exe2)"
        _wdev_notify
 }
 
@@ -291,6 +297,8 @@ init_wireless_driver() {
        case "$cmd" in
                dump)
                        add_driver() {
+                               eval "drv_$1_cleanup"
+
                                json_init
                                json_add_string name "$1"