X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/05fa444f7cd2661c0903fb4b3424fd692fa1215a..bc4721533e4041a19b42cb247064f9f42c3f9d5f:/projects/stargazer/plugins/other/smux/utils.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/other/smux/utils.cpp b/projects/stargazer/plugins/other/smux/utils.cpp
index 4bfc0c10..8d3988eb 100644
--- a/projects/stargazer/plugins/other/smux/utils.cpp
+++ b/projects/stargazer/plugins/other/smux/utils.cpp
@@ -1,4 +1,3 @@
-#include <sys/select.h>
 #include <unistd.h> // write
 
 #include <cstring> // memset
@@ -6,39 +5,15 @@
 
 #include "stg/common.h"
 
-#include "asn1/OpenPDU.h"
-#include "asn1/ClosePDU.h"
-#include "asn1/RReqPDU.h"
-#include "asn1/ber_decoder.h"
-#include "asn1/der_encoder.h"
+#include "stg/OpenPDU.h"
+#include "stg/ClosePDU.h"
+#include "stg/RReqPDU.h"
+#include "stg/ber_decoder.h"
+#include "stg/der_encoder.h"
 
 #include "pen.h"
 #include "utils.h"
 
-bool WaitPackets(int sd)
-{
-fd_set rfds;
-FD_ZERO(&rfds);
-FD_SET(sd, &rfds);
-
-struct timeval tv;
-tv.tv_sec = 0;
-tv.tv_usec = 500000;
-
-int res = select(sd + 1, &rfds, NULL, NULL, &tv);
-if (res == -1) // Error
-    {
-    if (errno != EINTR)
-        printfd(__FILE__, "Error on select: '%s'\n", strerror(errno));
-    return false;
-    }
-
-if (res == 0) // Timeout
-    return false;
-
-return true;
-}
-
 bool String2OI(const std::string & str, OBJECT_IDENTIFIER_t * oi)
 {
 size_t left = 0, pos = 0, arcPos = 0;
@@ -69,11 +44,31 @@ if (left < str.length())
         }
     arcs[arcPos++] = arc;
     }
-printfd(__FILE__, "String2OI() - arcPos: %d\n", arcPos);
 OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), 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";
@@ -96,6 +91,8 @@ OCTET_STRING_fromString(&msg.choice.simple.password, "");
 char buffer[1024];
 error = der_encode_to_buffer(&asn_DEF_OpenPDU, &msg, buffer, sizeof(buffer));
 
+ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OpenPDU, &msg);
+
 if (error.encoded == -1)
     {
     printfd(__FILE__, "Could not encode OpenPDU (at %s)\n",
@@ -105,8 +102,6 @@ if (error.encoded == -1)
 else
     {
     write(fd, buffer, error.encoded);
-    printfd(__FILE__, "OpenPDU encoded successfully to %d bytes\n",
-            error.encoded);
     }
 return true;
 }
@@ -123,6 +118,8 @@ char buffer[1024];
 asn_enc_rval_t error;
 error = der_encode_to_buffer(&asn_DEF_ClosePDU, &msg, buffer, sizeof(buffer));
 
+ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_ClosePDU, &msg);
+
 if (error.encoded == -1)
     {
     printfd(__FILE__, "Could not encode ClosePDU (at %s)\n",
@@ -132,7 +129,6 @@ if (error.encoded == -1)
 else
     {
     write(fd, buffer, error.encoded);
-    printfd(__FILE__, "ClosePDU encoded successfully\n");
     }
 return 0;
 }
@@ -155,6 +151,8 @@ OBJECT_IDENTIFIER_set_arcs(&msg.subtree,
 char buffer[1024];
 error = der_encode_to_buffer(&asn_DEF_RReqPDU, &msg, buffer, sizeof(buffer));
 
+ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RReqPDU, &msg);
+
 if (error.encoded == -1)
     {
     printfd(__FILE__, "Could not encode RReqPDU (at %s)\n",
@@ -164,8 +162,6 @@ if (error.encoded == -1)
 else
     {
     write(fd, buffer, error.encoded);
-    printfd(__FILE__, "RReqPDU encoded successfully to %d bytes\n",
-            error.encoded);
     }
 return 0;
 }
@@ -182,6 +178,7 @@ if (length < 1)
     return NULL;
 asn_dec_rval_t error;
 error = ber_decode(0, &asn_DEF_SMUX_PDUs, (void **)&pdus, buffer, length);
+
 if(error.code != RC_OK)
     {
     printfd(__FILE__, "Failed to decode PDUs at byte %ld\n",
@@ -191,27 +188,6 @@ if(error.code != RC_OK)
 return pdus;
 }
 
-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;
-}
-
 int SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse)
 {
 asn_enc_rval_t error;
@@ -229,8 +205,6 @@ if (error.encoded == -1)
 else
     {
     write(fd, buffer, error.encoded);
-    printfd(__FILE__, "GetResponsePDU encoded successfully to %d bytes\n",
-            error.encoded);
     }
 return 0;
 }
@@ -245,7 +219,9 @@ GetResponse_PDU_t msg;
 
 memset(&msg, 0, sizeof(msg));
 
-msg.request_id = getRequest->request_id;
+long id = 0;
+asn_INTEGER2long(&getRequest->request_id, &id);
+asn_long2INTEGER(&msg.request_id, id);
 asn_long2INTEGER(&msg.error_status, errorStatus);
 asn_long2INTEGER(&msg.error_index, errorIndex);
 
@@ -253,6 +229,8 @@ char buffer[1024];
 error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, &msg, buffer,
                              sizeof(buffer));
 
+ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_GetResponse_PDU, &msg);
+
 if (error.encoded == -1)
     {
     printfd(__FILE__, "Could not encode GetResponsePDU for error (at %s)\n",
@@ -262,9 +240,6 @@ if (error.encoded == -1)
 else
     {
     write(fd, buffer, error.encoded);
-    printfd(__FILE__,
-            "GetResponsePDU for error encoded successfully to %d bytes\n",
-            error.encoded);
     }
 return 0;
 }