Added ESP log group for libipsec log messages.

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index 1f88761bec70385b708f77d88b0fda0b02d65412..ca77ee7dedfd9d489b3d17dc0de87ecd9849edde 100644 (file)
--- a/man/ipsec.conf.5.in
+++ b/man/ipsec.conf.5.in
@@ -1051,7 +1051,8 @@ A comma separated list containing type/level-pairs may
 be specified, e.g:
 .B dmn 3, ike 1, net -1.
 Acceptable values for types are
-.B dmn, mgr, ike, chd, job, cfg, knl, net, asn, enc, lib, tls, tnc, imc, imv, pts
+.B dmn, mgr, ike, chd, job, cfg, knl, net, asn, enc, lib, esp, tls,
+.B tnc, imc, imv, pts
 and the level is one of
 .B -1, 0, 1, 2, 3, 4
 (for silent, audit, control, controlmore, raw, private).  By default, the level

diff --git a/man/strongswan.conf.5.in b/man/strongswan.conf.5.in
index ee8f8a8dc6bd130c2a9806b7e4c4583345422d5d..4dd818b8ad853fc151750d919f88ef6f99d92480 100644 (file)
--- a/man/strongswan.conf.5.in
+++ b/man/strongswan.conf.5.in
@@ -920,6 +920,9 @@ Packet encoding/decoding encryption/decryption operations
 .B tls
 libtls library messages
 .TP
+.B esp
+libipsec library messages
+.TP
 .B lib
 libstrongwan library messages
 .TP

diff --git a/src/charon/charon.c b/src/charon/charon.c
index be4a9548ee8d3141a75a7a030b0d28a63d2f4546..bd36c72f455733c26867eac7d046f91a55ee0141 100644 (file)
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -387,7 +387,7 @@ static void usage(const char *msg)
                                        "         [--version]\n"
                                        "         [--use-syslog]\n"
                                        "         [--debug-<type> <level>]\n"
-                                       "           <type>:  log context type (dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|lib)\n"
+                                       "           <type>:  log context type (dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|esp|lib)\n"
                                        "           <level>: log verbosity (-1 = silent, 0 = audit, 1 = control,\n"
                                        "                                    2 = controlmore, 3 = raw, 4 = private)\n"
                                        "\n"
@@ -466,6 +466,7 @@ int main(int argc, char *argv[])
                        { "debug-imv", required_argument, &group, DBG_IMV },
                        { "debug-pts", required_argument, &group, DBG_PTS },
                        { "debug-tls", required_argument, &group, DBG_TLS },
+                       { "debug-esp", required_argument, &group, DBG_ESP },
                        { "debug-lib", required_argument, &group, DBG_LIB },
                        { 0,0,0,0 }
                };

diff --git a/src/libstrongswan/debug.c b/src/libstrongswan/debug.c
index 985ce6a2a2feaa26b17e11a3178ec112501ab4aa..e8c9e6b98e4bf84ced79a44a3240c9345bc7a066 100644 (file)
--- a/src/libstrongswan/debug.c
+++ b/src/libstrongswan/debug.c
@@ -34,6 +34,7 @@ ENUM(debug_names, DBG_DMN, DBG_LIB,
        "PTS",
        "TLS",
        "APP",
+       "ESP",
        "LIB",
 );
 
@@ -54,6 +55,7 @@ ENUM(debug_lower_names, DBG_DMN, DBG_LIB,
        "pts",
        "tls",
        "app",
+       "esp",
        "lib",
 );
 

diff --git a/src/libstrongswan/debug.h b/src/libstrongswan/debug.h
index 65e55a6397081f7d3d1126c861c31c37e0efc47c..ff4b4a1e997bc7a1931fd380b90e076fd2e0ddab 100644 (file)
--- a/src/libstrongswan/debug.h
+++ b/src/libstrongswan/debug.h
@@ -64,6 +64,8 @@ enum debug_t {
        DBG_TLS,
        /** applications other than daemons */
        DBG_APP,
+       /** libipsec */
+       DBG_ESP,
        /** libstrongswan */
        DBG_LIB,
        /** number of groups */

diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index 5dc7f0436318b35acfa5c0b6c8fb5977e1957413..03890b5173a6641a2017ac574967a3c63ca3c802 100644 (file)
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -407,7 +407,7 @@ static void exit_usage(char *error)
        printf("    where: START and optional END define the clients source IP\n");
        printf("  Set loglevel for a logging type:\n");
        printf("    stroke loglevel TYPE LEVEL\n");
-       printf("    where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|lib\n");
+       printf("    where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|esp|lib\n");
        printf("           LEVEL is -1|0|1|2|3|4\n");
        printf("  Show connection status:\n");
        printf("    stroke status\n");