Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/plugins/other/snmp/snmp.h b/projects/stargazer/plugins/other/snmp/snmp.h
index 90dba45e8d3d6da072bdf1ad56b5c7ab73b5da07..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 <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/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();
 
 
 extern "C" PLUGIN * GetPlugin();
 


@@ -19,7 +23,10 @@ class USER;
 class SETTINGS;
 class SNMP_AGENT;
 
 class SETTINGS;
 class SNMP_AGENT;
 

-typedef bool (SNMP_AGENT::*SNMPPacketHandler)(const SMUX_PDUs_t * pdus);
+typedef bool (SNMP_AGENT::*SMUXPacketHandler)(const SMUX_PDUs_t * pdus);
+typedef bool (SNMP_AGENT::*PDUsHandler)(const PDUs_t * pdus);
+typedef std::map<SMUX_PDUs_PR, SMUXPacketHandler> SMUXHandlers;
+typedef std::map<PDUs_PR, PDUsHandler> PDUsHandlers;

 //-----------------------------------------------------------------------------
 class SNMP_AGENT_SETTINGS {
 public:
 //-----------------------------------------------------------------------------
 class SNMP_AGENT_SETTINGS {
 public:


@@ -45,8 +52,8 @@ public:
     SNMP_AGENT();
     virtual ~SNMP_AGENT();
 
     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 *) {}
     void SetAdmins(ADMINS *) {}
     void SetTraffcounter(TRAFFCOUNTER *) {}
     void SetStore(STORE *) {}


@@ -76,6 +83,13 @@ private:
     bool PDUsHandler(const SMUX_PDUs_t * pdus);
     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 
     bool PDUsHandler(const SMUX_PDUs_t * pdus);
     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 

+    bool GetRequestHandler(const PDUs_t * pdus);
+    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;
     mutable std::string errorStr;
     SNMP_AGENT_SETTINGS snmpAgentSettings;
     MODULE_SETTINGS settings;


@@ -87,7 +101,9 @@ private:
 
     int sock;
 
 
     int sock;
 

-    std::map<SMUX_PDUs_PR, SNMPPacketHandler> handlers;
+    SMUXHandlers smuxHandlers;
+    PDUsHandlers pdusHandlers;
+    Sensors sensors;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------