X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/44378b3654976b893daa96f44cea9fcb62092209..517400b7934a39872ffa02370ac7aa1264bec114:/projects/stargazer/plugins/other/smux/handlers.cpp?ds=inline diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp index 7ceb2994..ac179da9 100644 --- a/projects/stargazer/plugins/other/smux/handlers.cpp +++ b/projects/stargazer/plugins/other/smux/handlers.cpp @@ -15,12 +15,12 @@ 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 false; +return true; } #endif @@ -29,12 +29,12 @@ 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 false; +return true; } #endif @@ -44,15 +44,14 @@ bool SMUX::PDUsRequestHandler(const SMUX_PDUs_t * pdus) printfd(__FILE__, "SMUX::PDUsRequestHandler()\n"); asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); #endif -PDUsHandlers::iterator it; -it = pdusHandlers.find(pdus->choice.pdus.present); +PDUsHandlers::iterator it(pdusHandlers.find(pdus->choice.pdus.present)); if (it != pdusHandlers.end()) { return (this->*(it->second))(&pdus->choice.pdus); } +#ifdef SMUX_DEBUG else { -#ifdef SMUX_DEBUG switch (pdus->present) { case PDUs_PR_NOTHING: @@ -67,9 +66,9 @@ else default: printfd(__FILE__, "SMUX::PDUsRequestHandler() - undefined\n"); } -#endif } -return false; +#endif +return true; } #ifdef SMUX_DEBUG @@ -77,12 +76,12 @@ 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 false; +return true; } #endif @@ -111,9 +110,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(calloc(1, sizeof(VarBind_t))); @@ -125,12 +123,12 @@ 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) @@ -161,9 +159,8 @@ for (int i = 0; i < vbl->list.count; ++i) #ifdef SMUX_DEBUG printfd(__FILE__, "SMUX::GetNextRequestHandler() - '%s' not found\n", OID(&vb->name).ToString().c_str()); #endif - SendGetResponseErrorPDU(sock, getRequest, - PDU__error_status_noSuchName, i); - return true; + return SendGetResponseErrorPDU(sock, getRequest, + PDU__error_status_noSuchName, i); } VarBind_t * newVb = static_cast(calloc(1, sizeof(VarBind_t))); @@ -175,12 +172,12 @@ 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) @@ -189,7 +186,6 @@ bool SMUX::SetRequestHandler(const PDUs_t * pdus) printfd(__FILE__, "SMUX::SetRequestHandler()\n"); asn_fprint(stderr, &asn_DEF_PDUs, pdus); #endif -SendGetResponseErrorPDU(sock, &pdus->choice.set_request, - PDU__error_status_readOnly, 0); -return false; +return SendGetResponseErrorPDU(sock, &pdus->choice.set_request, + PDU__error_status_readOnly, 0); }