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

IPFIX add fwd status tag #89 compatible to v9 (1byte)

Browse Source
This commit is contained in:
Peter Haag 2018-01-01 14:20:39 +01:00
parent c400f52d66
commit 0ea114f8ce
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
2018-01-01 2018-01-01
- IPFIX time stamps - Fix elements #21,#22 offset calculation, but timestamps not yet evaluated. (#160) - IPFIX time stamps - Fix elements #21,#22 offset calculation, but timestamps not yet evaluated. (#160)
- IPFIX add fwd status tag #89 compatible to v9 (1byte)
2017-12-31 2017-12-31
- IPFIX sampling - sampling algorithm no longer required for tag #34 - IPFIX sampling - sampling algorithm no longer required for tag #34

3
bin/ipfix.c
View File

@ -209,6 +209,7 @@ static struct ipfix_element_map_s {
{ IPFIX_octetTotalCount, _4bytes, _8bytes, move32_sampling, zero64, COMMON_BLOCK }, { IPFIX_octetTotalCount, _4bytes, _8bytes, move32_sampling, zero64, COMMON_BLOCK },
{ IPFIX_packetTotalCount, _8bytes, _8bytes, move64_sampling, zero64, COMMON_BLOCK }, { IPFIX_packetTotalCount, _8bytes, _8bytes, move64_sampling, zero64, COMMON_BLOCK },
{ IPFIX_packetTotalCount, _4bytes, _8bytes, move32_sampling, zero64, COMMON_BLOCK }, { IPFIX_packetTotalCount, _4bytes, _8bytes, move32_sampling, zero64, COMMON_BLOCK },
{ IPFIX_forwardingStatus, _1byte, _1byte, move8, zero8, COMMON_BLOCK },
{ IPFIX_protocolIdentifier, _1byte, _1byte, move8, zero8, COMMON_BLOCK }, { IPFIX_protocolIdentifier, _1byte, _1byte, move8, zero8, COMMON_BLOCK },
{ IPFIX_ipClassOfService, _1byte, _1byte, move8, zero8, COMMON_BLOCK }, { IPFIX_ipClassOfService, _1byte, _1byte, move8, zero8, COMMON_BLOCK },
{ IPFIX_tcpControlBits, _1byte, _1byte, move8, zero8, COMMON_BLOCK }, { IPFIX_tcpControlBits, _1byte, _1byte, move8, zero8, COMMON_BLOCK },
@ -685,7 +686,7 @@ size_t size_required;
dbg_printf("Time stamp: No known format found\n"); dbg_printf("Time stamp: No known format found\n");
offset = BYTE_OFFSET_first + 8; offset = BYTE_OFFSET_first + 8;
} }
offset +=1; // Skip netflow v9 fwd status PushSequence( table, IPFIX_forwardingStatus, &offset, NULL);
PushSequence( table, IPFIX_tcpControlBits, &offset, NULL); PushSequence( table, IPFIX_tcpControlBits, &offset, NULL);
PushSequence( table, IPFIX_protocolIdentifier, &offset, NULL); PushSequence( table, IPFIX_protocolIdentifier, &offset, NULL);
PushSequence( table, IPFIX_ipClassOfService, &offset, NULL); PushSequence( table, IPFIX_ipClassOfService, &offset, NULL);

1
bin/ipfix.h
View File

@ -269,6 +269,7 @@ typedef struct ipfix_template_elements_e_s {
#define IPFIX_postSourceMacAddress 81 #define IPFIX_postSourceMacAddress 81
#define IPFIX_octetTotalCount 85 #define IPFIX_octetTotalCount 85
#define IPFIX_packetTotalCount 86 #define IPFIX_packetTotalCount 86
#define IPFIX_forwardingStatus 89
#define IPFIX_flowStartMilliseconds 152 #define IPFIX_flowStartMilliseconds 152
#define IPFIX_flowEndMilliseconds 153 #define IPFIX_flowEndMilliseconds 153
#define IPFIX_flowStartDeltaMicroseconds 158 #define IPFIX_flowStartDeltaMicroseconds 158