3 files changed, 10 insertions, 10 deletions

diff --git a/infra/packet_manager/packet_manager.c b/infra/packet_manager/packet_manager.c
index ba1c28d..5623107 100644
--- a/infra/packet_manager/packet_manager.c
+++ b/infra/packet_manager/packet_manager.c
@@ -2,7 +2,7 @@
 
 #include "utils_internal.h"
 #include "packet_internal.h"
-#include "packet_manager_internal.h"
+#include "packet_manager.h"
 
 #define PACKET_MANAGER_MODULE_NAME "packet_manager_module"
 
@@ -113,7 +113,7 @@ static void on_packet_stage_dispatch(int topic_id, void *msg, on_msg_cb_func *cb
         }
     }
 
-    ((on_packet_stage_callback *)(void *)cb)(stage, pkt, cb_arg);
+    ((on_packet_stage_callback *)(void *)cb)(pkt, stage, cb_arg);
 }
 
 static void packet_schema_free(struct packet_manager_schema *pkt_mgr_schema)
@@ -223,7 +223,7 @@ int packet_manager_new_packet_exdata_index(struct packet_manager *pkt_mgr, const
 int packet_manager_subscribe(struct packet_manager *pkt_mgr, enum packet_stage stage, on_packet_stage_callback *cb, void *arg)
 {
     assert(pkt_mgr);
-    return mq_schema_subscribe(pkt_mgr->schema->mq, pkt_mgr->schema->topic_id[stage], (on_msg_cb_func *)cb, arg);
+    return mq_schema_subscribe(pkt_mgr->schema->mq, pkt_mgr->schema->topic_id[stage], (on_msg_cb_func *)(void *)cb, arg);
 }
 
 int packet_manager_init(struct packet_manager *pkt_mgr, uint16_t thread_id, struct mq_runtime *mq_rt)
diff --git a/infra/packet_manager/packet_manager_internal.h b/infra/packet_manager/packet_manager.h
index dc7a979..7821758 100644
--- a/infra/packet_manager/packet_manager_internal.h
+++ b/infra/packet_manager/packet_manager.h
@@ -6,7 +6,7 @@ extern "C"
 #endif
 
 #include "stellar/mq.h"
-#include "stellar/packet_manager.h"
+#include "stellar/packet.h"
 
 #define PACKET_QUEUE_MAX (PACKET_STAGE_MAX + 1)
 
diff --git a/infra/packet_manager/test/gtest_packet_manager.cpp b/infra/packet_manager/test/gtest_packet_manager.cpp
index e447c32..902b7c7 100644
--- a/infra/packet_manager/test/gtest_packet_manager.cpp
+++ b/infra/packet_manager/test/gtest_packet_manager.cpp
@@ -2,7 +2,7 @@
 
 #include "packet_parser.h"
 #include "packet_internal.h"
-#include "packet_manager_internal.h"
+#include "packet_manager.h"
 
 /******************************************************************************
  * [Protocols in frame: eth:ethertype:ip:ipv6:tcp]
@@ -99,7 +99,7 @@ TEST(PACKET_MANAGER, NEW_FREE)
 #endif
 
 #if 1
-static void on_packet_stage(enum packet_stage stage, struct packet *pkt, void *args)
+static void on_packet_stage(struct packet *pkt, enum packet_stage stage, void *args)
 {
 	printf("on_packet_stage: %s\n", packet_stage_to_str(stage));
 
@@ -178,7 +178,7 @@ static void packet_claimed(struct packet *pkt, void *args)
 	free(str);
 }
 
-static void claim_packet_success(enum packet_stage stage, struct packet *pkt, void *args)
+static void claim_packet_success(struct packet *pkt, enum packet_stage stage, void *args)
 {
 	struct packet_manager *pkt_mgr = (struct packet_manager *)args;
 
@@ -193,7 +193,7 @@ static void claim_packet_success(enum packet_stage stage, struct packet *pkt, vo
 	count++;
 }
 
-static void claim_packet_failed(enum packet_stage stage, struct packet *pkt, void *args)
+static void claim_packet_failed(struct packet *pkt, enum packet_stage stage, void *args)
 {
 	struct packet_manager *pkt_mgr = (struct packet_manager *)args;
 
@@ -271,7 +271,7 @@ TEST(PACKET_MANAGER, CLAIM_PACKET)
 #endif
 
 #if 1
-static void on_packet_stage_schedule_packet(enum packet_stage stage, struct packet *pkt, void *args)
+static void on_packet_stage_schedule_packet(struct packet *pkt, enum packet_stage stage, void *args)
 {
 	struct packet_manager *pkt_mgr = (struct packet_manager *)args;
 
@@ -365,7 +365,7 @@ static void schedule_claimed_packet(struct packet *pkt, void *args)
 	packet_manager_schedule_packet(pkt_mgr, thread_id, pkt, PACKET_STAGE_POSTROUTING);
 }
 
-static void on_packet_stage_claim_packet_to_schedule(enum packet_stage stage, struct packet *pkt, void *args)
+static void on_packet_stage_claim_packet_to_schedule(struct packet *pkt, enum packet_stage stage, void *args)
 {
 	struct packet_manager *pkt_mgr = (struct packet_manager *)args;