Fix debug trace

bgaifullin · bgaifullin · commit 74331b112416 · 2017-07-21T01:21:00.000+01:00
diff --git a/src/exception.c b/src/exception.c
@@ -16,13 +16,17 @@
 
 #include <pythread.h>
 
+#include <stdio.h>
+
 // default error class
 PyObject* PyXmlSec_Error;
 PyObject* PyXmlSec_InternalError;
 PyObject* PyXmlSec_VerificationError;
 
 static int PyXmlSec_LastErrorKey = 0;
 
+static int PyXmlSec_PrintErrorMessage = 0;
+
 typedef struct {
     const xmlChar* file;
     const xmlChar* func;
@@ -83,8 +87,27 @@ static void PyXmlSec_ErrorCallback(const char* file, int line, const char* func,
     // TODO do not allocate error object each time.
     PyXmlSec_ErrorHolderFree(PyXmlSec_ExchangeLastError(PyXmlSec_ErrorHolderCreate(file, line, func, object, subject, reason, msg)));
 
-    // also call default callback
-    xmlSecErrorsDefaultCallback(file, line, func, object, subject, reason, msg);
+    if (PyXmlSec_PrintErrorMessage) {
+        const char* error_msg = NULL;
+        xmlSecSize i;
+        for (i = 0; (i < XMLSEC_ERRORS_MAX_NUMBER) && (xmlSecErrorsGetMsg(i) != NULL); ++i) {
+            if(xmlSecErrorsGetCode(i) == reason) {
+                error_msg = xmlSecErrorsGetMsg(i);
+                break;
+            }
+        }
+
+        fprintf(stderr,
+            "func=%s:file=%s:line=%d:obj=%s:subj=%s:error=%d:%s:%s\n",
+            (func != NULL) ? func : "unknown",
+            (file != NULL) ? file : "unknown",
+            line,
+            (object != NULL) ? object : "unknown",
+            (subject != NULL) ? subject : "unknown",
+            reason,
+            (error_msg != NULL) ? error_msg : "",
+            (msg != NULL) ? msg : "");
+    }
 }
 
 // pops the last error which was occurred in current thread
@@ -133,6 +156,10 @@ void PyXmlSec_ClearError(void) {
     PyXmlSec_ErrorHolderFree(PyXmlSec_ExchangeLastError(NULL));
 }
 
+void PyXmlSecEnableDebugTrace(int v) {
+    PyXmlSec_PrintErrorMessage = v;
+}
+
 // initializes errors module
 int PyXmlSec_ExceptionsModule_Init(PyObject* package) {
     PyXmlSec_Error = NULL;
diff --git a/src/exception.h b/src/exception.h
@@ -22,4 +22,6 @@ void PyXmlSec_SetLastError2(PyObject* type, const char* msg);
 
 void PyXmlSec_ClearError(void);
 
+void PyXmlSecEnableDebugTrace(int);
+
 #endif //__PYXMLSEC_EXCEPTIONS_H__
diff --git a/src/main.c b/src/main.c
@@ -106,7 +106,7 @@ static PyObject* PyXmlSec_PyEnableDebugOutput(PyObject *self, PyObject* args, Py
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:enable_debug_trace", kwlist, &enabled)) {
         return NULL;
     }
-    xmlSecErrorsDefaultCallbackEnableOutput(PyObject_IsTrue(enabled));
+    PyXmlSecEnableDebugTrace(PyObject_IsTrue(enabled));
     Py_RETURN_NONE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ static PyObject* PyXmlSec_PyEnableDebugOutput(PyObject self, PyObject args, Py`
`106`	`106`	`if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|O:enable_debug_trace", kwlist, &enabled)) {`
`107`	`107`	`return NULL;`
`108`	`108`	`}`
`109`		`- xmlSecErrorsDefaultCallbackEnableOutput(PyObject_IsTrue(enabled));`
	`109`	`+ PyXmlSecEnableDebugTrace(PyObject_IsTrue(enabled));`
`110`	`110`	`Py_RETURN_NONE;`
`111`	`111`	`}`
`112`	`112`