add PKT_TAG_VAL_SESS_RAWPKT and PKT_TAG_VAL_SESS_PSEUDOPKT; add session debugger module

2 files changed, 24 insertions, 15 deletions

diff --git a/include/stellar/packet_tag.h b/include/stellar/packet_tag.h
index 16a345b..5b10076 100644
--- a/include/stellar/packet_tag.h
+++ b/include/stellar/packet_tag.h
@@ -19,18 +19,22 @@ extern "C"
 
 #define PKT_TAG_VAL_SESS_NEW 1 << 0
 #define PKT_TAG_VAL_SESS_FREE 1 << 1
-#define PKT_TAG_VAL_SESS_FLAG 1 << 2
-#define PKT_TAG_VAL_SESS_TCP_STREAM 1 << 3
-#define PKT_TAG_VAL_SESS_CTRL_MSG 1 << 4
-
-#define PKT_TAG_VAL_IPPROTO_TCP 1 << 5
-#define PKT_TAG_VAL_IPPROTO_UDP 1 << 6
-#define PKT_TAG_VAL_IPPROTO_ICMP 1 << 7
-
-#define PKT_TAG_VAL_L7PROTO_SSL 1 << 8
-#define PKT_TAG_VAL_L7PROTO_DNS 1 << 9
-#define PKT_TAG_VAL_L7PROTO_HTTP 1 << 10
-#define PKT_TAG_VAL_L7PROTO_QUIC 1 << 11
+#define PKT_TAG_VAL_SESS_RAWPKT 1 << 2
+#define PKT_TAG_VAL_SESS_PSEUDOPKT 1 << 3
+#define PKT_TAG_VAL_SESS_FLAG 1 << 4
+#define PKT_TAG_VAL_SESS_TCP_STREAM 1 << 5
+#define PKT_TAG_VAL_SESS_ALL (PKT_TAG_VAL_SESS_NEW | PKT_TAG_VAL_SESS_FREE | PKT_TAG_VAL_SESS_RAWPKT | PKT_TAG_VAL_SESS_PSEUDOPKT | PKT_TAG_VAL_SESS_FLAG | PKT_TAG_VAL_SESS_TCP_STREAM)
+
+#define PKT_TAG_VAL_IPPROTO_TCP 1 << 10
+#define PKT_TAG_VAL_IPPROTO_UDP 1 << 11
+#define PKT_TAG_VAL_IPPROTO_ICMP 1 << 12
+#define PKT_TAG_VAL_IPPROTO_ALL (PKT_TAG_VAL_IPPROTO_TCP | PKT_TAG_VAL_IPPROTO_UDP | PKT_TAG_VAL_IPPROTO_ICMP)
+
+#define PKT_TAG_VAL_L7PROTO_SSL 1 << 21
+#define PKT_TAG_VAL_L7PROTO_DNS 1 << 22
+#define PKT_TAG_VAL_L7PROTO_HTTP 1 << 23
+#define PKT_TAG_VAL_L7PROTO_QUIC 1 << 24
+#define PKT_TAG_VAL_L7PROTO_ALL (PKT_TAG_VAL_L7PROTO_SSL | PKT_TAG_VAL_L7PROTO_DNS | PKT_TAG_VAL_L7PROTO_HTTP | PKT_TAG_VAL_L7PROTO_QUIC)
 
 #ifdef __cplusplus
 }
diff --git a/include/stellar/session.h b/include/stellar/session.h
index 7ae22ad..d45e8ce 100644
--- a/include/stellar/session.h
+++ b/include/stellar/session.h
@@ -146,14 +146,19 @@ struct session *session_manager_lookup_session_by_packet(struct session_manager
 struct session *session_manager_lookup_session_by_id(struct session_manager *sess_mgr, uint16_t thread_id, uint64_t sess_id);
 void session_manager_discard_session(struct session_manager *sess_mgr, uint16_t thread_id, struct session *sess);
 
-void session_manager_on_packet_forward(struct packet *pkt, struct module *mod);
-void session_manager_on_packet_output(struct packet *pkt, struct module *mod);
-
 struct module *session_manager_on_init(struct module_manager *mod_mgr);
 void session_manager_on_exit(struct module_manager *mod_mgr, struct module *mod);
 struct module *session_manager_on_thread_init(struct module_manager *mod_mgr, int thread_id, struct module *mod);
 void session_manager_on_thread_exit(struct module_manager *mod_mgr, int thread_id, struct module *mod);
 
+void session_manager_on_packet_forward(struct packet *pkt, struct module *mod);
+void session_manager_on_packet_output(struct packet *pkt, struct module *mod);
+
+#define SESSION_DEBUGGER_MODULE_NAME "session_debugger_module"
+struct module *session_debugger_on_init(struct module_manager *mod_mgr);
+void session_debugger_on_exit(struct module_manager *mod_mgr, struct module *mod);
+void session_debugger_on_packet_forward(struct packet *pkt, struct module *mod);
+
 struct module *session_monitor_on_init(struct module_manager *mod_mgr);
 void session_monitor_on_exit(struct module_manager *mod_mgr, struct module *mod);