Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / other / smux / handlers.cpp

diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp
index 5f25a82f90dd30ae0762ddeeb84c9009e4e39a23..01878da620a052d877e5dc1669efccf3e31944ee 100644 (file)
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -10,24 +10,40 @@
 #include "utils.h"
 #include "smux.h"
 
+#ifdef SMUX_DEBUG
 bool SMUX::CloseHandler(const SMUX_PDUs_t * pdus)
 {
 printfd(__FILE__, "SMUX::CloseHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
-return false;
+return true;
 }
+#else
+bool SMUX::CloseHandler(const SMUX_PDUs_t *)
+{
+return true;
+}
+#endif
 
+#ifdef SMUX_DEBUG
 bool SMUX::RegisterResponseHandler(const SMUX_PDUs_t * pdus)
 {
 printfd(__FILE__, "SMUX::RegisterResponseHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
-return false;
+return true;
+}
+#else
+bool SMUX::RegisterResponseHandler(const SMUX_PDUs_t *)
+{
+return true;
 }
+#endif
 
 bool SMUX::PDUsRequestHandler(const SMUX_PDUs_t * pdus)
 {
+#ifdef SMUX_DEBUG
 printfd(__FILE__, "SMUX::PDUsRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
+#endif
 PDUsHandlers::iterator it;
 it = pdusHandlers.find(pdus->choice.pdus.present);
 if (it != pdusHandlers.end())
@@ -36,6 +52,7 @@ if (it != pdusHandlers.end())
     }
 else
     {
+#ifdef SMUX_DEBUG
     switch (pdus->present)
         {
         case PDUs_PR_NOTHING:
@@ -50,21 +67,31 @@ else
         default:
             printfd(__FILE__, "SMUX::PDUsRequestHandler() - undefined\n");
         }
+#endif
     }
-return false;
+return true;
 }
 
+#ifdef SMUX_DEBUG
 bool SMUX::CommitOrRollbackHandler(const SMUX_PDUs_t * pdus)
 {
 printfd(__FILE__, "SMUX::CommitOrRollbackHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
-return false;
+return true;
+}
+#else
+bool SMUX::CommitOrRollbackHandler(const SMUX_PDUs_t *)
+{
+return true;
 }
+#endif
 
 bool SMUX::GetRequestHandler(const PDUs_t * pdus)
 {
+#ifdef SMUX_DEBUG
 printfd(__FILE__, "SMUX::GetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
+#endif
 const GetRequest_PDU_t * getRequest = &pdus->choice.get_request;
 GetResponse_PDU_t * msg = static_cast<GetResponse_PDU_t *>(calloc(1, sizeof(GetResponse_PDU_t)));
 assert(msg && "Enought mempry to allocate GetResponse_PDU_t");
@@ -84,9 +111,8 @@ for (int i = 0; i < vbl->list.count; ++i)
     it = sensors.find(OID(&vb->name));
     if (it == sensors.end())
         {
-        SendGetResponseErrorPDU(sock, getRequest,
-                                PDU__error_status_noSuchName, i);
-        return true;
+        return SendGetResponseErrorPDU(sock, getRequest,
+                                       PDU__error_status_noSuchName, i);
         }
 
     VarBind_t * newVb = static_cast<VarBind_t *>(calloc(1, sizeof(VarBind_t)));
@@ -98,16 +124,20 @@ for (int i = 0; i < vbl->list.count; ++i)
     ASN_SEQUENCE_ADD(varBindList, newVb);
     }
 
-SendGetResponsePDU(sock, msg);
+bool res = SendGetResponsePDU(sock, msg);
+#ifdef SMUX_DEBUG
 asn_fprint(stderr, &asn_DEF_GetResponse_PDU, msg);
+#endif
 ASN_STRUCT_FREE(asn_DEF_GetResponse_PDU, msg);
-return false;
+return res;
 }
 
 bool SMUX::GetNextRequestHandler(const PDUs_t * pdus)
 {
+#ifdef SMUX_DEBUG
 printfd(__FILE__, "SMUX::GetNextRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
+#endif
 const GetRequest_PDU_t * getRequest = &pdus->choice.get_request;
 GetResponse_PDU_t * msg = static_cast<GetResponse_PDU_t *>(calloc(1, sizeof(GetResponse_PDU_t)));
 assert(msg && "Enought mempry to allocate GetResponse_PDU_t");
@@ -127,10 +157,11 @@ for (int i = 0; i < vbl->list.count; ++i)
     it = sensors.upper_bound(OID(&vb->name));
     if (it == sensors.end())
         {
+#ifdef SMUX_DEBUG
         printfd(__FILE__, "SMUX::GetNextRequestHandler() - '%s' not found\n", OID(&vb->name).ToString().c_str());
-        SendGetResponseErrorPDU(sock, getRequest,
-                                PDU__error_status_noSuchName, i);
-        return true;
+#endif
+        return SendGetResponseErrorPDU(sock, getRequest,
+                                       PDU__error_status_noSuchName, i);
         }
 
     VarBind_t * newVb = static_cast<VarBind_t *>(calloc(1, sizeof(VarBind_t)));
@@ -142,17 +173,20 @@ for (int i = 0; i < vbl->list.count; ++i)
     ASN_SEQUENCE_ADD(varBindList, newVb);
     }
 
-SendGetResponsePDU(sock, msg);
+bool res = SendGetResponsePDU(sock, msg);
+#ifdef SMUX_DEBUG
 asn_fprint(stderr, &asn_DEF_PDU, msg);
+#endif
 ASN_STRUCT_FREE(asn_DEF_GetResponse_PDU, msg);
-return false;
+return res;
 }
 
 bool SMUX::SetRequestHandler(const PDUs_t * pdus)
 {
+#ifdef SMUX_DEBUG
 printfd(__FILE__, "SMUX::SetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
-SendGetResponseErrorPDU(sock, &pdus->choice.set_request,
-                        PDU__error_status_readOnly, 0);
-return false;
+#endif
+return SendGetResponseErrorPDU(sock, &pdus->choice.set_request,
+                               PDU__error_status_readOnly, 0);
 }