X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/76e975a593f0194edcbfbfc952eb391b2b8605cf..257926c2903778a49000e81ba14f090106af0edc:/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 19304c52..01878da6 100644
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -1,3 +1,5 @@
+#include <cassert>
+
 #include "stg/GetRequest-PDU.h"
 #include "stg/GetResponse-PDU.h"
 #include "stg/VarBindList.h"
@@ -8,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())
@@ -34,6 +52,7 @@ if (it != pdusHandlers.end())
     }
 else
     {
+#ifdef SMUX_DEBUG
     switch (pdus->present)
         {
         case PDUs_PR_NOTHING:
@@ -48,29 +67,41 @@ 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;
-VarBindList_t * varBindList = &msg.variable_bindings;
-memset(&msg, 0, sizeof(msg));
+GetResponse_PDU_t * msg = static_cast<GetResponse_PDU_t *>(calloc(1, sizeof(GetResponse_PDU_t)));
+assert(msg && "Enought mempry to allocate GetResponse_PDU_t");
+VarBindList_t * varBindList = &msg->variable_bindings;
 
-msg.request_id = getRequest->request_id;
-asn_long2INTEGER(&msg.error_status, 0);
-asn_long2INTEGER(&msg.error_index, 0);
+long id = 0;
+asn_INTEGER2long(&getRequest->request_id, &id);
+asn_long2INTEGER(&msg->request_id, id);
+asn_long2INTEGER(&msg->error_status, 0);
+asn_long2INTEGER(&msg->error_index, 0);
 
 const VarBindList_t * vbl = &getRequest->variable_bindings; 
 for (int i = 0; i < vbl->list.count; ++i)
@@ -80,37 +111,43 @@ 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;
-    memset(&newVb, 0, sizeof(newVb));
+    VarBind_t * newVb = static_cast<VarBind_t *>(calloc(1, sizeof(VarBind_t)));
+    assert(newVb && "Enought mempry to allocate VarBind_t");
 
-    newVb.name = vb->name;
-    it->second->GetValue(&newVb.value);
+    it->first.ToOID(&newVb->name);
+    it->second->GetValue(&newVb->value);
 
-    ASN_SEQUENCE_ADD(varBindList, &newVb);
+    ASN_SEQUENCE_ADD(varBindList, newVb);
     }
 
-SendGetResponsePDU(sock, &msg);
-asn_fprint(stderr, &asn_DEF_PDU, &msg);
-return false;
+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 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;
-VarBindList_t * varBindList = &msg.variable_bindings;
-memset(&msg, 0, sizeof(msg));
+GetResponse_PDU_t * msg = static_cast<GetResponse_PDU_t *>(calloc(1, sizeof(GetResponse_PDU_t)));
+assert(msg && "Enought mempry to allocate GetResponse_PDU_t");
+VarBindList_t * varBindList = &msg->variable_bindings;
 
-msg.request_id = getRequest->request_id;
-asn_long2INTEGER(&msg.error_status, 0);
-asn_long2INTEGER(&msg.error_index, 0);
+long id = 0;
+asn_INTEGER2long(&getRequest->request_id, &id);
+asn_long2INTEGER(&msg->request_id, id);
+asn_long2INTEGER(&msg->error_status, 0);
+asn_long2INTEGER(&msg->error_index, 0);
 
 const VarBindList_t * vbl = &getRequest->variable_bindings; 
 for (int i = 0; i < vbl->list.count; ++i)
@@ -120,30 +157,36 @@ for (int i = 0; i < vbl->list.count; ++i)
     it = sensors.upper_bound(OID(&vb->name));
     if (it == sensors.end())
         {
-        SendGetResponseErrorPDU(sock, getRequest,
-                                PDU__error_status_noSuchName, i);
-        return true;
+#ifdef SMUX_DEBUG
+        printfd(__FILE__, "SMUX::GetNextRequestHandler() - '%s' not found\n", OID(&vb->name).ToString().c_str());
+#endif
+        return SendGetResponseErrorPDU(sock, getRequest,
+                                       PDU__error_status_noSuchName, i);
         }
 
-    VarBind_t newVb;
-    memset(&newVb, 0, sizeof(newVb));
+    VarBind_t * newVb = static_cast<VarBind_t *>(calloc(1, sizeof(VarBind_t)));
+    assert(newVb && "Enought mempry to allocate VarBind_t");
 
-    newVb.name = vb->name;
-    it->second->GetValue(&newVb.value);
+    it->first.ToOID(&newVb->name);
+    it->second->GetValue(&newVb->value);
 
-    ASN_SEQUENCE_ADD(varBindList, &newVb);
+    ASN_SEQUENCE_ADD(varBindList, newVb);
     }
 
-SendGetResponsePDU(sock, &msg);
-asn_fprint(stderr, &asn_DEF_PDU, &msg);
-return false;
+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 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);
 }