Refactor tidc/monc to better share code

[trust_router.git] / include / tr_msg.h

diff --git a/include/tr_msg.h b/include/tr_msg.h
index 4f208e5..6605cbd 100644 (file)
--- a/include/tr_msg.h
+++ b/include/tr_msg.h
@@ -37,13 +37,19 @@
 
 #include <jansson.h>
 #include <trust_router/tid.h>
+#include <trust_router/trp.h>
+#include <mon.h>
 
 typedef struct tr_msg TR_MSG;
 
 enum msg_type {
   TR_UNKNOWN = 0,
   TID_REQUEST,
-  TID_RESPONSE
+  TID_RESPONSE,
+  TRP_UPDATE,
+  TRP_REQUEST,
+  MON_REQUEST,
+  MON_RESPONSE
 };
 
 /* Union of TR message types to hold message of any type. */
@@ -59,10 +65,19 @@ TID_REQ *tr_msg_get_req(TR_MSG *msg);
 void tr_msg_set_req(TR_MSG *msg, TID_REQ *req);
 TID_RESP *tr_msg_get_resp(TR_MSG *msg);
 void tr_msg_set_resp(TR_MSG *msg, TID_RESP *resp);
+TRP_UPD *tr_msg_get_trp_upd(TR_MSG *msg);
+void tr_msg_set_trp_upd(TR_MSG *msg, TRP_UPD *req);
+TRP_REQ *tr_msg_get_trp_req(TR_MSG *msg);
+void tr_msg_set_trp_req(TR_MSG *msg, TRP_REQ *req);
+MON_REQ *tr_msg_get_mon_req(TR_MSG *msg);
+void tr_msg_set_mon_req(TR_MSG *msg, MON_REQ *req);
+MON_RESP *tr_msg_get_mon_resp(TR_MSG *msg);
+void tr_msg_set_mon_resp(TR_MSG *msg, MON_RESP *resp);
+
 
 /* Encoders/Decoders */
-char *tr_msg_encode(TR_MSG *msg);
-TR_MSG *tr_msg_decode(char *jmsg, size_t len);
+char *tr_msg_encode(TALLOC_CTX *mem_ctx, TR_MSG *msg);
+TR_MSG *tr_msg_decode(TALLOC_CTX *mem_ctx, const char *jmsg, size_t len);
 void tr_msg_free_encoded(char *jmsg);
 void tr_msg_free_decoded(TR_MSG *msg);