Fix ctt

Makefile.am

@@ -70,6 +70,14 @@ ipfixprobe_storage_src=\
 		storage/fragmentationCache/fragmentationCache.cpp \
 		storage/cache.cpp \
 		storage/cache.hpp \
+		storage/cacheOptParser.hpp \
+		storage/cacheOptParser.cpp \
+		storage/flowRecord.hpp \
+		storage/flowRecord.cpp \
+		storage/cttController.hpp \
+		storage/cttController.cpp \
+		storage/cacheRowSpan.hpp \
+		storage/cacheRowSpan.cpp \
 		storage/xxhash.c \
 		storage/xxhash.h
 

include/ipfixprobe/flowifc.hpp

@@ -267,9 +267,6 @@ struct Flow : public Record {
 
     #ifdef WITH_CTT
       uint64_t flow_hash_ctt;     /**< Flow hash for CTT. */
-      bool record_in_ctt;         /**< CTT - offload or not. */
-      bool is_delayed;            /**< Delayed export flag. */
-      time_t delay_time;          /**< Time until export of the flow is delayed. */
     #endif
 
     PluginsStatus plugins_status; /**< Statuses of the process plugins for this flow, used to check

include/ipfixprobe/packet.hpp

@@ -46,11 +46,7 @@ namespace ipxp {
  * \brief Structure for storing parsed packet fields
  */
 struct Packet : public Record {
-   #ifdef WITH_CTT
-      Metadata_CTT cttmeta; /**< Metadata from CTT */
-      bool cttmeta_valid; /**< True if CTT metadata is valid */
-   #endif /* WITH_CTT */
-   struct timeval ts;
+   timeval ts;
 
    uint8_t     dst_mac[6];
    uint8_t     src_mac[6];
@@ -106,12 +102,16 @@ struct Packet : public Record {
    uint16_t    buffer_size; /**< Size of buffer */
 
    bool        source_pkt; /**< Direction of packet from flow point of view */
+#ifdef WITH_CTT
+   Metadata_CTT cttmeta; /**< Metadata from CTT */
+   bool cttmeta_valid; /**< True if CTT metadata is valid */
+#endif /* WITH_CTT */
 
    /**
     * \brief Constructor.
     */
    Packet() :
-      cttmeta_valid(false), ts({0}),
+      ts({0}),
       dst_mac(), src_mac(), ethertype(0),
       ip_len(0), ip_payload_len(0), ip_version(0), ip_ttl(0),
       ip_proto(0), ip_tos(0), ip_flags(0), src_ip({0}), dst_ip({0}), vlan_id(0),
@@ -123,6 +123,9 @@ struct Packet : public Record {
       custom(nullptr), custom_len(0),
       buffer(nullptr), buffer_size(0),
       source_pkt(true)
+#ifdef WITH_CTT
+      ,cttmeta_valid(false)
+#endif /* WITH_CTT */
    {
    }
 };

include/ipfixprobe/storage.hpp

@@ -93,6 +93,7 @@ class StoragePlugin : public Plugin
    virtual void export_expired(time_t ts)
    {
    }
+
    virtual void finish()
    {
    }
@@ -133,22 +134,22 @@ class StoragePlugin : public Plugin
 
    /**
      * \brief Checks if process plugins require all available data.
-     * \param [in] rec Stored flow record.
+     * \param [in] flow Stored flow record.
      * \return True if all data required, false otherwise.
     */
    bool all_data_required(const Flow& flow) const noexcept
    {
-       return m_plugins_status.get_all_data.any();
+       return flow.plugins_status.get_all_data.any();
    }
 
    /**
      * \brief Checks if process plugins don't require any data.
-     * \param [in] rec Stored flow record.
+     * \param [in] flow Stored flow record.
      * \return True if no data required, false otherwise.
     */
    bool no_data_required(const Flow& flow) const noexcept
    {
-       return m_plugins_status.get_no_data.all();
+       return flow.plugins_status.get_no_data.all();
    }
 
    /**
@@ -189,10 +190,6 @@ class StoragePlugin : public Plugin
      */
     int plugins_post_create(Flow& rec, const Packet& pkt)
     {
-        // if metadata are valid, add flow hash ctt to the flow record
-        if (pkt.cttmeta_valid) {
-            rec.flow_hash_ctt = pkt.cttmeta.flow_hash;
-        }
         PluginStatusConverter plugin_status_converter(m_plugins_status);
         int ret = 0;
         for (unsigned int i = 0; i < m_plugin_cnt; i++) {

input/parser.cpp

@@ -777,6 +777,7 @@ void parse_packet(parser_opt_t *opt, ParserStats& stats, struct timeval ts, cons
    opt->pblock->bytes += len;
 }
 
+#ifdef WITH_CTT
 int parse_packet_ctt_metadata(parser_opt_t *opt, ParserStats& stats, const Metadata_CTT& metadata, const uint8_t *data, uint16_t len, uint16_t caplen)
 {
    if (opt->pblock->cnt >= opt->pblock->size) {
@@ -892,5 +893,5 @@ int parse_packet_ctt_metadata(parser_opt_t *opt, ParserStats& stats, const Metad
    opt->pblock->bytes += len;
    return 0;
 }
-
+#endif /* WITH_CTT */
 }