[Openvpn-devel] [PATCH v2] Make assert_failed() print the failed condition

[Steffan Karger]

Easy change to make logging output more useful.

v2: don't print the failed condition if ENABLE_SMALL is defined.

Signed-off-by: Steffan Karger <stef...@karger.me>
---
 src/openvpn/error.c | 7 +++++--
 src/openvpn/error.h | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index 66f37f3..cfd5a41 100644
--- a/src/openvpn/error.c
+++ b/src/openvpn/error.c
@@ -394,9 +394,12 @@ dont_mute (unsigned int flags)
 }

 void
-assert_failed (const char *filename, int line)
+assert_failed (const char *filename, int line, const char *condition)
 {
-  msg (M_FATAL, "Assertion failed at %s:%d", filename, line);
+  if (condition)
+    msg (M_FATAL, "Assertion failed at %s:%d (%s)", filename, line, condition);
+  else
+    msg (M_FATAL, "Assertion failed at %s:%d", filename, line);
   _exit(1);
 }

diff --git a/src/openvpn/error.h b/src/openvpn/error.h
index 1dc0864..dd5ccf7 100644
--- a/src/openvpn/error.h
+++ b/src/openvpn/error.h
@@ -211,9 +211,14 @@ const char *msg_flags_string (const unsigned int flags, 
struct gc_arena *gc);
 FILE *msg_fp(const unsigned int flags);

 /* Fatal logic errors */
-#define ASSERT(x) do { if (!(x)) assert_failed(__FILE__, __LINE__); } while 
(false)
+#ifndef ENABLE_SMALL
+#define ASSERT(x) do { if (!(x)) assert_failed(__FILE__, __LINE__, #x); } 
while (false)
+#else
+#define ASSERT(x) do { if (!(x)) assert_failed(__FILE__, __LINE__, NULL); } 
while (false)
+#endif

-void assert_failed (const char *filename, int line) 
__attribute__((__noreturn__));
+void assert_failed (const char *filename, int line, const char *condition)
+  __attribute__((__noreturn__));

 #ifdef ENABLE_DEBUG
 void crash (void); /* force a segfault (debugging only) */
-- 
2.5.0