unirec: translate, configure can now compile

jaroslavh · cejkato2 · commit 4430f308bd67 · 2018-07-18T14:55:57.000+02:00
- copied more files from previous iteration of ipfix
diff --git a/extra_plugins/output/unirec/configuration.c b/extra_plugins/output/unirec/configuration.c
@@ -78,12 +78,12 @@ enum params_xml_nodes {
 /** Definition of the \<params\> node  */
 static const struct fds_xml_args args_params[] = {
     FDS_OPTS_ROOT("params"),
-    FDS_OPTS_ELEM(NODE_TRAP_IFC_TYPE,          "trapIfcType",         FDS_OPTS_T_STRING, 0),
+    FDS_OPTS_ELEM(NODE_TRAP_IFC_TYPE,          "trapIfcType",         FDS_OPTS_T_INT, 0),
     FDS_OPTS_ELEM(NODE_TRAP_IFC_SOCKET,        "trapIfcSocket",       FDS_OPTS_T_STRING, 0),
     FDS_OPTS_ELEM(NODE_TRAP_IFC_TIMEOUT,       "trapIfcTimeout",      FDS_OPTS_T_STRING, 0),
     FDS_OPTS_ELEM(NODE_TRAP_IFC_FLUSH_TIMEOUT, "trapIfcFlushTimeout", FDS_OPTS_T_STRING, 0),
     FDS_OPTS_ELEM(NODE_TRAP_IFC_BUFFER_SWITCH, "trapIfcBufferSwitch", FDS_OPTS_T_STRING, 0),
-    FDS_OPTS_ELEM(NODE_UNIREC FORMAT,          "UniRecFormat",        FDS_OPTS_T_STRING, 0),
+    FDS_OPTS_ELEM(NODE_UNIREC_FORMAT,          "UniRecFormat",        FDS_OPTS_T_STRING, 0),
     FDS_OPTS_END
 };
 
@@ -98,7 +98,7 @@ configuration_validate(ipx_ctx_t *ctx, const struct conf_params *cfg)
 {
     int ret_code = IPX_OK;
 
-    if (!cfg.trap_ifc_type) {
+    if (!cfg->trap_ifc_type) {
         IPX_CTX_ERROR(ctx, "Trap interface type is not set.", '\0');
         ret_code = IPX_ERR_FORMAT;
     }
@@ -129,8 +129,8 @@ configuration_parse_root(ipx_ctx_t *ctx, fds_xml_ctx_t *root, struct conf_params
     while(fds_xml_next(root, &content) != FDS_EOC) {
         switch (content->id) {
         case NODE_TRAP_IFC_TYPE:
-            assert(content->type == FDS_OPTS_T_STRING);
-            cnf->trap_ifc_type = content->ptr_string;
+            assert(content->type == FDS_OPTS_T_INT);
+            cnf->trap_ifc_type = content->val_int;
             break;
         case NODE_TRAP_IFC_SOCKET:
             assert(content->type == FDS_OPTS_T_STRING);
@@ -164,7 +164,7 @@ configuration_parse_root(ipx_ctx_t *ctx, fds_xml_ctx_t *root, struct conf_params
                 return IPX_ERR_NOMEM;
             }
             break;
-        case NODE_TRAP_IFC_UNIREC_FORMAT:
+        case NODE_UNIREC_FORMAT:
             assert(content->type == FDS_OPTS_T_STRING);
             cnf->unirec_format = strdup(content->ptr_string);
             if(cnf->unirec_format == NULL) {
@@ -263,9 +263,9 @@ configuration_free(struct conf_params *config)
     }
 
     if (config->unirec_format) {
-        free(c->unirec_format);
-        c->unirec_format = NULL;
+        free(config->unirec_format);
+        config->unirec_format = NULL;
     }
 
-    free(c);
+    free(config);
 }
diff --git a/extra_plugins/output/unirec/translator.c b/extra_plugins/output/unirec/translator.c
@@ -102,6 +102,92 @@ struct translator_table_rec
     translator_func func;
 };
 
+//***************************** COPIED FROM OLD PLUGIN *****************************
+// Path to unirec elements config file
+const char *UNIREC_ELEMENTS_FILE = "unirec-elements.txt"; //TODO is this where it should be located
+
+// Possible UniRec data types
+const char *unirec_data_types_str[] = {
+   "string", /*UR_TYPE_STRING*/
+   "bytes", /*UR_TYPE_BYTES*/
+   "char", /*UR_TYPE_CHAR*/
+   "uint8", /*UR_TYPE_UINT8*/
+   "int8", /*UR_TYPE_INT8*/
+   "uint16", /*UR_TYPE_UINT16*/
+   "int16", /*UR_TYPE_INT16*/
+   "uint32", /*UR_TYPE_UINT32*/
+   "int32", /*UR_TYPE_INT32*/
+   "uint64", /*UR_TYPE_UINT64*/
+   "int64", /*UR_TYPE_INT64*/
+   "float", /*UR_TYPE_FLOAT*/
+   "double", /*UR_TYPE_DOUBLE*/
+   "ipaddr", /*UR_TYPE_IP*/
+   "time", /*UR_TYPE_TIME*/
+};
+
+/**
+ * \brief Creates IPFIX id from string
+ *
+ * @param ipfixToken String in eXXidYY format, where XX is enterprise number and YY is element ID
+ * @return Returns id that is used to compare field against IPFIX template
+ */
+static ipfixElement ipfix_from_string(char *ipfixToken)
+{
+   ipfixElement element;
+   char *endptr;
+
+   element.en = strtol(ipfixToken + 1, &endptr, 10);
+   element.id = strtol(endptr + 2, (char **) NULL, 10);
+
+   return element;
+}
+
+static int8_t checkUnirecType(const char *type)
+{
+   int i;
+   for (i = 0; i < UNIREC_DATA_TYPES_COUNT; i++) {
+      if (strcmp(type, unirec_data_types_str[i]) == 0) {
+         return i;
+      }
+   }
+   return -1;
+}
+
+/**
+ * \brief Convert ipfix element id to unirec type for faster processing ipfix messages
+ * \param ipfix_el Ipfix element structure.
+ * \return One value from enum `unirecFieldEnum`.
+ */
+static int8_t getUnirecFieldTypeFromIpfixId(ipfixElement ipfix_el)
+{
+   uint16_t id = ipfix_el.id;
+   uint32_t en = ipfix_el.en;
+
+   if ((en == 0 && (id == 8 || id == 12)) ||
+         (en == 39499 && id== 40) ||
+      (en == 0 && (id == 27 || id == 28)) ||
+         (en == 39499 && id == 41)) {
+      // IP or INVEA_SIP_RTP_IP
+      return UNIREC_FIELD_IP;
+   } else if (en == 0 && id == 2) {
+      // Packets
+      return UNIREC_FIELD_PACKET;
+   } else if (en == 0 && (id == 152 || id == 153)) {
+      // Timestamps
+      return UNIREC_FIELD_TS;
+   } else if (en == 0 && id == 10) {
+      // DIR_BIT_FIELD
+      return UNIREC_FIELD_DBF;
+   } else if (en == 0 && id == 405) {
+      // LINK_BIT_FIELD
+      return UNIREC_FIELD_LBF;
+   } else {
+      // Other
+      return UNIREC_FIELD_OTHER;
+   }
+}
+
+
 /**
  * \brief Loads all available elements from configuration file
  * @return List of UniRec elements on success, NULL otherwise
@@ -118,14 +204,14 @@ static unirecField *load_elements()
     /* Open the file */
     uef = fopen(UNIREC_ELEMENTS_FILE, "r");
     if (uef == NULL) {
-        IPX_CTX_ERROR(ctx, "Unable to open: %s", UNIREC_ELEMENTS_FILE);
+        //TODO unable to open message
         return NULL;
     }
 
     /* Init buffer */
     line = malloc(lineSize);
     if (line == NULL ){
-        IPX_CTX_ERROR(ctx, "Unable to allocate memory for buffer.");
+        //TODO memory allocation message
         fclose(uef);
         return NULL;
     }
@@ -144,7 +230,7 @@ static unirecField *load_elements()
         /* Create new element structure, make space for ipfixElCount ipfix elements and NULL */
         currentField = malloc(sizeof(unirecField));
         if (currentField == NULL ){
-            IPX_CTX_ERROR(ctx, "Unable to allocate memory for field.");
+            //TODO memory allocation message
             fclose(uef);
             free(line);
             return NULL;
@@ -165,7 +251,7 @@ static unirecField *load_elements()
             case 1:
                 currentField->unirec_type = checkUnirecType(token);
                 if (currentField->unirec_type < 0) {
-                    MSG_ERROR(msg_module, "Unknown UniRec data type \"%s\" of field \"%s\"", token, currentField->name);
+                    //MSG_ERROR(msg_module, "Unknown UniRec data type \"%s\" of field \"%s\"", token, currentField->name);
                     fclose(uef);
                     free(line);
                     return NULL;
@@ -215,6 +301,7 @@ static unirecField *load_elements()
 
     return fields;
 }
+//********************** END OF COPIED FROM OLD PLUGIN *****************************
 
 /**
  * \brief Global translator table
diff --git a/extra_plugins/output/unirec/translator.h b/extra_plugins/output/unirec/translator.h
@@ -43,12 +43,55 @@
 #include <ipfixcol2.h>
 #include <unirec/unirec.h>
 
-// Path to unirec elements config file
-const char *UNIREC_ELEMENTS_FILE = "unirec-elements.txt"; //TODO is this where it should be located
-
 /** Internal definition of translator */
 typedef struct translator_s translator_t;
 
+//***************************** COPIED FROM OLD PLUGIN *****************************
+
+#define UNIREC_DATA_TYPES_COUNT 15 ///< Count of UniRec data types
+
+enum unirecFieldEnum {
+   UNIREC_FIELD_OTHER,
+   UNIREC_FIELD_IP,
+   UNIREC_FIELD_PACKET,
+   UNIREC_FIELD_TS,
+   UNIREC_FIELD_DBF,
+   UNIREC_FIELD_LBF
+};
+
+/** struct for ipfix elements' 2 ids */
+typedef struct ipfixElement {
+   uint16_t id;
+   uint32_t en;
+} ipfixElement;
+
+/** linked list of UnirecFields */
+typedef struct unirecField {
+   char *name;
+   int ur_id;
+   int8_t type;			/**< Used for faster processing, possible value are in `unirefFieldEnum` */
+   int8_t unirec_type;		/**< Used for generating data format string */
+   int8_t size;
+   int8_t required;
+   int8_t *required_ar;		/**< Array of interfaces numbers where this element is required */
+   int8_t *included_ar;		/**< Array of interfaces numbers where this element is included */
+   uint16_t *offset_ar;
+   struct unirecField *next;
+   struct unirecField *nextIfc;
+   void *value;				/**< Pointer to value of the field */
+   uint16_t valueSize;			/**< Size of the value */
+   uint8_t valueFilled;		/**< Is the value filled? */
+
+
+
+
+   /**< Number of ipfix elements */
+   int ipfixCount;
+   /**< https://tools.ietf.org/html/rfc5101#section-3.2 with masked size and EN for IANA elements */
+   ipfixElement ipfix[1];
+} unirecField;
+//***************************** END OF COPIED FROM OLD PLUGIN *****************************
+
 /**
  * \brief Create a new instance of a translator
  * \return Pointer to the instance or NULL.
