Modifier: fix generating template ID

Template ID is now generated only with new generated template.
Fixed memory leaks in modifier context tests.

Author: AdamZvara

src/core/modifier.c

@@ -885,6 +885,32 @@ template_cmp(const struct fds_template *t1, void *data)
     return true;
 }
 
+/**
+ * \brief Generate and set new ID for template
+ *
+ * \param[in] mod   Modifier
+ * \param[in] tmplt Modified template
+ * \return #IPX_OK on success, #IPX_ERR_LIMIT when maximum number of template IDs has been reached
+ */
+static int
+template_set_new_id(ipx_modifier_t *mod, struct fds_template *tmplt)
+{
+    uint16_t new_id = mod->curr_ctx->next_id;
+
+    if (new_id == 0) {
+        // No more IDs are availiable!
+        MODIFIER_WARNING(mod, "No more IDs availiable for session %s (ODID: %d)",
+            mod->curr_ctx->session->ident, mod->curr_ctx->odid);
+        return IPX_ERR_LIMIT;
+    }
+
+    tmplt->id = new_id;
+    uint16_t *raw_id = (uint16_t *) tmplt->raw.data;
+    *raw_id = htons(new_id);
+    mod->curr_ctx->next_id = ++new_id;
+    return IPX_OK;
+}
+
 /**
  * \brief Search for template in manager, add new if it does not exist
  *
@@ -903,13 +929,13 @@ template_cmp(const struct fds_template *t1, void *data)
  * \return #FDS_ERR_NOMEM for memory allocation error
  */
 static int
-template_store(fds_tmgr_t *mgr, struct fds_template *template)
+template_store(ipx_modifier_t *mod, struct fds_template *template, ipx_msg_garbage_t **garbage)
 {
     int rc;
 
     // Check if template exists
     const fds_tsnapshot_t *snapshot;
-    rc = fds_tmgr_snapshot_get(mgr, &snapshot);
+    rc = fds_tmgr_snapshot_get(mod->curr_ctx->mgr, &snapshot);
     if (rc != FDS_OK) {
         return rc;
     }
@@ -921,41 +947,25 @@ template_store(fds_tmgr_t *mgr, struct fds_template *template)
         return IPX_OK;
     }
 
+    // Try to create new ID for template
+    rc = template_set_new_id(mod, template);
+    if (rc == IPX_ERR_LIMIT) {
+        // No more IDs available, restart context
+        modifier_ctx_restart(mod, garbage);
+        // Need to set new ID again
+        rc = template_set_new_id(mod, template);
+        assert(rc == IPX_OK);
+    }
+
     // Try to add template
-    rc = fds_tmgr_template_add(mgr, template);
+    rc = fds_tmgr_template_add(mod->curr_ctx->mgr, template);
     if (rc != FDS_OK) {
         return rc;
     }
 
     return template->id;
 }
 
-/**
- * \brief Generate and set new ID for template
- *
- * \param[in] mod   Modifier
- * \param[in] tmplt Modified template
- * \return #IPX_OK on success, #IPX_ERR_LIMIT when maximum number of template IDs has been reached
- */
-static int
-template_set_new_id(ipx_modifier_t *mod, struct fds_template *tmplt)
-{
-    uint16_t new_id = mod->curr_ctx->next_id;
-
-    if (new_id == 0) {
-        // No more IDs are availiable!
-        MODIFIER_WARNING(mod, "No more IDs availiable for session %s (ODID: %d)",
-            mod->curr_ctx->session->ident, mod->curr_ctx->odid);
-        return IPX_ERR_LIMIT;
-    }
-
-    tmplt->id = new_id;
-    uint16_t *raw_id = (uint16_t *) tmplt->raw.data;
-    *raw_id = htons(new_id);
-    mod->curr_ctx->next_id = ++new_id;
-    return IPX_OK;
-}
-
 struct fds_drec *
 ipx_modifier_modify(ipx_modifier_t *mod, const struct fds_drec *rec, ipx_msg_garbage_t **garbage)
 {
@@ -1008,18 +1018,7 @@ ipx_modifier_modify(ipx_modifier_t *mod, const struct fds_drec *rec, ipx_msg_gar
     }
 
     new_tmplt = (struct fds_template *) new_rec->tmplt;
-
-    // Try to create new ID for template
-    rc = template_set_new_id(mod, new_tmplt);
-    if (rc == IPX_ERR_LIMIT) {
-        // No more IDs available, restart context
-        modifier_ctx_restart(mod, garbage);
-        // Need to set new ID again
-        rc = template_set_new_id(mod, new_tmplt);
-        assert(rc == IPX_OK);
-    }
-
-    rc = template_store(mod->curr_ctx->mgr, new_tmplt);
+    rc = template_store(mod, new_tmplt, garbage);
 
     if (rc < FDS_OK) {
         // Something bad happened

tests/unit/core/modifier/modifier_context.cpp

@@ -513,13 +513,15 @@ TEST_F(ErrorSession, deleteNonExisting) {
     Session *sessions = createSessions("deleteEmpty");
     ipx_msg_garbage_t *gb_msg;
     EXPECT_EQ(ipx_modifier_remove_session(mod, sessions->getSession(FDS_SESSION_FILE), &gb_msg), IPX_ERR_NOTFOUND);
+    delete sessions;
 }
 
 /** Attempt to delete non existing session */
 TEST_F(ErrorSession, TCPSetTimeInHistory) {
     Session *sessions = createSessions("test");
 
     ipx_session *session = sessions->getSession(FDS_SESSION_TCP);
-    addSession(session, 0 ,100);
+    addSession(session, 0 , 100);
     addSession(session, 0, 10, IPX_ERR_FORMAT);
+    delete sessions;
 }