Correct description for tariffUsers

[stg.git] / projects / stargazer / plugins / other / snmp / snmp.cpp

diff --git a/projects/stargazer/plugins/other/snmp/snmp.cpp b/projects/stargazer/plugins/other/snmp/snmp.cpp
index 8c026128b314acf1462f5cd499ea2672c9d15f33..9e99b8ea3f6f49bad647471a6526fd756dd96528 100644 (file)
--- a/projects/stargazer/plugins/other/snmp/snmp.cpp
+++ b/projects/stargazer/plugins/other/snmp/snmp.cpp
@@ -114,7 +114,7 @@ return sac.GetPlugin();
 int SendOpenPDU(int fd)
 {
 const char * description = "Stg SNMP Agent";
 int SendOpenPDU(int fd)
 {
 const char * description = "Stg SNMP Agent";

-//int oid[] = {1, 3, 6, 1, 4, 1, 9363, 1, 5, 2, 1, 1};
+//int oid[] = {1, 3, 6, 1, 4, 1, 38313, 1, 5, 2, 1, 1};

 asn_enc_rval_t error;
 OpenPDU_t msg;
 
 asn_enc_rval_t error;
 OpenPDU_t msg;
 


@@ -126,7 +126,7 @@ asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1);
                            oid,
                            sizeof(oid[0]),
                            7);*/
                            oid,
                            sizeof(oid[0]),
                            7);*/

-if (!String2OI(".1.3.6.1.4.1.9363", &msg.choice.simple.identity))
+if (!String2OI(".1.3.6.1.4.1.38313", &msg.choice.simple.identity))

     {
     printfd(__FILE__, "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");
     return -1;
     {
     printfd(__FILE__, "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");
     return -1;


@@ -181,7 +181,7 @@ return 0;
 
 int SendRReqPDU(int fd)
 {
 
 int SendRReqPDU(int fd)
 {

-int oid[] = {1, 3, 6, 1, 4, 1, 9363, 1};
+int oid[] = {1, 3, 6, 1, 4, 1, 38313, 1};

 asn_enc_rval_t error;
 RReqPDU_t msg;
 
 asn_enc_rval_t error;
 RReqPDU_t msg;
 


@@ -211,31 +211,51 @@ else
 return 0;
 }
 
 return 0;
 }
 

-int SendSetResponsePDU(int fd, const PDU_t * pdu)
+int SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse)
+{
+asn_enc_rval_t error;
+
+char buffer[1024];
+error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, getResponse, buffer, sizeof(buffer));
+
+if (error.encoded == -1)
+    {
+    printfd(__FILE__, "Could not encode GetResponsePDU (at %s)\n",
+            error.failed_type ? error.failed_type->name : "unknown");
+    return -1;
+    }
+else
+    {
+    write(fd, buffer, error.encoded);
+    printfd(__FILE__, "GetResponsePDU encoded successfully to %d bytes\n", error.encoded);
+    }
+return 0;
+}
+
+int SendGetResponseErrorPDU(int fd, const PDU_t * getRequest, int errorStatus, int errorIndex)

 {
 {

-//int oid[] = {1, 3, 6, 1, 4, 1, 9363, 1};

 asn_enc_rval_t error;
 GetResponse_PDU_t msg;
 
 memset(&msg, 0, sizeof(msg));
 
 asn_enc_rval_t error;
 GetResponse_PDU_t msg;
 
 memset(&msg, 0, sizeof(msg));
 

-msg.request_id = pdu->request_id;
-asn_long2INTEGER(&msg.error_status, PDU__error_status_readOnly);
-asn_long2INTEGER(&msg.error_index, PDU__error_status_readOnly);
+msg.request_id = getRequest->request_id;
+asn_long2INTEGER(&msg.error_status, errorStatus);
+asn_long2INTEGER(&msg.error_index, errorIndex);

 
 char buffer[1024];
 error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, &msg, buffer, sizeof(buffer));
 
 if (error.encoded == -1)
     {
 
 char buffer[1024];
 error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, &msg, buffer, sizeof(buffer));
 
 if (error.encoded == -1)
     {

-    printfd(__FILE__, "Could not encode GetResponsePDU (at %s)\n",
+    printfd(__FILE__, "Could not encode GetResponsePDU for error (at %s)\n",

             error.failed_type ? error.failed_type->name : "unknown");
     return -1;
     }
 else
     {
     write(fd, buffer, error.encoded);
             error.failed_type ? error.failed_type->name : "unknown");
     return -1;
     }
 else
     {
     write(fd, buffer, error.encoded);

-    printfd(__FILE__, "GetResponsePDU encoded successfully to %d bytes\n", error.encoded);
+    printfd(__FILE__, "GetResponsePDU for error encoded successfully to %d bytes\n", error.encoded);

     }
 return 0;
 }
     }
 return 0;
 }


