dbus: Add "excessive" to debug_strings

The "debug_strings" private array in dbus_new_handles.c has fallen out
of sync with wpa_debug.h. Add the new "excessive" level to the head of
the list, realigning everything.

Signed-off-by: Paul Stewart <pstew@google.com>

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 074a4a9ff2a621571ae9f002d5677e235c91c0e8..f816bef78dd9cd5c15d5703dec6a8a5a3ff5d023 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -38,7 +38,7 @@ extern int wpa_debug_show_keys;
 extern int wpa_debug_timestamp;
 
 static const char *debug_strings[] = {
-       "msgdump", "debug", "info", "warning", "error", NULL
+       "excessive", "msgdump", "debug", "info", "warning", "error", NULL
 };
 
 
@@ -741,8 +741,8 @@ DBusMessage * wpas_dbus_getter_debug_level(DBusMessage *message,
        int idx = wpa_debug_level;
        if (idx < 0)
                idx = 0;
-       if (idx > 4)
-               idx = 4;
+       if (idx > 5)
+               idx = 5;
        str = debug_strings[idx];
        return wpas_dbus_simple_property_getter(message, DBUS_TYPE_STRING,
                                                &str);

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 83550ef59bcdcafcad0ea15403dcc98fc06aa2a8..d8c2a2cce31a42909100f37c8fa099d107491b41 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1727,7 +1727,8 @@ int wpa_supplicant_set_debug_params(struct wpa_global *global, int debug_level,
        int old_level, old_timestamp, old_show_keys;
 
        /* check for allowed debuglevels */
-       if (debug_level != MSG_MSGDUMP &&
+       if (debug_level != MSG_EXCESSIVE &&
+           debug_level != MSG_MSGDUMP &&
            debug_level != MSG_DEBUG &&
            debug_level != MSG_INFO &&
            debug_level != MSG_WARNING &&