From: Maxim Mamontov Date: Tue, 31 May 2011 17:03:15 +0000 (+0300) Subject: Core functionality implemented X-Git-Tag: 2.408-alpha~111 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/911b6d1f5643bf4d353774f82a8b742bec4e5677 Core functionality implemented Correct OpenPDU/ClosePDU SMUX_PDUs dispatching --- diff --git a/projects/stargazer/plugins/other/snmp/snmp.cpp b/projects/stargazer/plugins/other/snmp/snmp.cpp index 8587c1bc..3ea7d70a 100644 --- a/projects/stargazer/plugins/other/snmp/snmp.cpp +++ b/projects/stargazer/plugins/other/snmp/snmp.cpp @@ -12,7 +12,7 @@ #include "asn1/OpenPDU.h" #include "asn1/ClosePDU.h" -#include "asn1/SMUX-PDUs.h" +#include "asn1/RReqPDU.h" #include "asn1/OBJECT_IDENTIFIER.h" #include "asn1/ber_decoder.h" #include "asn1/der_encoder.h" @@ -20,6 +20,8 @@ #include "snmp.h" #include "stg/common.h" +bool WaitPackets(int sd); + class SNMP_AGENT_CREATOR { private: @@ -32,6 +34,7 @@ public: }; ~SNMP_AGENT_CREATOR() { + printfd(__FILE__, "SNMP_AGENT_CREATOR::~SNMP_AGENT_CREATOR()\n"); delete snmpAgent; }; @@ -48,33 +51,28 @@ PLUGIN * GetPlugin() return sac.GetPlugin(); } -int output(const void * buffer, size_t size, void * data) -{ -int * fd = static_cast(data); -return write(*fd, buffer, size); -} - int SendOpenPDU(int fd) { const char * description = "Stg SNMP Agent"; int oid[] = {1, 3, 6, 1, 4, 1, 9363, 1, 5, 2, 1, 1}; asn_enc_rval_t error; -OpenPDU msg; +OpenPDU_t msg; + +memset(&msg, 0, sizeof(msg)); msg.present = OpenPDU_PR_simple; -asn_long2INTEGER(&msg.choice.simple.version, 1); +asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1); OBJECT_IDENTIFIER_set_arcs(&msg.choice.simple.identity, oid, sizeof(oid[0]), - sizeof(oid)); -OCTET_STRING_fromBuf(&msg.choice.simple.description, - description, - sizeof(description)); -OCTET_STRING_fromBuf(&msg.choice.simple.password, - "", - 0); + 7); +OCTET_STRING_fromString(&msg.choice.simple.description, + description); +OCTET_STRING_fromString(&msg.choice.simple.password, + ""); -error = der_encode(&asn_DEF_OpenPDU, &msg, output, &fd); +char buffer[1024]; +error = der_encode_to_buffer(&asn_DEF_OpenPDU, &msg, buffer, sizeof(buffer)); if (error.encoded == -1) { @@ -84,17 +82,23 @@ if (error.encoded == -1) } else { - printfd(__FILE__, "OpenPDU encoded successfully"); + write(fd, buffer, error.encoded); + printfd(__FILE__, "OpenPDU encoded successfully to %d bytes\n", error.encoded); } return 0; } int SendClosePDU(int fd) { -ClosePDU msg = ClosePDU_goingDown; +ClosePDU_t msg; + +memset(&msg, 0, sizeof(msg)); +asn_long2INTEGER(&msg, ClosePDU_goingDown); + +char buffer[1024]; asn_enc_rval_t error; -error = der_encode(&asn_DEF_ClosePDU, &msg, output, &fd); +error = der_encode_to_buffer(&asn_DEF_ClosePDU, &msg, buffer, sizeof(buffer)); if (error.encoded == -1) { @@ -104,53 +108,63 @@ if (error.encoded == -1) } else { - printfd(__FILE__, "ClosePDU encoded successfully"); + write(fd, buffer, error.encoded); + printfd(__FILE__, "ClosePDU encoded successfully\n"); + } +return 0; +} + +int SendRReqPDU(int fd) +{ +int oid[] = {1, 3, 6, 1, 4, 1, 9363, 1}; +asn_enc_rval_t error; +RReqPDU_t msg; + +memset(&msg, 0, sizeof(msg)); + +msg.priority = 0; +asn_long2INTEGER(&msg.operation, RReqPDU__operation_readOnly); +OBJECT_IDENTIFIER_set_arcs(&msg.subtree, + oid, + sizeof(oid[0]), + 8); + +char buffer[1024]; +error = der_encode_to_buffer(&asn_DEF_RReqPDU, &msg, buffer, sizeof(buffer)); + +if (error.encoded == -1) + { + printfd(__FILE__, "Could not encode RReqPDU (at %s)\n", + error.failed_type ? error.failed_type->name : "unknown"); + return -1; + } +else + { + write(fd, buffer, error.encoded); + printfd(__FILE__, "RReqPDU encoded successfully to %d bytes\n", error.encoded); } return 0; } -int RecvSMUXPDUs(int fd) +SMUX_PDUs_t * RecvSMUXPDUs(int fd) { -char buffer[8192]; -SMUX_PDUs * pdus; +char buffer[1024]; +SMUX_PDUs_t * pdus = NULL; + +memset(buffer, 0, sizeof(buffer)); size_t length = read(fd, buffer, sizeof(buffer)); +if (length < 1) + return NULL; asn_dec_rval_t error; error = ber_decode(0, &asn_DEF_SMUX_PDUs, (void **)&pdus, buffer, length); if(error.code != RC_OK) { printfd(__FILE__, "Failed to decode PDUs at byte %ld\n", (long)error.consumed); - return -1; + return NULL; } -switch (pdus->present) - { - case SMUX_PDUs_PR_NOTHING: - printfd(__FILE__, "PDUs: nothing\n"); - break; - case SMUX_PDUs_PR_open: - printfd(__FILE__, "PDUs: open\n"); - break; - case SMUX_PDUs_PR_close: - printfd(__FILE__, "PDUs: close\n"); - break; - case SMUX_PDUs_PR_registerRequest: - printfd(__FILE__, "PDUs: registerRequest\n"); - break; - case SMUX_PDUs_PR_registerResponse: - printfd(__FILE__, "PDUs: registerResponse\n"); - break; - case SMUX_PDUs_PR_pdus: - printfd(__FILE__, "PDUs: pdus\n"); - break; - case SMUX_PDUs_PR_commitOrRollback: - printfd(__FILE__, "PDUs: commitOrRollback\n"); - break; - default: - printfd(__FILE__, "PDUs: default\n"); - } -asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); -return 0; +return pdus; } int ParseIntInRange(const std::string & str, @@ -229,10 +243,16 @@ SNMP_AGENT::SNMP_AGENT() sock(-1) { pthread_mutex_init(&mutex, NULL); + +handlers[SMUX_PDUs_PR_close] = &SNMP_AGENT::CloseHandler; +handlers[SMUX_PDUs_PR_registerResponse] = &SNMP_AGENT::RegisterResponseHandler; +handlers[SMUX_PDUs_PR_pdus] = &SNMP_AGENT::PDUsHandler; +handlers[SMUX_PDUs_PR_commitOrRollback] = &SNMP_AGENT::CommitOrRollbackHandler; } SNMP_AGENT::~SNMP_AGENT() { +printfd(__FILE__, "SNMP_AGENT::~SNMP_AGENT()\n"); pthread_mutex_destroy(&mutex); } @@ -261,10 +281,9 @@ return 0; int SNMP_AGENT::Stop() { +printfd(__FILE__, "SNMP_AGENT::Stop() - Before\n"); running = false; -close(sock); - if (!stopped) { //5 seconds to thread stops itself @@ -277,16 +296,22 @@ if (!stopped) //after 5 seconds waiting thread still running. now killing it if (!stopped) { + printfd(__FILE__, "SNMP_AGENT::Stop() - failed to stop thread, killing it\n"); if (pthread_kill(thread, SIGINT)) { errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); + printfd(__FILE__, "SNMP_AGENT::Stop() - Cannot kill thread\n"); return -1; } - printfd(__FILE__, "SNMP_AGENT killed Run\n"); + printfd(__FILE__, "SNMP_AGENT::Stop() - killed Run\n"); } } +pthread_join(thread, NULL); + +close(sock); + +printfd(__FILE__, "SNMP_AGENT::Stop() - After\n"); return 0; } @@ -302,13 +327,22 @@ return NULL; void SNMP_AGENT::Run() { SendOpenPDU(sock); +SendRReqPDU(sock); running = true; +stopped = false; +printfd(__FILE__, "SNMP_AGENT::Run() - Before\n"); while(running) { - RecvSMUXPDUs(sock); - struct timespec ts = {1, 0}; - nanosleep(&ts, NULL); + if (WaitPackets(sock)) + { + SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock); + if (pdus) + DispatchPDUs(pdus); + } + if (!running) + break; } +printfd(__FILE__, "SNMP_AGENT::Run() - After\n"); SendClosePDU(sock); stopped = true; } @@ -339,3 +373,88 @@ if (connect(sock, reinterpret_cast(&addr), sizeof(addr))) return false; } + +bool WaitPackets(int sd) +{ +fd_set rfds; +FD_ZERO(&rfds); +FD_SET(sd, &rfds); + +struct timeval tv; +tv.tv_sec = 0; +tv.tv_usec = 500000; + +int res = select(sd + 1, &rfds, NULL, NULL, &tv); +if (res == -1) // Error + { + if (errno != EINTR) + { + printfd(__FILE__, "Error on select: '%s'\n", strerror(errno)); + } + return false; + } + +if (res == 0) // Timeout + { + return false; + } + +return true; +} + +bool SNMP_AGENT::DispatchPDUs(const SMUX_PDUs_t * pdus) +{ +std::map::iterator it; +it = handlers.find(pdus->present); +if (it != handlers.end()) + { + return (this->*(it->second))(pdus); + } +else + { + switch (pdus->present) + { + case SMUX_PDUs_PR_NOTHING: + printfd(__FILE__, "PDUs: nothing\n"); + break; + case SMUX_PDUs_PR_open: + printfd(__FILE__, "PDUs: open\n"); + break; + case SMUX_PDUs_PR_registerRequest: + printfd(__FILE__, "PDUs: registerRequest\n"); + break; + default: + printfd(__FILE__, "PDUs: undefined\n"); + } + asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); + } +return false; +} + +bool SNMP_AGENT::CloseHandler(const SMUX_PDUs_t * pdus) +{ +printfd(__FILE__, "SNMP_AGENT::CloseHandler()\n"); +asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); +return false; +} + +bool SNMP_AGENT::RegisterResponseHandler(const SMUX_PDUs_t * pdus) +{ +printfd(__FILE__, "SNMP_AGENT::RegisterResponseHandler()\n"); +asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); +return false; +} + +bool SNMP_AGENT::PDUsHandler(const SMUX_PDUs_t * pdus) +{ +printfd(__FILE__, "SNMP_AGENT::PDUsHandler()\n"); +asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); +return false; +} + +bool SNMP_AGENT::CommitOrRollbackHandler(const SMUX_PDUs_t * pdus) +{ +printfd(__FILE__, "SNMP_AGENT::CommitOrRollbackHandler()\n"); +asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus); +return false; +} diff --git a/projects/stargazer/plugins/other/snmp/snmp.h b/projects/stargazer/plugins/other/snmp/snmp.h index fe5fa05e..90dba45e 100644 --- a/projects/stargazer/plugins/other/snmp/snmp.h +++ b/projects/stargazer/plugins/other/snmp/snmp.h @@ -4,6 +4,9 @@ #include #include +#include + +#include "asn1/SMUX-PDUs.h" #include "stg/os_int.h" #include "stg/plugin.h" @@ -14,6 +17,9 @@ extern "C" PLUGIN * GetPlugin(); class USER; class SETTINGS; +class SNMP_AGENT; + +typedef bool (SNMP_AGENT::*SNMPPacketHandler)(const SMUX_PDUs_t * pdus); //----------------------------------------------------------------------------- class SNMP_AGENT_SETTINGS { public: @@ -63,6 +69,13 @@ private: void Run(); bool PrepareNet(); + bool DispatchPDUs(const SMUX_PDUs_t * pdus); + + bool CloseHandler(const SMUX_PDUs_t * pdus); + bool RegisterResponseHandler(const SMUX_PDUs_t * pdus); + bool PDUsHandler(const SMUX_PDUs_t * pdus); + bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus); + mutable std::string errorStr; SNMP_AGENT_SETTINGS snmpAgentSettings; MODULE_SETTINGS settings; @@ -73,6 +86,8 @@ private: bool stopped; int sock; + + std::map handlers; }; //-----------------------------------------------------------------------------