diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 21:14:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 21:14:51 +0000 |
| commit | bc282425088455198a7a99511c75914477d4ed32 (patch) | |
| tree | 1b1fb887a634136a093deea7e4dd95d054201e7a /snmp-agent.hh | |
| parent | Releasing progress-linux version 1.8.3-3~progress7.99u1. (diff) | |
| download | dnsdist-bc282425088455198a7a99511c75914477d4ed32.tar.xz dnsdist-bc282425088455198a7a99511c75914477d4ed32.zip | |
Merging upstream version 1.9.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'snmp-agent.hh')
| -rw-r--r-- | snmp-agent.hh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/snmp-agent.hh b/snmp-agent.hh index e4ba134..c75db08 100644 --- a/snmp-agent.hh +++ b/snmp-agent.hh @@ -16,6 +16,7 @@ #endif /* HAVE_NET_SNMP */ #include "mplexer.hh" +#include "channel.hh" class SNMPAgent { @@ -23,11 +24,6 @@ public: SNMPAgent(const std::string& name, const std::string& daemonSocket); virtual ~SNMPAgent() { -#ifdef HAVE_NET_SNMP - - close(d_trapPipe[0]); - close(d_trapPipe[1]); -#endif /* HAVE_NET_SNMP */ } void run() @@ -45,13 +41,13 @@ public: protected: #ifdef HAVE_NET_SNMP /* OID for snmpTrapOID.0 */ - static const oid snmpTrapOID[]; - static const size_t snmpTrapOIDLen; + static const std::array<oid, 11> snmpTrapOID; - static bool sendTrap(int fd, + static bool sendTrap(pdns::channel::Sender<netsnmp_variable_list, void(*)(netsnmp_variable_list*)>& sender, netsnmp_variable_list* varList); - int d_trapPipe[2] = { -1, -1}; + pdns::channel::Sender<netsnmp_variable_list, void(*)(netsnmp_variable_list*)> d_sender; + pdns::channel::Receiver<netsnmp_variable_list, void(*)(netsnmp_variable_list*)> d_receiver; #endif /* HAVE_NET_SNMP */ private: void worker(); |