Use data sensors in queries

diff --git a/projects/stargazer/plugins/other/snmp/snmp.cpp b/projects/stargazer/plugins/other/snmp/snmp.cpp
index 7e961208a1debe1cd603bff720d0cd6c7820d3af..2884e6fc394d583867b93165e7a9781e1d97deaa 100644 (file)
--- a/projects/stargazer/plugins/other/snmp/snmp.cpp
+++ b/projects/stargazer/plugins/other/snmp/snmp.cpp
@@ -211,46 +211,12 @@ else
 return 0;
 }
 
-int SendGetResponsePDU(int fd, const PDU_t * pdu)
+int SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse)
 {
 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, 0);
-asn_long2INTEGER(&msg.error_index, 0);
-
-VarBind_t vb;
-
-memset(&vb, 0, sizeof(vb));
-
-if (!String2OI(".1.3.6.1.4.1.9363.1", &vb.name))
-    {
-    printfd(__FILE__, "SendSetResponsePDU() - failed to convert string to OBJECT_IDENTIFIER\n");
-    return -1;
-    }
-
-ObjectSyntax_t * objectSyntax = &vb.value;
-objectSyntax->present = ObjectSyntax_PR_simple;
-SimpleSyntax_t * simpleSyntax = &objectSyntax->choice.simple;
-simpleSyntax->present = SimpleSyntax_PR_number;
-asn_long2INTEGER(&simpleSyntax->choice.number, 1);
-
-
-ASN_SEQUENCE_ADD(&msg.variable_bindings, &vb);
-
-/*const VarBindList_t * vbl = &pdu->variable_bindings; 
-for (int i = 0; i < vbl->list.count; ++i)
-    {
-    VarBind_t * vb = pdu->variable_bindings.list.array[i];
-    printfd(__FILE__, "OID: %s\n", OI2String(&vb->name).c_str());
-    asn_fprint(stderr, &asn_DEF_ObjectSyntax, &vb->value);
-    }*/
 
 char buffer[1024];
-error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, &msg, buffer, sizeof(buffer));
+error = der_encode_to_buffer(&asn_DEF_GetResponse_PDU, getResponse, buffer, sizeof(buffer));
 
 if (error.encoded == -1)
     {
@@ -266,31 +232,30 @@ else
 return 0;
 }
 
-int SendSetResponsePDU(int fd, const PDU_t * pdu)
+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));
 
-msg.request_id = pdu->request_id;
-asn_long2INTEGER(&msg.error_status, PDU__error_status_readOnly);
-asn_long2INTEGER(&msg.error_index, 0);
+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)
     {
-    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);
-    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;
 }
@@ -387,6 +352,8 @@ return 0;
 
 SNMP_AGENT::SNMP_AGENT()
     : PLUGIN(),
+      users(NULL),
+      tariffs(NULL),
       running(false),
       stopped(true),
       sock(-1)
@@ -405,6 +372,9 @@ pdusHandlers[PDUs_PR_set_request] = &SNMP_AGENT::SetRequestHandler;
 
 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);
 }
@@ -419,6 +389,20 @@ int SNMP_AGENT::Start()
 if (PrepareNet())
     return -1;
 
+// Users
+sensors[".1.3.6.1.4.1.9363.1.1.1"] = new TotalUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.2"] = new ConnectedUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.3"] = new AuthorizedUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.4"] = new AlwaysOnlineUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.5"] = new NoCashUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.7"] = new DisabledDetailStatsUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.8"] = new DisabledUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.9"] = new PassiveUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.10"] = new CreditUsersSensor(*users);
+sensors[".1.3.6.1.4.1.9363.1.1.11"] = new FreeMbUsersSensor(*users);
+// Tariffs
+sensors[".1.3.6.1.4.1.9363.1.2.1"] = new TotalTariffsSensor(*tariffs);
+
 if (!running)
     {
     if (pthread_create(&thread, NULL, Runner, this))
@@ -639,7 +623,38 @@ bool SNMP_AGENT::GetRequestHandler(const PDUs_t * pdus)
 {
 printfd(__FILE__, "SNMP_AGENT::GetRequestHandler()\n");
 asn_fprint(stderr, &asn_DEF_PDUs, pdus);
-SendGetResponsePDU(sock, &pdus->choice.get_request);
+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)
+    {
+    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;
 }
 
@@ -654,7 +669,7 @@ bool SNMP_AGENT::SetRequestHandler(const PDUs_t * 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;
 }
 

diff --git a/projects/stargazer/plugins/other/snmp/snmp.h b/projects/stargazer/plugins/other/snmp/snmp.h
index c872523a36acd9cad1e1906e78ad9cef5aaa7776..540bd3d7c328eba9d7519fa6ab29d0548b143405 100644 (file)
--- a/projects/stargazer/plugins/other/snmp/snmp.h
+++ b/projects/stargazer/plugins/other/snmp/snmp.h
@@ -7,11 +7,15 @@
 #include <map>
 
 #include "asn1/SMUX-PDUs.h"
+#include "asn1/ObjectSyntax.h"
 
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/users.h"
+#include "stg/tariffs.h"
+
+#include "sensors.h"
 
 extern "C" PLUGIN * GetPlugin();
 
@@ -48,8 +52,8 @@ public:
     SNMP_AGENT();
     virtual ~SNMP_AGENT();
 
-    void SetUsers(USERS *) {}
-    void SetTariffs(TARIFFS *) {}
+    void SetUsers(USERS * u) { users = u; }
+    void SetTariffs(TARIFFS * t) { tariffs = t; }
     void SetAdmins(ADMINS *) {}
     void SetTraffcounter(TRAFFCOUNTER *) {}
     void SetStore(STORE *) {}
@@ -83,6 +87,9 @@ private:
     bool GetNextRequestHandler(const PDUs_t * pdus);
     bool SetRequestHandler(const PDUs_t * pdus);
 
+    USERS * users;
+    TARIFFS * tariffs;
+
     mutable std::string errorStr;
     SNMP_AGENT_SETTINGS snmpAgentSettings;
     MODULE_SETTINGS settings;
@@ -96,6 +103,7 @@ private:
 
     SMUXHandlers smuxHandlers;
     PDUsHandlers pdusHandlers;
+    Sensors sensors;
 };
 //-----------------------------------------------------------------------------