constcast/vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused class ExpressFlowMetering

Browse Source 
git-svn-id: file:///Users/braun/svn/vermont/trunk/vermont@987 aef3b71b-58ee-0310-9ba9-8811b9f0742f
This commit is contained in:
limmer 2007-07-26 14:34:31 +00:00
parent 8c01595f1d
commit 0fbcfeda95
8 changed files with 2 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -20,8 +20,8 @@ packetselection_configuration.h packetselection_configuration.cc \
packetreporting_configuration.h packetreporting_configuration.cc \
flowmetering_configuration.h flowmetering_configuration.cc \
dbwriter_configuration.h dbwriter_configuration.cc \
dbreader_configuration.h dbreader_configuration.cc \
expressflowmetering_configuration.h expressflowmetering_configuration.cc
dbreader_configuration.h dbreader_configuration.cc
AM_CFLAGS=-I$(top_srcdir) `xml2-config --cflags` $(MYSQL_CFLAGS) -Wall -Werror
AM_CXXFLAGS=$(AM_CFLAGS)

1
collector_configuration.cc
View File

@ -7,7 +7,6 @@
#include "collector_configuration.h"
#include "metering_configuration.h"
#include "flowmetering_configuration.h"
#include "expressflowmetering_configuration.h"
#include "exporter_configuration.h"
#include "dbwriter_configuration.h"

1
dbreader_configuration.cc
View File

@ -9,7 +9,6 @@
#include "exporter_configuration.h"
#include "metering_configuration.h"
#include "flowmetering_configuration.h"
#include "expressflowmetering_configuration.h"
#include "common/msg.h"

215
expressflowmetering_configuration.cc
View File

@ -1,215 +0,0 @@
/*
released under GPL v2
(C) by Lothar Braun <mail@lobraun.de>
*/
#include "expressflowmetering_configuration.h"
#include "common/msg.h"
ExpressFlowMeteringConfiguration::ExpressFlowMeteringConfiguration(xmlDocPtr doc, xmlNodePtr start)
: Configuration(doc, start), ipfixAggregator(0), running(false)
{
}
ExpressFlowMeteringConfiguration::~ExpressFlowMeteringConfiguration()
{
if (ipfixAggregator) {
stopSystem();
delete ipfixAggregator;
}
}
void ExpressFlowMeteringConfiguration::configure()
{
msg(MSG_INFO, "ExpressFlowMeteringConfiguration: Start reading expressflowMetering section");
xmlNodePtr i = start->xmlChildrenNode;
// if (!observationIdSet) {
// throw std::runtime_error("MeteringConfiguration: Observation id for aggregator isn't set yet. But we need one right now!");
// }
unsigned minBufferTime = 0;
unsigned maxBufferTime = 0;
Rules* rules = new Rules;
while (NULL != i) {
if (tagMatches(i, "rule")) {
Rule* r = readRule(i);
if (r->fieldCount > 0) {
rules->rule[rules->count++] = r;
}
} else if (tagMatches(i, "expiration")) {
xmlNodePtr j = i->xmlChildrenNode;
while (NULL != j) {
if (tagMatches(j, "activeTimeout")) {
minBufferTime = getTimeInSecs(j);
} else if (tagMatches(j, "inactiveTimeout")) {
maxBufferTime = getTimeInSecs(j);
}
j = j->next;
}
}
i = i->next;
}
ipfixAggregator = new IpfixAggregator(rules, minBufferTime, maxBufferTime);
if (!ipfixAggregator) {
throw std::runtime_error("MeteringConfiguration: Could not create aggregator");
}
msg(MSG_INFO, "FlowMeteringConfiguration: Successfully parsed flowMetering section for Express Aggregator");
}
void ExpressFlowMeteringConfiguration::setUp()
{
// nothing to perform before connect()
}
Rule* ExpressFlowMeteringConfiguration::readRule(xmlNodePtr p) {
// nonflowkey -> aggregate
// flowkey -> keep
xmlNodePtr i = p->xmlChildrenNode;
Rule* rule = new Rule();
while (NULL != i) {
if (tagMatches(i, "templateId")) {
rule->id = atoi(getContent(i).c_str());
} else if (tagMatches(i, "flowKey")) {
try {
InfoElementId ie(i, *this);
Rule::Field* ruleField = new Rule::Field();
if (ie.getModifier().empty()) {
ruleField->modifier = Rule::Field::KEEP;
} else if (ie.getModifier() == "discard") {
ruleField->modifier = Rule::Field::DISCARD;
} else {
ruleField->modifier = (Rule::Field::Modifier)((int)Rule::Field::MASK_START + atoi(ie.getModifier().c_str() + 5));
}
if (ie.getIeName() != "") {
if (0 == (ruleField->type.id = string2typeid(ie.getIeName().c_str()))) {
msg(MSG_ERROR, "Bad field type \"%s\"", ie.getIeName().c_str());
throw std::exception();
}
} else {
ruleField->type.id = atoi(ie.getIeId().c_str());
}
if (ie.getIeLength() != "") {
ruleField->type.length = atoi(ie.getIeLength().c_str());
} else {
if (0 == (ruleField->type.length = string2typelength(ie.getIeName().c_str()))) {
msg(MSG_ERROR, "Bad field type \"%s\", l.%s", ie.getIeName().c_str(), ie.getIeLength().c_str());
throw std::exception();
}
}
if ((ruleField->type.id == IPFIX_TYPEID_sourceIPv4Address) || (ruleField->type.id == IPFIX_TYPEID_destinationIPv4Address)) {
ruleField->type.length++; // for additional mask field
}
if (!ie.getMatch().empty()) {
/* TODO: we need to
copy the string
because
parseProtoPattern
and
parseIPv4Pattern
violate the
original string
*/
char* tmp = new char[ie.getMatch().length() + 1];
strcpy(tmp, ie.getMatch().c_str());
ruleField->pattern = NULL;
switch (ruleField->type.id) {
case IPFIX_TYPEID_protocolIdentifier:
if (parseProtoPattern(tmp, &ruleField->pattern, &ruleField->type.length) != 0) {
msg(MSG_ERROR, "Bad protocol pattern \"%s\"", tmp);
throw std::exception();
}
break;
case IPFIX_TYPEID_sourceIPv4Address:
case IPFIX_TYPEID_destinationIPv4Address:
if (parseIPv4Pattern(tmp, &ruleField->pattern, &ruleField->type.length) != 0) {
msg(MSG_ERROR, "Bad IPv4 pattern \"%s\"", tmp);
throw std::exception();
}
break;
case IPFIX_TYPEID_sourceTransportPort:
case IPFIX_TYPEID_destinationTransportPort:
if (parsePortPattern(tmp, &ruleField->pattern, &ruleField->type.length) != 0) {
msg(MSG_ERROR, "Bad PortRanges pattern \"%s\"", tmp);
throw std::exception();
}
break;
case IPFIX_TYPEID_tcpControlBits:
if (parseTcpFlags(tmp, &ruleField->pattern, &ruleField->type.length) != 0) {
msg(MSG_ERROR, "Bad TCP flags pattern \"%s\"", tmp);
throw std::exception();
}
break;
default:
msg(MSG_ERROR, "Fields of type \"%s\" cannot be matched against a pattern %s", "", tmp);
throw std::exception();
break;
}
}
rule->field[rule->fieldCount++] = ruleField;
} catch (std::exception e) {}
} else if (tagMatches(i, "nonFlowKey")) {
InfoElementId ie(i, *this);
Rule::Field* ruleField = new Rule::Field();
ruleField->modifier = Rule::Field::AGGREGATE;
if (ie.getIeName() != "") {
if (0 == (ruleField->type.id = string2typeid(ie.getIeName().c_str()))) {
msg(MSG_ERROR, "Bad field type \"%s\"", ie.getIeName().c_str());
throw std::exception();
}
} else {
ruleField->type.id = atoi(ie.getIeId().c_str());
}
if (ie.getIeLength() != "") {
ruleField->type.length = atoi(ie.getIeLength().c_str());
} else {
if (0 == (ruleField->type.length = string2typelength(ie.getIeName().c_str()))) {
msg(MSG_ERROR, "Bad field type \"%s\", l.%s", ie.getIeName().c_str(), ie.getIeLength().c_str());
throw std::exception();
}
}
if ((ruleField->type.id == IPFIX_TYPEID_sourceIPv4Address) || (ruleField->type.id == IPFIX_TYPEID_destinationIPv4Address)) {
ruleField->type.length++; // for additional mask field
}
rule->field[rule->fieldCount++] = ruleField;
}
i = i->next;
}
msg(MSG_INFO, "Got aggregation rule: ");
rule->print();
return rule;
}
void ExpressFlowMeteringConfiguration::connect(Configuration*)
{
}
void ExpressFlowMeteringConfiguration::startSystem()
{
if (running) return;
msg(MSG_DEBUG, "Starting Express aggregator");
ipfixAggregator->start();
ipfixAggregator->runSink();
running = true;
}
void ExpressFlowMeteringConfiguration::stopSystem()
{
if (!running) return;
msg(MSG_DEBUG, "Stopping aggregator");
ipfixAggregator->terminateSink();
ipfixAggregator->stop();
running = false;
}

