diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-02-05 15:41:39 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-02-05 15:41:39 +0100 |
| commit | 10c5981d3bbba891cd1786eacc7d11df18825f9e (patch) | |
| tree | 6b64dbd2a50d3a0e0bbb63ba53010f478a38a273 /src | |
| parent | e8140531fce7c71c7d91cbcb6e6ecaa634b7f3e3 (diff) | |
| download | strongswan-10c5981d3bbba891cd1786eacc7d11df18825f9e.tar.bz2 strongswan-10c5981d3bbba891cd1786eacc7d11df18825f9e.tar.xz | |
utils: Add enum name for pseudo log group 'any'
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_socket.c | 13 | ||||
| -rw-r--r-- | src/libstrongswan/utils/debug.c | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c index 29563e32f..ee32dbca2 100644 --- a/src/libcharon/plugins/stroke/stroke_socket.c +++ b/src/libcharon/plugins/stroke/stroke_socket.c @@ -590,17 +590,10 @@ static void stroke_loglevel(private_stroke_socket_t *this, fprintf(out, "command not allowed!\n"); return; } - if (strcaseeq(msg->loglevel.type, "any")) + if (!enum_from_name(debug_names, msg->loglevel.type, &group)) { - group = DBG_ANY; - } - else - { - if (!enum_from_name(debug_names, msg->loglevel.type, &group)) - { - fprintf(out, "unknown type '%s'!\n", msg->loglevel.type); - return; - } + fprintf(out, "unknown type '%s'!\n", msg->loglevel.type); + return; } charon->set_level(charon, group, msg->loglevel.level); } diff --git a/src/libstrongswan/utils/debug.c b/src/libstrongswan/utils/debug.c index e8c9e6b98..8a80b81a2 100644 --- a/src/libstrongswan/utils/debug.c +++ b/src/libstrongswan/utils/debug.c @@ -17,7 +17,7 @@ #include "debug.h" -ENUM(debug_names, DBG_DMN, DBG_LIB, +ENUM(debug_names, DBG_DMN, DBG_ANY, "DMN", "MGR", "IKE", @@ -36,9 +36,10 @@ ENUM(debug_names, DBG_DMN, DBG_LIB, "APP", "ESP", "LIB", + "ANY", ); -ENUM(debug_lower_names, DBG_DMN, DBG_LIB, +ENUM(debug_lower_names, DBG_DMN, DBG_ANY, "dmn", "mgr", "ike", @@ -57,6 +58,7 @@ ENUM(debug_lower_names, DBG_DMN, DBG_LIB, "app", "esp", "lib", + "any", ); /** |