vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-20 09:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added support for sFlow sample packet drops

Browse source
This commit is contained in:
Luca Deri 2017-11-18 13:34:36 +01:00
parent 6d6238c7fd
commit 29ede6ff67
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ParserInterface.cpp
View file

@ -492,7 +492,8 @@ int ParserInterface::getKeyId(char *sym) {
/* **************************************************** */
u_int8_t ParserInterface::parseEvent(char *payload, int payload_size, u_int8_t source_id, void *data) {
u_int8_t ParserInterface::parseEvent(char *payload, int payload_size,
u_int8_t source_id, void *data) {
json_object *o;
enum json_tokener_error jerr = json_tokener_success;
NetworkInterface * iface = (NetworkInterface*)data;
@ -544,15 +545,21 @@ u_int8_t ParserInterface::parseEvent(char *payload, int payload_size, u_int8_t s
if(json_object_object_get_ex(o, "drops", &w)) {
if(json_object_object_get_ex(w, "export_queue_too_long", &z))
zrs->export_queue_too_long = (u_int32_t)json_object_get_int64(z);
if(json_object_object_get_ex(w, "too_many_flows", &z))
zrs->too_many_flows = (u_int32_t)json_object_get_int64(z);
if(json_object_object_get_ex(w, "elk_flow_drops", &z))
zrs->elk_flow_drops = (u_int32_t)json_object_get_int64(z);
if(json_object_object_get_ex(w, "sflow_pkt_sample_drops", &z))
zrs->sflow_pkt_sample_drops = (u_int32_t)json_object_get_int64(z);
}
if(json_object_object_get_ex(o, "zmq", &w)) {
if(json_object_object_get_ex(w, "num_flow_exports", &z))
zrs->num_flow_exports = (u_int64_t)json_object_get_int64(z);
if(json_object_object_get_ex(w, "num_exporters", &z))
zrs->num_exporters = (u_int8_t)json_object_get_int(z);
}
@ -578,8 +585,10 @@ u_int8_t ParserInterface::parseEvent(char *payload, int payload_size, u_int8_t s
static_cast<ParserInterface*>(iface)->setRemoteStats(zrs);
if(flowHashing) {
FlowHashing *current, *tmp;
HASH_ITER(hh, flowHashing, current, tmp) {
ZMQ_RemoteStats *zrscopy = (ZMQ_RemoteStats*)malloc(sizeof(ZMQ_RemoteStats));
if(zrscopy)
memcpy(zrscopy, zrs, sizeof(ZMQ_RemoteStats));
@ -591,7 +600,7 @@ u_int8_t ParserInterface::parseEvent(char *payload, int payload_size, u_int8_t s
json_object_put(o);
} else {
// if o != NULL
if(!once){
if(!once) {
ntop->getTrace()->traceEvent(TRACE_WARNING,
"Invalid message received: "
"your nProbe sender is outdated, data encrypted, invalid JSON, or oom?");
@ -968,7 +977,7 @@ u_int8_t ParserInterface::parseFlow(char *payload, int payload_size, u_int8_t so
}
} else {
// if o != NULL
if(!once){
if(!once) {
ntop->getTrace()->traceEvent(TRACE_WARNING,
"Invalid message received: your nProbe sender is outdated, data encrypted or invalid JSON?");
ntop->getTrace()->traceEvent(TRACE_WARNING, "JSON Parse error [%s] payload size: %u payload: %s",
@ -1036,7 +1045,7 @@ u_int8_t ParserInterface::parseCounter(char *payload, int payload_size, u_int8_t
json_object_put(o);
} else {
// if o != NULL
if(!once){
if(!once) {
ntop->getTrace()->traceEvent(TRACE_WARNING,
"Invalid message received: your nProbe sender is outdated, data encrypted or invalid JSON?");
ntop->getTrace()->traceEvent(TRACE_WARNING, "JSON Parse error [%s] payload size: %u payload: %s",
@ -1073,6 +1082,7 @@ void ParserInterface::setRemoteStats(ZMQ_RemoteStats *zrs) {
if(zmq_remote_stats_shadow) free(zmq_remote_stats_shadow);
zmq_remote_stats_shadow = zmq_remote_stats;
zmq_remote_stats = zrs;
/*
* Don't override ethStats here, these stats are properly updated
* inside NetworkInterface::processFlow for ZMQ interfaces.
@ -1087,6 +1097,7 @@ void ParserInterface::setRemoteStats(ZMQ_RemoteStats *zrs) {
void ParserInterface::lua(lua_State* vm) {
ZMQ_RemoteStats *zrs = zmq_remote_stats;
NetworkInterface::lua(vm);
if(zrs) {