From 56d07af3bed3a104a6c57a779e84fb41c1b143e4 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 28 Mar 2012 15:41:31 +0200
Subject: [PATCH] Added ESP log group for libipsec log messages.

---
 man/ipsec.conf.5.in       | 3 ++-
 man/strongswan.conf.5.in  | 3 +++
 src/charon/charon.c       | 3 ++-
 src/libstrongswan/debug.c | 2 ++
 src/libstrongswan/debug.h | 2 ++
 src/stroke/stroke.c       | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index 1f88761be..ca77ee7de 100644
--- 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 ee8f8a8dc..4dd818b8a 100644
--- 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 be4a9548e..bd36c72f4 100644
--- 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 985ce6a2a..e8c9e6b98 100644
--- 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 65e55a639..ff4b4a1e9 100644
--- 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 5dc7f0436..03890b517 100644
--- 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");