Merge remote-tracking branch 'github/master'

[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 91e40985cf154683dd2114cb97772fc17a97c349..0ea39bbb39c016193495e7a64365f60e897fbbee 100644 (file)
--- a/projects/stargazer/plugins/other/smux/utils.cpp
+++ b/projects/stargazer/plugins/other/smux/utils.cpp
@@ -44,31 +44,10 @@ if (left < str.length())
         }
     arcs[arcPos++] = arc;
     }
         }
     arcs[arcPos++] = arc;
     }

-OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), arcPos);
+OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), static_cast<unsigned int>(arcPos));

 return true;
 }
 
 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";
 bool SendOpenPDU(int fd)
 {
 const char * description = "Stg SMUX Plugin";


@@ -79,9 +58,7 @@ memset(&msg, 0, sizeof(msg));
 
 msg.present = OpenPDU_PR_simple;
 asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1);
 
 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");
     {
     printfd(__FILE__,
             "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");