project: Convert project to library

Signed-off-by: Ian Moffett <ian@osmora.org>

12 files changed, 30 insertions, 30 deletions

diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c
index c51c594..ee5aeb4 100644
--- a/lib/crypto/aes.c
+++ b/lib/crypto/aes.c
@@ -31,7 +31,7 @@
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 #include <openssl/rand.h>
-#include <crypto/aes.h>
+#include <ostp/crypto/aes.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/lib/crypto/ecdh.c b/lib/crypto/ecdh.c
index c881ca1..70aee12 100644
--- a/lib/crypto/ecdh.c
+++ b/lib/crypto/ecdh.c
@@ -33,7 +33,7 @@
 #include <openssl/pem.h>
 #include <openssl/bn.h>
 #include <openssl/err.h>
-#include <crypto/ecdh.h>
+#include <ostp/crypto/ecdh.h>
 #include <stdio.h>
 
 #define KEY_SIZE 32
diff --git a/lib/include/net/auth.h b/lib/include/net/auth.h
index 0f22d22..f3f47d1 100644
--- a/lib/include/net/auth.h
+++ b/lib/include/net/auth.h
@@ -30,9 +30,9 @@
 #ifndef NET_AUTH_H_
 #define NET_AUTH_H_
 
-#include <net/stpsession.h>
-#include <libostp/session.h>
-#include <libostp/server.h>
+#include <ostp/net/stpsession.h>
+#include <ostp/session.h>
+#include <ostp/server.h>
 
 int handle_srq(struct ostp_client *c, struct ostp_listener *lp,
     struct session_request *srq);
diff --git a/lib/include/net/param.h b/lib/include/net/param.h
index ba2a0a2..03282c1 100644
--- a/lib/include/net/param.h
+++ b/lib/include/net/param.h
@@ -30,8 +30,8 @@
 #ifndef NET_PARAM_H_
 #define NET_PARAM_H_
 
+#include <ostp/defs.h>
 #include <stdint.h>
-#include <defs.h>
 
 /*
  * The Parameter Arbitration Packet which is crucial
diff --git a/lib/include/net/stpsession.h b/lib/include/net/stpsession.h
index 8b61da2..7f9d151 100644
--- a/lib/include/net/stpsession.h
+++ b/lib/include/net/stpsession.h
@@ -30,9 +30,9 @@
 #ifndef STP_SESSION_H_
 #define STP_SESSION_H_
 
-#include <crypto/aes.h>
+#include <ostp/crypto/aes.h>
+#include <ostp/defs.h>
 #include <stdint.h>
-#include <defs.h>
 
 /*
  * 2^12 (4096) bytes is a common page size on
diff --git a/lib/include/libostp/server.h b/lib/include/server.h
index 0e232f6..9e09f78 100644
--- a/lib/include/libostp/server.h
+++ b/lib/include/server.h
@@ -31,7 +31,7 @@
 #define LIBOSTP_SERVER_H_
 
 #include <sys/select.h>
-#include <libostp/session.h>
+#include <ostp/session.h>
 #include <pthread.h>
 #include <stddef.h>
 
@@ -44,7 +44,7 @@ struct ostp_client {
 };
 
 struct ostp_listener {
-    int(*on_recv)(struct ostp_client *c, const char *buf, size_t len);
+    int(*on_recv)(struct ostp_client *c, const void *buf, size_t len);
     int port;
 
     /* -- Private -- */
diff --git a/lib/include/libostp/session.h b/lib/include/session.h
index 397fa68..397fa68 100644
--- a/lib/include/libostp/session.h
+++ b/lib/include/session.h
diff --git a/lib/libostp/auth.c b/lib/libostp/auth.c
index f2097bc..7b840f6 100644
--- a/lib/libostp/auth.c
+++ b/lib/libostp/auth.c
@@ -28,9 +28,9 @@
  */
 
 #include <sys/wait.h>
-#include <net/auth.h>
-#include <crypto/ecdh.h>
-#include <otconfig.h>
+#include <ostp/net/auth.h>
+#include <ostp/crypto/ecdh.h>
+#include <ostp/otconfig.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lib/libostp/param.c b/lib/libostp/param.c
index 8b83f46..83978d9 100644
--- a/lib/libostp/param.c
+++ b/lib/libostp/param.c
@@ -27,12 +27,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <net/stpsession.h>
-#include <libostp/session.h>
-#include <crypto/aes.h>
-#include <net/param.h>
-#include <net/auth.h>
-#include <otconfig.h>
+#include <ostp/net/stpsession.h>
+#include <ostp/net/param.h>
+#include <ostp/net/auth.h>
+#include <ostp/session.h>
+#include <ostp/crypto/aes.h>
+#include <ostp/otconfig.h>
 #include <stdio.h>
 
 static int
diff --git a/lib/libostp/server.c b/lib/libostp/server.c
index 588a6d2..aea987c 100644
--- a/lib/libostp/server.c
+++ b/lib/libostp/server.c
@@ -27,10 +27,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <libostp/server.h>
-#include <net/auth.h>
-#include <net/stpsession.h>
+#include <ostp/net/auth.h>
+#include <ostp/net/stpsession.h>
 #include <arpa/inet.h>
+#include <ostp/server.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libostp/session.c b/lib/libostp/session.c
index 39acba2..8f2fb28 100644
--- a/lib/libostp/session.c
+++ b/lib/libostp/session.c
@@ -27,12 +27,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <libostp/session.h>
-#include <net/stpsession.h>
-#include <net/param.h>
-#include <crypto/ecdh.h>
-#include <defs.h>
-#include <otconfig.h>
+#include <ostp/net/stpsession.h>
+#include <ostp/net/param.h>
+#include <ostp/crypto/ecdh.h>
+#include <ostp/defs.h>
+#include <ostp/session.h>
+#include <ostp/otconfig.h>
 #include <arpa/inet.h>
 #include <termios.h>
 #include <stdint.h>
diff --git a/lib/net/frame.c b/lib/net/frame.c
index 1f33b09..7363266 100644
--- a/lib/net/frame.c
+++ b/lib/net/frame.c
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <net/stpsession.h>
-#include <crypto/aes.h>
+#include <ostp/net/stpsession.h>
+#include <ostp/crypto/aes.h>
 #include <arpa/inet.h>
 #include <string.h>
 #include <stdlib.h>