Checkpoint commit: refactoring the request code in TIDS for better reuse

[trust_router.git] / include / tr_msg.h

diff --git a/include/tr_msg.h b/include/tr_msg.h
index 8943559..59b7cf7 100644 (file)
--- a/include/tr_msg.h
+++ b/include/tr_msg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, JANET(UK)
+ * Copyright (c) 2012-2014, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,30 +35,43 @@
 #ifndef TR_MSG_H
 #define TR_MSG_H
 
-#include <tpq.h>
-// #include <tidr.h>
 #include <jansson.h>
+#include <trust_router/tid.h>
+#include <trust_router/trp.h>
+typedef struct tr_msg TR_MSG;
 
 enum msg_type {
-  TR_UNKNOWN,
-  TPQ_REQUEST,
-  TPQ_RESPONSE,
-  TIDR_REQUEST,
-  TIDR_RESPONSE
+  TR_UNKNOWN = 0,
+  TID_REQUEST,
+  TID_RESPONSE,
+  TRP_UPDATE,
+  TRP_REQUEST
 };
 
 /* Union of TR message types to hold message of any type. */
-typedef struct tr_msg {
+struct tr_msg {
   enum msg_type msg_type;
-  union {
-    TPQ_REQ msg_req;
-    TPQ_RESP msg_resp;
-    // TIDR_REQ tidr_req;
-    // TIDR_RESP tidr_resp;
-  };
-} TR_MSG;
+  void *msg_rep;
+};
+
+/* Accessors */
+enum msg_type tr_msg_get_msg_type(TR_MSG *msg);
+void tr_msg_set_msg_type(TR_MSG *msg, enum msg_type type);
+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);
+
+
+/* Encoders/Decoders */
+char *tr_msg_encode(TALLOC_CTX *mem_ctx, TR_MSG *msg);
+TR_MSG *tr_msg_decode(const char *jmsg, size_t len);
+void tr_msg_free_encoded(char *jmsg);
+void tr_msg_free_decoded(TR_MSG *msg);
 
-char *tr_msg_encode(TR_MSG *msg);
-TR_MSG *tr_msg_decode(char *jmsg);
 
 #endif