farrokhi/nfdump
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong offset calculation if unknown options are found

Browse Source
This commit is contained in:
Peter Haag 2017-12-21 17:21:44 +01:00
parent adfd5e9631
commit b776f8df70
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
2017-12-21 2017-12-21
- Fix wrong offset calculation if unknown options are found
- Add x-late src/dst ip aggregation, if compiled with NSEL support - Add x-late src/dst ip aggregation, if compiled with NSEL support
2017-12-17 2017-12-17

5
bin/netflow_v9.c
View File

@ -1401,6 +1401,7 @@ uint16_t offset_std_sampler_interval, offset_std_sampler_algorithm, found_std_sa
dbg_printf("Option field Type: %u, length %u\n", type, length); dbg_printf("Option field Type: %u, length %u\n", type, length);
if ( !index ) { if ( !index ) {
dbg_printf("Unsupported: Option field Type: %u, length %u\n", type, length); dbg_printf("Unsupported: Option field Type: %u, length %u\n", type, length);
offset += length;
continue; continue;
} }
while ( index && v9_element_map[index].id == type ) { while ( index && v9_element_map[index].id == type ) {
@ -1413,6 +1414,7 @@ uint16_t offset_std_sampler_interval, offset_std_sampler_algorithm, found_std_sa
if ( index && v9_element_map[index].length != length ) { if ( index && v9_element_map[index].length != length ) {
LogError("Process_v9: Option field Type: %u, length %u not supported\n", type, length); LogError("Process_v9: Option field Type: %u, length %u not supported\n", type, length);
dbg_printf("Process_v9: Option field Type: %u, length %u not supported\n", type, length); dbg_printf("Process_v9: Option field Type: %u, length %u not supported\n", type, length);
offset += length;
continue; continue;
} }
switch (type) { switch (type) {
@ -1450,7 +1452,8 @@ uint16_t offset_std_sampler_interval, offset_std_sampler_algorithm, found_std_sa
dbg_printf("[%u] Sampling information found\n", exporter->info.id); dbg_printf("[%u] Sampling information found\n", exporter->info.id);
InsertSamplerOffset(fs, id, offset_sampler_id, sampler_id_length, offset_sampler_mode, offset_sampler_interval); InsertSamplerOffset(fs, id, offset_sampler_id, sampler_id_length, offset_sampler_mode, offset_sampler_interval);
} else if ( found_std_sampling == 2 ) { // need all two tags } else if ( found_std_sampling == 2 ) { // need all two tags
dbg_printf("[%u] Std sampling information found\n", exporter->info.id); dbg_printf("[%u] Std sampling information found. offset intervall: %u, offset algo: %u\n",
exporter->info.id, offset_std_sampler_interval, offset_std_sampler_algorithm);
InsertStdSamplerOffset(fs, id, offset_std_sampler_interval, offset_std_sampler_algorithm); InsertStdSamplerOffset(fs, id, offset_std_sampler_interval, offset_std_sampler_algorithm);
} else { } else {
dbg_printf("[%u] No Sampling information found\n", exporter->info.id); dbg_printf("[%u] No Sampling information found\n", exporter->info.id);