Refactor(plug_mgr API): remove session_ctx, provide stellar_mq

3 files changed, 14 insertions, 56 deletions

diff --git a/include/stellar/stellar.h b/include/stellar/stellar.h
index 6d9532b..89420b3 100644
--- a/include/stellar/stellar.h
+++ b/include/stellar/stellar.h
@@ -7,57 +7,28 @@ extern "C"
 
 #include <stdint.h>
 
-struct session;
 struct stellar;
 
 //return plugin_env
 typedef void *plugin_on_load_func(struct stellar *st);
 typedef void plugin_on_unload_func(void *plugin_env);
 
-//return per_session_ctx
-typedef void *session_ctx_new_func(struct session *sess, void *plugin_env);
-typedef void session_ctx_free_func(struct session *sess, void *session_ctx, void *plugin_env);
-
-typedef void on_session_new_func(struct session *sess, void *session_ctx, void *plugin_env);
-typedef void on_session_free_func(struct session *sess, void *session_ctx, void *plugin_env);
-
-// INTRINSIC TOPIC
-// TOPIC_TCP_STREAM on_msg need convert msg to (const struct tcp_segment *)
-// TOPIC_UDP_INPUT/TOPIC_TCP_INPUT/TOPIC_UDP_OUTPUT/TOPIC_TCP_OUTPUT/TOPIC_CONTROL_PACKET on_msg need convert msg to (const struct packet *)
+struct tcp_segment;
+const char *tcp_segment_get_data(const struct tcp_segment *seg);
+uint16_t tcp_segment_get_len(const struct tcp_segment *seg);
 
 #define TOPIC_TCP_STREAM "TCP_STREAM"  //topic message: tcp_segment
 #define TOPIC_CONTROL_PACKET "CONTROL_PACKET" //topic message: packet
 							
-#define TOPIC_TCP_INPUT "TCP_INPUT" //topic message: packet
-#define TOPIC_TCP_OUTPUT "TCP_OUTPUT" //topic message: packet
-#define TOPIC_UDP_INPUT "UDP_INPUT" //topic message: packet
-#define TOPIC_UDP_OUTPUT "UDP_OUTPUT" //topic message: packet
-
+#define TOPIC_TCP "TCP" //topic message: session
+#define TOPIC_UDP "UDP" //topic message: session
 
-//return session plugin_id
-int stellar_session_plugin_register(struct stellar *st, 
-									session_ctx_new_func session_ctx_new, 
-									session_ctx_free_func session_ctx_free, 
-									void *plugin_env);
-
-int stellar_session_plugin_register_with_hooks(struct stellar *st, 
-									session_ctx_new_func session_ctx_new, 
-									session_ctx_free_func session_ctx_free, 
-									on_session_new_func on_session_new,
-									on_session_free_func on_session_free,
-									void *plugin_env);
-
-void stellar_session_plugin_dettach_current_session(struct session *sess);
-
-struct tcp_segment;
-const char *tcp_segment_get_data(const struct tcp_segment *seg);
-uint16_t tcp_segment_get_len(const struct tcp_segment *seg);
 
 struct packet;
 typedef void plugin_on_packet_func(struct packet *pkt, unsigned char ip_protocol, void *plugin_env);
 
-//return packet plugin_id
-int stellar_packet_plugin_register(struct stellar *st, unsigned char ip_protocol, plugin_on_packet_func on_packet_input, plugin_on_packet_func on_packet_output, void *plugin_env);
+//return plugin_id
+int stellar_plugin_register(struct stellar *st, unsigned char ip_protocol, plugin_on_packet_func on_packet_input, plugin_on_packet_func on_packet_output, void *plugin_env);
 
 
 //return polling work result, 0: no work, 1: work
diff --git a/include/stellar/stellar_exdata.h b/include/stellar/stellar_exdata.h
index 199ac56..8ed67bb 100644
--- a/include/stellar/stellar_exdata.h
+++ b/include/stellar/stellar_exdata.h
@@ -16,12 +16,15 @@ inline static void stellar_exdata_free_default(int idx __unused, void *ex_ptr, v
 	if(ex_ptr)FREE(ex_ptr);
 }
 
+struct packet;
 int stellar_exdata_new_index(struct stellar *st, const char *name, stellar_exdata_free *free_func,void *arg); 
 
 //packet exdata api
 int packet_exdata_set(struct packet *pkt, int idx, void *ex_ptr);
 void *packet_exdata_get(struct packet *pkt, int idx);
 
+struct session;
+
 //session exdata api
 int session_exdata_set(struct session *sess, int idx, void *ex_ptr);
 void *session_exdata_get(struct session *sess, int idx);
diff --git a/include/stellar/stellar_mq.h b/include/stellar/stellar_mq.h
index 7b826d5..4780990 100644
--- a/include/stellar/stellar_mq.h
+++ b/include/stellar/stellar_mq.h
@@ -31,27 +31,11 @@ enum stellar_mq_priority
 	STELLAR_MQ_PRIORITY_MAX,
 };
 
-//session mq api
-typedef void on_session_msg_cb_func(struct session *sess, int topic_id, const void *msg, void *per_session_ctx, void *plugin_env);
-
-//return 0 if success, otherwise return -1.
-int stellar_session_mq_subscribe(struct stellar *st, int topic_id, on_session_msg_cb_func *plugin_on_msg_cb, int plugin_id);
-int session_mq_publish_message(struct session *sess, int topic_id, void *msg);
-int session_mq_publish_message_with_priority(struct session *sess, int topic_id, void *msg, enum stellar_mq_priority priority);
-
-int session_mq_ignore_message(struct session *sess, int topic_id, int plugin_id);
-int session_mq_unignore_message(struct session *sess, int topic_id, int plugin_id);
-
-int session_mq_topic_is_active(struct session *sess, int topic_id);
-
-
-//packet mq api
-
-typedef void on_packet_msg_cb_func(struct packet *pkt, int topic_id, const void *msg, void *plugin_env);
+typedef void on_msg_cb_func(int topic_id, const void *msg, void *plugin_env);
 //return 0 if success, otherwise return -1.
-int stellar_packet_mq_subscribe(struct stellar *st, int topic_id, on_packet_msg_cb_func *plugin_on_msg_cb, int plugin_id); //packet plugin only
-int packet_mq_publish_message(struct packet *pkt, int topic_id, void *msg);
-int packet_mq_publish_message_with_priority(struct packet *pkt, int topic_id, void *msg, enum stellar_mq_priority priority);
+int stellar_mq_subscribe(struct stellar *st, int topic_id, on_msg_cb_func *plugin_on_msg_cb, int plugin_id); 
+int stellar_mq_publish_message(struct stellar *st, int topic_id, void *msg);
+int stellar_mq_publish_message_with_priority(struct stellar *st, int topic_id, void *msg, enum stellar_mq_priority priority);
 
 #ifdef __cplusplus
 }