@@ -332,6 +352,8 @@ return 0;
 
 SNMP_AGENT::SNMP_AGENT()
     : PLUGIN(),
 
 SNMP_AGENT::SNMP_AGENT()
     : PLUGIN(),

+      users(NULL),
+      tariffs(NULL),

       running(false),
       stopped(true),
       sock(-1)
       running(false),
       stopped(true),
       sock(-1)


@@ -350,6 +372,9 @@ pdusHandlers[PDUs_PR_set_request] = &SNMP_AGENT::SetRequestHandler;
 
 SNMP_AGENT::~SNMP_AGENT()
 {
 
 SNMP_AGENT::~SNMP_AGENT()
 {

+Sensors::iterator it;
+for (it = sensors.begin(); it != sensors.end(); ++it)
+    delete it->second;

 printfd(__FILE__, "SNMP_AGENT::~SNMP_AGENT()\n");
 pthread_mutex_destroy(&mutex);
 }
 printfd(__FILE__, "SNMP_AGENT::~SNMP_AGENT()\n");
 pthread_mutex_destroy(&mutex);
 }


@@ -364,6 +389,20 @@ int SNMP_AGENT::Start()
 if (PrepareNet())
     return -1;
 
 if (PrepareNet())
     return -1;
 

+// Users
+sensors[".1.3.6.1.4.1.38313.1.1.1"] = new TotalUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.2"] = new ConnectedUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.3"] = new AuthorizedUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.4"] = new AlwaysOnlineUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.5"] = new NoCashUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.7"] = new DisabledDetailStatsUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.8"] = new DisabledUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.9"] = new PassiveUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.10"] = new CreditUsersSensor(*users);
+sensors[".1.3.6.1.4.1.38313.1.1.11"] = new FreeMbUsersSensor(*users);
+// Tariffs
+sensors[".1.3.6.1.4.1.38313.1.2.1"] = new TotalTariffsSensor(*tariffs);
+

 if (!running)
     {
     if (pthread_create(&thread, NULL, Runner, this))
 if (!running)
     {
     if (pthread_create(&thread, NULL, Runner, this))


@@ -584,12 +623,38 @@ bool SNMP_AGENT::GetRequestHandler(const PDUs_t * pdus)
 {
 printfd(__FILE__, "SNMP_AGENT::GetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
 {
 printfd(__FILE__, "SNMP_AGENT::GetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);

-const VarBindList_t * vbl = &pdus->choice.get_request.variable_bindings; 
+const GetRequest_PDU_t * getRequest = &pdus->choice.get_request;
+GetResponse_PDU_t msg;
+VarBindList_t * varBindList = &msg.variable_bindings;
+memset(&msg, 0, sizeof(msg));
+
+msg.request_id = getRequest->request_id;
+asn_long2INTEGER(&msg.error_status, 0);
+asn_long2INTEGER(&msg.error_index, 0);
+
+const VarBindList_t * vbl = &getRequest->variable_bindings; 

 for (int i = 0; i < vbl->list.count; ++i)
     {
 for (int i = 0; i < vbl->list.count; ++i)
     {

-    VarBind_t * vb = pdus->choice.get_request.variable_bindings.list.array[i];
-    printfd(__FILE__, "OID: %s\n", OI2String(&vb->name).c_str());
+    VarBind_t * vb = getRequest->variable_bindings.list.array[i];
+    Sensors::iterator it;
+    it = sensors.find(OI2String(&vb->name));
+    if (it == sensors.end())
+        {
+        SendGetResponseErrorPDU(sock, getRequest, PDU__error_status_noSuchName, i);
+        return true;
+        }
+
+    VarBind_t newVb;
+    memset(&newVb, 0, sizeof(newVb));
+
+    newVb.name = vb->name;
+    it->second->GetValue(&newVb.value);
+
+    ASN_SEQUENCE_ADD(varBindList, &newVb);

     }
     }

+
+SendGetResponsePDU(sock, &msg);
+asn_fprint(stderr, &asn_DEF_PDU, &msg);

 return false;
 }
 
 return false;
 }
 


@@ -604,7 +669,7 @@ bool SNMP_AGENT::SetRequestHandler(const PDUs_t * pdus)
 {
 printfd(__FILE__, "SNMP_AGENT::SetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
 {
 printfd(__FILE__, "SNMP_AGENT::SetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);

-SendSetResponsePDU(sock, &pdus->choice.set_request);
+SendGetResponseErrorPDU(sock, &pdus->choice.set_request, PDU__error_status_readOnly, 0);

 return false;
 }
 
 return false;
 }