X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a8c0ec7842337a96c32fa24919c2564b2b36f3fb..085c36723242f7bd1e0fd9bf49b950da6cb96039:/projects/stargazer/plugins/other/smux/utils.cpp

diff --git a/projects/stargazer/plugins/other/smux/utils.cpp b/projects/stargazer/plugins/other/smux/utils.cpp
index 91e40985..d1a0c281 100644
--- a/projects/stargazer/plugins/other/smux/utils.cpp
+++ b/projects/stargazer/plugins/other/smux/utils.cpp
@@ -1,23 +1,26 @@
-#include <unistd.h> // write
-
-#include <cstring> // memset
-#include <cerrno>
+#include "utils.h"
+#include "pen.h"
 
 #include "stg/common.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 #include "stg/OpenPDU.h"
 #include "stg/ClosePDU.h"
 #include "stg/RReqPDU.h"
 #include "stg/ber_decoder.h"
 #include "stg/der_encoder.h"
+#pragma GCC diagnostic pop
 
-#include "pen.h"
-#include "utils.h"
+#include <cstring> // memset
+#include <cerrno>
+
+#include <unistd.h> // write
 
 bool String2OI(const std::string & str, OBJECT_IDENTIFIER_t * oi)
 {
 size_t left = 0, pos = 0, arcPos = 0;
-int arcs[1024];
+uint32_t arcs[1024];
 pos = str.find_first_of('.', left);
 if (pos == 0)
     {
@@ -44,31 +47,10 @@ if (left < str.length())
         }
     arcs[arcPos++] = arc;
     }
-OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), arcPos);
+OBJECT_IDENTIFIER_set_arcs(oi, arcs, static_cast<unsigned int>(arcPos));
 return true;
 }
 
-std::string OI2String(OBJECT_IDENTIFIER_t * oi)
-{
-std::string res;
-
-int arcs[1024];
-int count = OBJECT_IDENTIFIER_get_arcs(oi, arcs, sizeof(arcs[0]), 1024);
-
-if (count > 1024)
-    return "";
-
-for (int i = 0; i < count; ++i)
-    {
-    res += ".";
-    std::string arc;
-    strprintf(&arc, "%d", arcs[i]);
-    res += arc;
-    }
-
-return res;
-}
-
 bool SendOpenPDU(int fd)
 {
 const char * description = "Stg SMUX Plugin";
@@ -79,9 +61,7 @@ memset(&msg, 0, sizeof(msg));
 
 msg.present = OpenPDU_PR_simple;
 asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1);
-std::string pen(PEN_PREFIX);
-pen += ".1";
-if (!String2OI(pen.c_str(), &msg.choice.simple.identity))
+if (!String2OI(PEN_PREFIX, &msg.choice.simple.identity))
     {
     printfd(__FILE__,
             "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");
@@ -145,7 +125,7 @@ return true;
 
 bool SendRReqPDU(int fd)
 {
-int oid[] = {1, 3, 6, 1, 4, 1, 38313, 1};
+uint32_t oid[] = {1, 3, 6, 1, 4, 1, 38313, 1};
 asn_enc_rval_t error;
 RReqPDU_t msg;
 
@@ -155,7 +135,6 @@ msg.priority = 0;
 asn_long2INTEGER(&msg.operation, RReqPDU__operation_readOnly);
 OBJECT_IDENTIFIER_set_arcs(&msg.subtree,
                            oid,
-                           sizeof(oid[0]),
                            8);
 
 char buffer[1024];
@@ -191,12 +170,13 @@ size_t length = read(fd, buffer, sizeof(buffer));
 if (length < 1)
     return NULL;
 asn_dec_rval_t error;
-error = ber_decode(0, &asn_DEF_SMUX_PDUs, (void **)&pdus, buffer, length);
+void* p = pdus;
+error = ber_decode(0, &asn_DEF_SMUX_PDUs, &p, buffer, length);
 
 if(error.code != RC_OK)
     {
     printfd(__FILE__, "Failed to decode PDUs at byte %ld\n",
-            (long)error.consumed);
+            static_cast<long>(error.consumed));
     return NULL;
     }
 return pdus;