Skip to content

Commit 05b8e6b

Browse files
committed
Add CTT support
1 parent ff070de commit 05b8e6b

File tree

15 files changed

+515
-236
lines changed

15 files changed

+515
-236
lines changed

include/ipfixprobe/flowifc.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ struct Flow : public Record {
267267

268268
#ifdef WITH_CTT
269269
uint64_t flow_hash_ctt; /**< Flow hash for CTT. */
270-
bool record_in_ctt; /**< CTT - offload or not. */
271-
bool is_delayed; /**< Delayed export flag. */
272-
time_t delay_time; /**< Time until export of the flow is delayed. */
273270
#endif
274271

275272
PluginsStatus plugins_status; /**< Statuses of the process plugins for this flow, used to check

include/ipfixprobe/packet.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#ifndef IPXP_PACKET_HPP
3333
#define IPXP_PACKET_HPP
34-
//#define WITH_CTT 1 // TODO REMOVE
3534

3635
#include <stdint.h>
3736
#include <stdlib.h>
@@ -47,7 +46,7 @@ namespace ipxp {
4746
* \brief Structure for storing parsed packet fields
4847
*/
4948
struct Packet : public Record {
50-
struct timeval ts;
49+
timeval ts;
5150

5251
uint8_t dst_mac[6];
5352
uint8_t src_mac[6];

include/ipfixprobe/storage.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class StoragePlugin : public Plugin
9393
virtual void export_expired(time_t ts)
9494
{
9595
}
96+
9697
virtual void finish()
9798
{
9899
}
@@ -189,12 +190,6 @@ class StoragePlugin : public Plugin
189190
*/
190191
int plugins_post_create(Flow& rec, const Packet& pkt)
191192
{
192-
// if metadata are valid, add flow hash ctt to the flow record
193-
#ifdef WITH_CTT
194-
if (pkt.cttmeta_valid) {
195-
rec.flow_hash_ctt = pkt.cttmeta.flow_hash;
196-
}
197-
#endif /* WITH_CTT */
198193
PluginStatusConverter plugin_status_converter(m_plugins_status);
199194
int ret = 0;
200195
for (unsigned int i = 0; i < m_plugin_cnt; i++) {

0 commit comments

Comments
 (0)