UniRec output: Use ipx_msg_ctx struct as message context in translator instead of message header

Author: TheSableCZ

extra_plugins/output/unirec/src/translator.c

@@ -137,8 +137,8 @@ struct translator_s {
     } progress; /**< Auxiliary conversion variables                     */
 
     struct {
-        /** IPFIX Message header                                        */
-        const struct fds_ipfix_msg_hdr *hdr;
+        /** IPFIX Message context                                        */
+        const struct ipx_msg_ctx *ctx;
     } msg_context; /**< IPFIX context of the record to translate        */
 
     struct {
@@ -808,12 +808,12 @@ translate_internal_dbf(translator_t *trans, const struct translator_rec *rec,
 static int
 translate_internal_lbf(translator_t *trans)
 {
-    if (!trans->msg_context.hdr) {
-        return 1; // Message header is not available!
+    if (!trans->msg_context.ctx) {
+        return 1; // Message context is not available!
     }
 
     // Get the ODID value
-    uint32_t odid = ntohl(trans->msg_context.hdr->odid);
+    uint32_t odid = trans->msg_context.ctx->odid;
 
     // Store the value is 'link bit field'
     ur_field_type_t ur_id = trans->extra_conv.lbf.field_id;
@@ -850,12 +850,12 @@ translate_internal_lbf(translator_t *trans)
 static int
 translate_internal_odid(translator_t *trans)
 {
-    if (!trans->msg_context.hdr) {
-        return 1; // Message header is not available!
+    if (!trans->msg_context.ctx) {
+        return 1; // Message context is not available!
     }
 
     // Get the ODID value
-    uint32_t odid = ntohl(trans->msg_context.hdr->odid);
+    uint32_t odid = trans->msg_context.ctx->odid;
 
     ur_field_type_t ur_id = trans->extra_conv.odid.field_id;
     void *field_ptr = ur_get_ptr_by_id(trans->record.ur_tmplt, trans->record.data, ur_id);
@@ -1707,9 +1707,9 @@ translator_destroy(translator_t *trans)
 }
 
 void
-translator_set_context(translator_t *trans, const struct fds_ipfix_msg_hdr *hdr)
+translator_set_context(translator_t *trans, const struct ipx_msg_ctx *ctx)
 {
-    trans->msg_context.hdr = hdr;
+    trans->msg_context.ctx = ctx;
 }
 
 const void *

extra_plugins/output/unirec/src/translator.h

@@ -78,10 +78,10 @@ translator_destroy(translator_t *trans);
  * This function MUST be called before processing each IPFIX Message to set proper record
  * parameters. The message header is required for determine ODID or other parameters.
  * \param[in] trans Translator instance
- * \param[in] hdr   IPFIX message header
+ * \param[in] ctx   IPFIX message context
  */
 void
-translator_set_context(translator_t *trans, const struct fds_ipfix_msg_hdr *hdr);
+translator_set_context(translator_t *trans, const struct ipx_msg_ctx *ctx);
 
 /**
  * \brief Convert a IPFIX record to an UniRec message

extra_plugins/output/unirec/src/unirecplugin.c

@@ -344,8 +344,8 @@ ipx_plugin_process(ipx_ctx_t *ctx, void *cfg, ipx_msg_t *msg)
     const void *msg_data = NULL;
 
     ipx_msg_ipfix_t *ipfix = ipx_msg_base2ipfix(msg);
-    const uint8_t *ipfix_raw_msg = ipx_msg_ipfix_get_packet(ipfix);
-    translator_set_context(conf->trans, (const struct fds_ipfix_msg_hdr *) ipfix_raw_msg);
+    const struct ipx_msg_ctx *ipfix_msg_ctx = ipx_msg_ipfix_get_ctx(ipfix);
+    translator_set_context(conf->trans, ipfix_msg_ctx);
 
     const uint32_t rec_cnt = ipx_msg_ipfix_get_drec_cnt(ipfix);
     for (uint32_t i = 0; i < rec_cnt; i++) {