Merge pull request #127 from CESNET/ipfix_dir_bit_field

ipfix: Changed data type of dir_bit_field to uint32_t

Author: cejkato2

include/ipfixprobe/ipfix-elements.hpp

@@ -92,7 +92,7 @@ namespace ipxp {
 #define FLOW_START_USEC(F)            F(0,      154,    8,   (temp = MK_NTP_TS(flow.time_first), &temp))
 #define FLOW_END_USEC(F)              F(0,      155,    8,   (temp = MK_NTP_TS(flow.time_last), &temp))
 #define OBSERVATION_MSEC(F)           F(0,      323,    8,   nullptr)
-#define INPUT_INTERFACE(F)            F(0,       10,    2,   &this->dir_bit_field)
+#define INPUT_INTERFACE(F)            F(0,       10,    4,   &this->dir_bit_field)
 #define OUTPUT_INTERFACE(F)           F(0,       14,    2,   nullptr)
 #define FLOW_END_REASON(F)            F(0,      136,    1,   &flow.end_reason)
 

output/ipfix.hpp

@@ -74,7 +74,7 @@ class IpfixOptParser : public OptionsParser
    uint16_t m_mtu;
    bool m_udp;
    uint64_t m_id;
-   uint8_t m_dir;
+   uint32_t m_dir;
    bool m_verbose;
 
    IpfixOptParser() : OptionsParser("ipfix", "Output plugin for ipfix export"),
@@ -268,7 +268,7 @@ class IPFIXExporter : public OutputPlugin
    uint32_t odid; /**< Observation Domain ID */
    uint32_t templateRefreshTime; /**< UDP template refresh time interval */
    uint32_t templateRefreshPackets; /**< UDP template refresh packet interval */
-   uint8_t dir_bit_field;     /**< Direction bit field value. */
+   uint32_t dir_bit_field;     /**< Direction bit field value. */
 
    uint16_t mtu; /**< Max size of packet payload sent */
    uint8_t *packetDataBuffer; /**< Data buffer to store packet */