Merge pull request #87 from CESNET/fx-probe-interface-in

Added InterfaceIn for Flexprobe data

Author: cejkato2

include/ipfixprobe/ipfix-elements.hpp

@@ -264,6 +264,7 @@ namespace ipxp {
 
 #ifdef WITH_FLEXPROBE
 #define FX_FRAME_SIGNATURE(F)         F(5715,   1010,  18,   nullptr)
+#define FX_INPUT_INTERFACE(F)         F(5715,   1015,   1,   nullptr)
 #define FX_TCP_TRACKING(F)            F(5715,   1020,   1,   nullptr)
 #endif
 
@@ -498,7 +499,7 @@ namespace ipxp {
    F(OSQUERY_SYSTEM_HOSTNAME)
 
 #ifdef WITH_FLEXPROBE
-#define IPFIX_FLEXPROBE_DATA_TEMPLATE(F) F(FX_FRAME_SIGNATURE)
+#define IPFIX_FLEXPROBE_DATA_TEMPLATE(F) F(FX_FRAME_SIGNATURE) F(FX_INPUT_INTERFACE)
 #define IPFIX_FLEXPROBE_TCP_TEMPLATE(F) F(FX_TCP_TRACKING)
 #define IPFIX_FLEXPROBE_ENCR_TEMPLATE(F)
 #else

process/flexprobe-data-processing.cpp

@@ -45,13 +45,13 @@
 
 namespace ipxp {
 
-int FrameSignature::REGISTERED_ID = -1;
+int FlexprobeData::REGISTERED_ID = -1;
 
 __attribute__((constructor)) static void register_this_plugin()
 {
    static PluginRecord rec = PluginRecord("flexprobe-data", [](){return new FlexprobeDataProcessing();});
    register_plugin(&rec);
-   FrameSignature::REGISTERED_ID = register_extension();
+    FlexprobeData::REGISTERED_ID = register_extension();
 }
 
 }

process/flexprobe-data-processing.h

@@ -53,21 +53,25 @@
 
 namespace ipxp {
 
-struct FrameSignature : public RecordExt, public std::array<unsigned char, 18> {
+struct FlexprobeData : public RecordExt {
    static int REGISTERED_ID;
+   std::array<unsigned char, 18> frame_signature;
+   std::uint8_t interface_in;
 
-   FrameSignature() : RecordExt(REGISTERED_ID), std::array<unsigned char, 18>()
+   FlexprobeData() : RecordExt(REGISTERED_ID), interface_in(0)
    {
+       frame_signature.fill(0x0);
    }
 
    virtual int fill_ipfix(uint8_t *buffer, int size)
    {
-       if (sizeof(Flexprobe::FrameSignature) > size) {
+       if ((sizeof(frame_signature) + sizeof(interface_in)) > size) {
            return -1;
        }
-       std::copy(begin(), end(), buffer);
+       std::copy(frame_signature.begin(), frame_signature.end(), buffer);
+       *(buffer + sizeof(frame_signature)) = interface_in;
 
-       return sizeof(Flexprobe::FrameSignature);
+       return frame_signature.size() + sizeof(interface_in);
    }
 
    const char **get_ipfix_tmplt() const
@@ -87,7 +91,7 @@ class FlexprobeDataProcessing : public ProcessPlugin
 
     void init(const char *params) {}
     void close() {}
-    RecordExt *get_ext() const { return new FrameSignature(); }
+    RecordExt *get_ext() const { return new FlexprobeData(); }
     OptionsParser *get_parser() const { return new OptionsParser("flexprobe-data", "Parse flexprobe data (Flexprobe HW only)"); }
     std::string get_name() const { return "flexprobe-data"; }
     FlexprobeDataProcessing *copy() override
@@ -101,11 +105,12 @@ class FlexprobeDataProcessing : public ProcessPlugin
             return 0;
         }
 
-        if (!rec.get_extension(FrameSignature::REGISTERED_ID)) {
-            auto *fs = new FrameSignature();
+        if (!rec.get_extension(FlexprobeData::REGISTERED_ID)) {
+            auto *fd = new FlexprobeData();
             auto data_view = reinterpret_cast<const Flexprobe::FlexprobeData*>(pkt.custom);
-            std::copy(data_view->frame_signature.begin(), data_view->frame_signature.end(), fs->begin());
-            rec.add_extension(fs);
+            std::copy(data_view->frame_signature.begin(), data_view->frame_signature.end(), fd->frame_signature.begin());
+            fd->interface_in = data_view->interface_in;
+            rec.add_extension(fd);
         }
         return 0;
     }