Fix tariff and user subscription in SMUX

[stg.git] / 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 328cea88e6cef016b94a6dd161cbd8d79e73c5c7..ff7bb590241d898369900925810e8312dbf7074e 100644 (file)
--- 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;
@@ -117,6 +92,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",
@@ -144,6 +121,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",
@@ -176,6 +155,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",
@@ -203,6 +184,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",
@@ -245,7 +227,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 +237,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",