summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-04-24 16:47:50 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2017-04-24 16:47:50 +0200
commitfbf20bff013e4ca36ed7417376954723651f0a6f (patch)
treeec99c0417dd9a341d5333b990b85a50539f661b6 /include
parent1bca9a9848dc842e2a40c666560391cdd4c95ca0 (diff)
downloadouroboros-fbf20bff013e4ca36ed7417376954723651f0a6f.tar.gz
ouroboros-fbf20bff013e4ca36ed7417376954723651f0a6f.zip
lib: Remove dependency on installed headers
The header ipcp.h was not installed systemwide, giving compile time errors when trying to compile external programs that use irm.h. ipcp.h also included hash.h, which exposes project interal functions. The enum was moved to ipcp.h to prevent this.
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/CMakeLists.txt1
-rw-r--r--include/ouroboros/hash.h10
-rw-r--r--include/ouroboros/ipcp.h11
3 files changed, 12 insertions, 10 deletions
diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index b07568e3..f582b915 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -10,6 +10,7 @@ set(HEADER_FILES
errno.h
fcntl.h
fqueue.h
+ ipcp.h
irm.h
nsm.h
qos.h)
diff --git a/include/ouroboros/hash.h b/include/ouroboros/hash.h
index 60bfbe30..de3ce541 100644
--- a/include/ouroboros/hash.h
+++ b/include/ouroboros/hash.h
@@ -24,18 +24,12 @@
#ifndef OUROBOROS_LIB_HASH_H
#define OUROBOROS_LIB_HASH_H
+#include <ouroboros/ipcp.h>
+
#include <ouroboros/crc32.h>
#include <ouroboros/md5.h>
#include <ouroboros/sha3.h>
-enum hash_algo {
- HASH_CRC32 = 0,
- HASH_MD5,
- HASH_SHA3_224,
- HASH_SHA3_256,
- HASH_SHA3_384,
- HASH_SHA3_512
-};
#define HASH_FMT "%02x%02x%02x%02x"
#define HASH_VAL(hash) \
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 4c815b83..b9c5b740 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -24,8 +24,6 @@
#ifndef OUROBOROS_IPCP_H
#define OUROBOROS_IPCP_H
-#include <ouroboros/hash.h>
-
#include <stdint.h>
#include <unistd.h>
#include <stdbool.h>
@@ -50,6 +48,15 @@ enum pol_gam {
COMPLETE = 0
};
+enum hash_algo {
+ HASH_CRC32 = 0,
+ HASH_MD5,
+ HASH_SHA3_224,
+ HASH_SHA3_256,
+ HASH_SHA3_384,
+ HASH_SHA3_512
+};
+
struct ipcp_config {
char * dif_name;
enum ipcp_type type;