4 files changed, 37 insertions, 6 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 26cb614..1076c12 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,20 +1,21 @@
 nobase_include_HEADERS = \
         opkele/acconfig.h \
         opkele/opkele-config.h \
         opkele/types.h \
         opkele/association.h \
         opkele/exception.h \
         opkele/server.h \
         opkele/consumer.h \
         opkele/extension.h \
         opkele/sreg.h \
         opkele/extension_chain.h \
         opkele/xconsumer.h \
         opkele/xserver.h \
         opkele/discovery.h \
         opkele/uris.h \
         opkele/tr1-mem.h
 EXTRA_DIST = \
         opkele/data.h \
         opkele/curl.h opkele/expat.h \
-        opkele/util.h
+        opkele/util.h \
+        opkele/debug.h
diff --git a/include/opkele/debug.h b/include/opkele/debug.h
new file mode 100644
index 0000000..a02f8d4
--- a/dev/null
+++ b/include/opkele/debug.h
@@ -0,0 +1,17 @@
+#ifndef __OPKELE_DEBUG_H
+#define __OPKELE_DEBUG_H
+
+#ifdef NDEBUG
+
+        #define D_(x)   ((void)0)
+        #define DOUT_(x)((void)0)
+
+#else /* NDEBUG */
+
+        #define D_(x)   x
+#include <iostream>
+        #define DOUT_(x)std::clog << x << std::endl
+
+#endif /* NDEBUG */
+
+#endif /* __OPKELE_DEBUG_H */
diff --git a/include/opkele/exception.h b/include/opkele/exception.h
index 36bd07a..64f189e 100644
--- a/include/opkele/exception.h
+++ b/include/opkele/exception.h
@@ -1,262 +1,259 @@
 #ifndef __OPKELE_EXCEPTION_H
 #define __OPKELE_EXCEPTION_H
 
 /**
  * @file
  * @brief opkele exceptions
  */
 
 #include <curl/curl.h>
 
 #include <opkele/opkele-config.h>
 #ifdef OPKELE_HAVE_KONFORKA
 # include <konforka/exception.h>
 /**
  * the exception parameters declaration
  */
 # define OPKELE_E_PARS const string& fi,const string&fu,int l,const string& w
 /**
  * the exception parameters list to pass to constructor
  */
 # define OPKELE_E_CONS_ fi,fu,l,
 /**
  * the exception codepoint specification
  */
 # define OPKELE_CP_ CODEPOINT,
 /**
  * open function-try-block
  */
 # define OPKELE_FUNC_TRY try
 /**
  * the simple rethrow of konforka-based exception
  */
 # define OPKELE_RETHROW catch(konforka::exception& e) { e.see(CODEPOINT); throw; }
 #else /* OPKELE_HAVE_KONFORKA */
 # include <exception>
 # include <string>
 /**
  * the exception parameter declaration
  */
 # define OPKELE_E_PARS const string& w
 /**
  * the dummy prefix for exception parameters list to prepend in the absence of
  * konforka library
  */
 # define OPKELE_E_CONS_ 
 /**
  * the dummy placeholder for konforka exception codepoint specification
  */
 # define OPKELE_CP_
 /**
  * the dummy define for the opening function-try-block
  */
 # define OPKELE_FUNC_TRY
 /**
  * the dummy define for the konforka-based rethrow of exception
  */
 # define OPKELE_RETHROW
 #endif /* OPKELE_HAVE_KONFORKA */
 /**
  * the exception parameters list to pass to constructor
  */
 # define OPKELE_E_CONS OPKELE_E_CONS_ w
 
 namespace opkele {
     using std::string;
 
     /**
      * the base opkele exception class
      */
     class exception : public
 #   ifdef OPKELE_HAVE_KONFORKA
                       konforka::exception
 #   else
                       std::exception
 #   endif
     {
         public:
 #           ifdef OPKELE_HAVE_KONFORKA
             explicit
-                exception(const string& fi,const string& fu,int l,const string& w)
-                    : konforka::exception(fi,fu,l,w) { }
+                exception(const string& fi,const string& fu,int l,const string& w);
 #           else /* OPKELE_HAVE_KONFORKA */
             string _what;
-            explicit
-                exception(const string& w)
-                    : _what(w) { } 
+            explicit exception(const string& w);
             virtual ~exception() throw();
             virtual const char * what() const throw();
 #           endif /* OPKELE_HAVE_KONFORKA */
     };
 
     /**
      * thrown in case of failed conversion
      */
     class failed_conversion : public exception {
         public:
             failed_conversion(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
     /**
      * thrown in case of failed lookup (either parameter or persistent store)
      */
     class failed_lookup : public exception {
         public:
             failed_lookup(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
     /**
      * thrown in case of bad input (either local or network)
      */
     class bad_input : public exception {
         public:
             bad_input(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * thrown on failed assertion
      */
     class failed_assertion : public exception {
         public:
             failed_assertion(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * thrown if the handle being retrieved is invalid
      */
     class invalid_handle : public exception {
         public:
             invalid_handle(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
     /**
      * thrown if the handle passed to check_authentication request is not
      * stateless
      */
     class stateful_handle : public exception {
         public:
             stateful_handle(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * thrown if check_authentication request fails
      */
     class failed_check_authentication : public exception {
         public:
             failed_check_authentication(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * thrown if the id_res request result is negative
      */
     class id_res_failed : public exception {
         public:
             id_res_failed(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
     /**
      * thrown if the user_setup_url is provided with negative response
      */
     class id_res_setup : public id_res_failed {
         public:
             string setup_url;
             id_res_setup(OPKELE_E_PARS,const string& su)
                 : id_res_failed(OPKELE_E_CONS), setup_url(su) { }
             ~id_res_setup() throw() { }
     };
     /**
      * thrown in case of signature mismatch
      */
     class id_res_mismatch : public id_res_failed {
         public:
             id_res_mismatch(OPKELE_E_PARS)
                 : id_res_failed(OPKELE_E_CONS) { }
     };
 
     /**
      * thrown if the association has expired before it could've been verified.
      */
     class id_res_expired_on_delivery : public id_res_failed {
         public:
             id_res_expired_on_delivery(OPKELE_E_PARS)
                 : id_res_failed(OPKELE_E_CONS) { }
     };
 
     /**
      * openssl malfunction occured
      */
     class exception_openssl : public exception {
         public:
             unsigned long _error;
             string _ssl_string;
             exception_openssl(OPKELE_E_PARS);
             ~exception_openssl() throw() { }
     };
 
     /**
      * network operation related error occured
      */
     class exception_network : public exception {
         public:
             exception_network(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * network operation related error occured, specifically, related to
      * libcurl
      */
     class exception_curl : public exception_network {
         public:
             CURLcode _error;
             string _curl_string;
             exception_curl(OPKELE_E_PARS);
             exception_curl(OPKELE_E_PARS,CURLcode e);
             ~exception_curl() throw() { }
     };
 
     /**
      * exception thrown in case of failed discovery
      */
     class failed_discovery : public exception {
         public:
             failed_discovery(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * unsuccessfull xri resolution
      */
     class failed_xri_resolution : public failed_discovery {
         public:
             long _code;
             failed_xri_resolution(OPKELE_E_PARS,long _c=-1)
                 : failed_discovery(OPKELE_E_CONS), _code(_c) { }
     };
 
     /**
      * not implemented (think pure virtual) member function executed, signfies
      * programmer error
      */
     class not_implemented : public exception {
         public:
             not_implemented(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
     /**
      * internal error, indicates internal libopkele problem
      */
     class internal_error : public exception {
         public:
             internal_error(OPKELE_E_PARS)
                 : exception(OPKELE_E_CONS) { }
     };
 
 }
 
 #endif /* __OPKELE_EXCEPTION_H */
diff --git a/lib/exception.cc b/lib/exception.cc
index 510982e..0b775f7 100644
--- a/lib/exception.cc
+++ b/lib/exception.cc
@@ -1,29 +1,45 @@
 #include <openssl/err.h>
 #include <curl/curl.h>
 #include <opkele/exception.h>
+#include <opkele/debug.h>
 
 namespace opkele {
 
 #   ifndef OPKELE_HAVE_KONFORKA
 
+    exception::exception(const string& w)
+        : _what(w)
+    {
+        DOUT_("throwing exception(\""<<w<<"\")");
+    }
+
     exception::~exception() throw() {
     }
     const char *exception::what() const throw() {
         return _what.c_str();
     }
+
+#   else
     
+    exception::exception(const string& fi,const string& fu,int l,const string& w)
+        : konforka::exception(fi,fu,l,w)
+    {
+        DOUT_("throwing exception(\""<<w<<"\")");
+        DOUT_(" from "<<fi<<':'<<fu<<':'<<l);
+    }
+
 #   endif
 
     exception_openssl::exception_openssl(OPKELE_E_PARS)
         : exception(OPKELE_E_CONS_ w+" ["+ERR_error_string(ERR_peek_last_error(),0)+']'),
         _error(ERR_peek_last_error()),
         _ssl_string(ERR_error_string(_error,0)) {
         }
 
     exception_curl::exception_curl(OPKELE_E_PARS)
         : exception_network(OPKELE_E_CONS), _error(CURLE_OK) { }
     exception_curl::exception_curl(OPKELE_E_PARS,CURLcode e)
         : exception_network(OPKELE_E_CONS_ w+" ["+curl_easy_strerror(e)+']'),
         _error(e), _curl_string(curl_easy_strerror(e)) { }
 
 }