Refactor tidc/monc to better share code

[trust_router.git] / trp / msgtst.c

diff --git a/trp/msgtst.c b/trp/msgtst.c
index 97646bb..7a6a585 100644 (file)
--- a/trp/msgtst.c
+++ b/trp/msgtst.c
@@ -1,11 +1,46 @@
+/*
+ * Copyright (c) 2016, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
 /* Testing trp message encoding / decoding */
 
-/* compiles with: gcc -o msgtst -I../include -I../include/trust_router msgtst.c trp_msg.c $(pkg-config --cflags --libs glib-2.0) ../common/tr_debug.c  ../common/tr_name.c -ltalloc -ljansson */
+/* compiles with: gcc -o msgtst -I../include msgtst.c trp_msg.c $(pkg-config --cflags --libs glib-2.0) ../common/tr_debug.c  ../common/tr_name.c ../common/tr_msg.c -ltalloc -ljansson */
 
 #include <stdio.h>
 #include <talloc.h>
 
-#include <trp_internal.h>
+#include <trust_router/trp.h>
+#include <tr_msg.h>
 #include <tr_debug.h>
 
 #define MAX_MSG_LEN 8192
@@ -16,8 +51,7 @@ int main(int argc, const char *argv[])
   FILE *f;
   char *buf;
   size_t buflen;
-  TRP_RC rc;
-  TRP_MSG *msg;
+  TR_MSG *msg;
   
   if (argc != 2) {
     printf("Usage: %s <input file>\n\n", argv[0]);
@@ -47,15 +81,16 @@ int main(int argc, const char *argv[])
   if (buflen>=MAX_MSG_LEN)
     printf("Warning: file may exceed maximum message length (%d bytes).\n", MAX_MSG_LEN);
 
-  rc=trp_parse_msg(main_ctx, buf, buflen, &msg);
-  printf("trp_parse_msg returned %d\n\n", rc);
+  msg= tr_msg_decode(NULL, buf, buflen);
+
+/*  if (rc==TRP_SUCCESS)
+    trp_msg_print(msg);*/
 
-  trp_msg_print(msg);
+  printf("\nEncoding...\n");
 
-  talloc_report_full(main_ctx, stderr);
+  printf("Result: \n%s\n\n", tr_msg_encode(NULL, msg));
 
-  talloc_free(msg);
+  talloc_report_full(main_ctx, stdout);
 
-  talloc_report_full(main_ctx, stderr);
   return 0;
 }