From d7acd9d8f761bfd4a62715de635b1f90234dabfa Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Wed, 20 Mar 2013 13:36:50 -0400
Subject: [PATCH] rename include files into trust_router

---
 common/tr_msg.c                            | 4 ++--
 common/tr_name.c                           | 2 +-
 include/tr.h                               | 4 ++--
 include/tr_msg.h                           | 2 +-
 include/{ => trust_router}/tid.h           | 4 ++--
 include/{ => trust_router}/tr_name.h       | 5 +++--
 include/{ => trust_router}/tr_versioning.h | 0
 tid/example/tidc_main.c                    | 2 +-
 tid/example/tids_main.c                    | 2 +-
 tid/tidc.c                                 | 3 ++-
 tid/tids.c                                 | 3 ++-
 11 files changed, 17 insertions(+), 14 deletions(-)
 rename include/{ => trust_router}/tid.h (97%)
 rename include/{ => trust_router}/tr_name.h (92%)
 rename include/{ => trust_router}/tr_versioning.h (100%)

diff --git a/common/tr_msg.c b/common/tr_msg.c
index d3fc712..b475c02 100644
--- a/common/tr_msg.c
+++ b/common/tr_msg.c
@@ -37,8 +37,8 @@
 #include <jansson.h>
 
 #include <tr_msg.h>
-#include <tr_name.h>
-#include <tid.h>
+#include <trust_router/tr_name.h>
+#include <trust_router/tid.h>
 
 static json_t *tr_msg_encode_dh(DH *dh)
 {
diff --git a/common/tr_name.c b/common/tr_name.c
index b5e1526..62c3baa 100644
--- a/common/tr_name.c
+++ b/common/tr_name.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <tr_name.h>
+#include <trust_router/tr_name.h>
 
 TR_NAME *tr_new_name (char *name) 
 {
diff --git a/include/tr.h b/include/tr.h
index f7804d9..8548bd1 100644
--- a/include/tr.h
+++ b/include/tr.h
@@ -36,9 +36,9 @@
 #define TR_H
 
 #include <tr_msg.h>
-#include <tr_name.h>
+#include <trust_router/tr_name.h>
 #include <tr_config.h>
-#include <tid.h>
+#include <trust_router/tid.h>
 
 #define TRUST_ROUTER_PORT	12308
 
diff --git a/include/tr_msg.h b/include/tr_msg.h
index c30fe23..1ab2c72 100644
--- a/include/tr_msg.h
+++ b/include/tr_msg.h
@@ -35,7 +35,7 @@
 #ifndef TR_MSG_H
 #define TR_MSG_H
 
-#include <tid.h>
+#include <trust_router/tid.h>
 #include <jansson.h>
 
 enum msg_type {
diff --git a/include/tid.h b/include/trust_router/tid.h
similarity index 97%
rename from include/tid.h
rename to include/trust_router/tid.h
index 8e923e9..68d8074 100644
--- a/include/tid.h
+++ b/include/trust_router/tid.h
@@ -39,8 +39,8 @@
 #include <openssl/dh.h>
 
 #include <gsscon.h>
-#include <tr_name.h>
-#include <tr_versioning.h>
+#include <trust_router/tr_name.h>
+#include <trust_router/tr_versioning.h>
 
 #define TID_PORT	12309
 
diff --git a/include/tr_name.h b/include/trust_router/tr_name.h
similarity index 92%
rename from include/tr_name.h
rename to include/trust_router/tr_name.h
index 3f610bb..21c6835 100644
--- a/include/tr_name.h
+++ b/include/trust_router/tr_name.h
@@ -34,13 +34,14 @@
 
 #ifndef TR_NAME_H
 #define TR_NAME_H
+#include <trust_router/tr_versioning.h>
 
 typedef struct tr__name {
   char *buf;
   int len;
 } TR_NAME;
 
-TR_NAME *tr_new_name (char *name);
-TR_NAME *tr_dup_name (TR_NAME *from);
+TR_EXPORT TR_NAME *tr_new_name (char *name);
+TR_EXPORT TR_NAME *tr_dup_name (TR_NAME *from);
 
 #endif
diff --git a/include/tr_versioning.h b/include/trust_router/tr_versioning.h
similarity index 100%
rename from include/tr_versioning.h
rename to include/trust_router/tr_versioning.h
diff --git a/tid/example/tidc_main.c b/tid/example/tidc_main.c
index 9f2943e..e6c1579 100644
--- a/tid/example/tidc_main.c
+++ b/tid/example/tidc_main.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 
 #include <gsscon.h>
-#include <tid.h>
+#include <trust_router/tid.h>
 
 static int tidc_response_received = 0;
 
diff --git a/tid/example/tids_main.c b/tid/example/tids_main.c
index 3963233..b35f37a 100644
--- a/tid/example/tids_main.c
+++ b/tid/example/tids_main.c
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#include <tid.h>
+#include <trust_router/tid.h>
 
 int tids_req_handler (TIDS_INSTANCE * tids,
 		      TID_REQ *req, 
diff --git a/tid/tidc.c b/tid/tidc.c
index deff4ed..bb97ebd 100644
--- a/tid/tidc.c
+++ b/tid/tidc.c
@@ -38,8 +38,9 @@
 
 #include <gsscon.h>
 #include <tr_dh.h>
-#include <tid.h>
+#include <trust_router/tid.h>
 #include <tr_msg.h>
+#include <gsscon.h>
 
 /* char tmp_key[32] = 
   {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
diff --git a/tid/tids.c b/tid/tids.c
index 7b7d01f..7ffac8c 100644
--- a/tid/tids.c
+++ b/tid/tids.c
@@ -41,7 +41,8 @@
 #include <jansson.h>
 
 #include <gsscon.h>
-#include <tid.h>
+#include <trust_router/tid.h>
+
 
 static int tids_listen (int port) 
 {
-- 
2.1.4