40
expressflowmetering_configuration.h
View File

@ -1,40 +0,0 @@
/*
released under GPL v2
(C) by Lothar Braun <mail@lobraun.de>
*/
#ifndef EXPRESSFLOWMETERING_CONFIGURATION_H_
#define EXPRESSFLOWMETERING_CONFIGURATION_H_
#include "ipfix_configuration.h"
#include <concentrator/IpfixAggregator.hpp>
#include <concentrator/Rules.hpp>
class MeteringConfiguration;
class ExpressFlowMeteringConfiguration : public Configuration {
public:
ExpressFlowMeteringConfiguration(xmlDocPtr doc, xmlNodePtr start);
~ExpressFlowMeteringConfiguration();
virtual void configure();
virtual void setUp();
virtual void connect(Configuration*);
virtual void startSystem();
virtual void stopSystem();
IpfixAggregator* getIpfixExpressAggregator() { return ipfixAggregator; }
protected:
Rule* readRule(xmlNodePtr i);
IpfixAggregator* ipfixAggregator;
bool running; /**< true between calls to startSystem() and stopSystem() */
friend class MeteringConfiguration;
};
#endif /* !EXPRESSFLOWMETERING_CONFIGURATION_H_ */

1
ipfix_configuration.cc
View File

@ -4,7 +4,6 @@
#include "collector_configuration.h"
#include "exporter_configuration.h"
#include "flowmetering_configuration.h"
//#include "expressflowmetering_configuration.h"
#include "vermontmain_configuration.h"
#include "dbwriter_configuration.h"
#include "dbreader_configuration.h"

1
metering_configuration.cc
View File

@ -9,7 +9,6 @@
#include "packetselection_configuration.h"
#include "packetreporting_configuration.h"
#include "flowmetering_configuration.h"
#include "expressflowmetering_configuration.h"
#include "dbwriter_configuration.h"
#include <sampler/Filter.h>

1
observer_configuration.cc
View File

@ -8,7 +8,6 @@
#include "metering_configuration.h"
#include "packetselection_configuration.h"
#include "flowmetering_configuration.h"
#include "expressflowmetering_configuration.h"
#include "common/msg.h"
#include <sampler/Template.h>