wanderer/fastnetmon-rewritten
1
0
Fork 0
mirror of https://github.com/pavel-odintsov/fastnetmon synced 2024-11-23 13:22:36 +01:00
Code Issues Releases Activity

Yehhaaaa! NetFlow v9 working now

Browse Source
This commit is contained in:
Pavel Odintsov 2015-01-28 19:56:41 +03:00
parent caf5cdc885
commit c03fedf12a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netflow_plugin/netflow.h
View File

@ -29,8 +29,7 @@ struct peer_nf9_record {
u_int len;
};
typedef std::map <u_int, u_int> netflow9_template_records_map;
typedef std::vector <struct peer_nf9_record> netflow9_template_records_map;
/* A NetFlow v.9 template record */
struct peer_nf9_template {
@ -38,7 +37,6 @@ struct peer_nf9_template {
u_int num_records;
u_int total_len;
netflow9_template_records_map records;
//std::vector <struct peer_nf9_record> records;
};

12
netflow_plugin/netflow_collector.cpp
View File

@ -84,9 +84,13 @@ int process_netflow_v9_template(u_int8_t *pkt, size_t len, u_int32_t source_id)
u_int record_type = ntohs(tmplr->type);
u_int record_length = ntohs(tmplr->length);
template_records_map[record_type] = record_length;
struct peer_nf9_record current_record;
current_record.type = record_type;
current_record.len = record_length;
//logger<< log4cpp::Priority::INFO<<"type: "<<ntohs(tmplr->type)<<" length:"<<ntohs(tmplr->length);
template_records_map.push_back(current_record);
logger<< log4cpp::Priority::INFO<<"Learn new template type: "<<ntohs(tmplr->type)<<" length:"<<ntohs(tmplr->length);
offset += sizeof(*tmplr);
total_size += record_length;
@ -172,8 +176,8 @@ int nf9_flowset_to_store(u_int8_t *pkt, size_t len, struct NF9_HEADER *nf9_hdr,
// We should iterate over all available template fields
for (netflow9_template_records_map::iterator iter = template_records.begin(); iter != template_records.end(); iter++) {
u_int record_type = iter->first;
u_int record_length = iter->second;
u_int record_type = iter->type;
u_int record_length = iter->len;
nf9_rec_to_flow(record_type, record_length, pkt + offset, packet);
logger<< log4cpp::Priority::INFO<<"Read data with type: "<<record_type<<" and length:"<<record_length;