unirec: integrate configuration by @jaroslavh, fixed ifctype

Configuration file -> trapIfcType element can contain
TCP/UNIXSOCKET/TLS/BLACKHOLE/FILE, it is afterwards converted into
t/u/T/f.

Author: cejkato2

extra_plugins/output/unirec/configuration.c

@@ -78,7 +78,7 @@ 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_INT, 0),
+    FDS_OPTS_ELEM(NODE_TRAP_IFC_TYPE,          "trapIfcType",         FDS_OPTS_T_STRING, 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),
@@ -129,8 +129,20 @@ 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_INT);
-            cnf->trap_ifc_type = content->val_int;
+            assert(content->type == FDS_OPTS_T_STRING);
+            if (strcmp(content->ptr_string, "UNIXSOCKET") == 0) {
+                cnf->trap_ifc_type = 'u';
+            } else if (strcmp(content->ptr_string, "TCP") == 0) {
+                cnf->trap_ifc_type = 't';
+            } else if (strcmp(content->ptr_string, "TLS") == 0) {
+                cnf->trap_ifc_type = 'T';
+            } else if (strcmp(content->ptr_string, "FILE") == 0) {
+                cnf->trap_ifc_type = 'f';
+            } else if (strcmp(content->ptr_string, "BLACKHOLE") == 0) {
+                cnf->trap_ifc_type = 'b';
+            } else {
+                IPX_CTX_ERROR(ctx, "Unsupported trapIfcType.");
+            }
             break;
         case NODE_TRAP_IFC_SOCKET:
             assert(content->type == FDS_OPTS_T_STRING);

extra_plugins/output/unirec/unirecplugin.c

@@ -99,16 +99,11 @@ int
 ipx_plugin_init(ipx_ctx_t *ctx, const char *params) {
     IPX_CTX_INFO(ctx, "UniRec plugin initialization.");
     // Process XML configuration
-    //struct conf_params *parsed_params = configuration_parse(ctx, params);
-    //if (!parsed_params) {
-    //    IPX_CTX_ERROR(ctx, "Failed to parse the plugin configuration.", '\0');
-    //    return IPX_ERR_DENIED;
-    //}
-    /* TODO delete: */
-    struct conf_params *parsed_params = calloc(1, sizeof(*parsed_params));
-    parsed_params->trap_ifc_type = 'u';
-    parsed_params->trap_ifc_socket = strdup("ipfix-ur");
-    parsed_params->unirec_format = strdup("SRC_IP,DST_IP,?SRC_PORT,?DST_PORT,?TCP_FLAGS");
+    struct conf_params *parsed_params = configuration_parse(ctx, params);
+    if (!parsed_params) {
+        IPX_CTX_ERROR(ctx, "Failed to parse the plugin configuration.", '\0');
+        return IPX_ERR_DENIED;
+    }
 
     if (pthread_mutex_lock(&urp_mutex) == -1) {
         return IPX_ERR_DENIED;