summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-19 11:15:51 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-19 11:15:51 +0200
commitc0b2bb854f42ed5975a5c08465fd0012c9e5ce8c (patch)
tree877236ec9d67fbb2182a2f591ab4fb1e9357fa01 /include
parentd8e9019fcb56a49c6730bbe7d47e5e1cec682a2d (diff)
parent50cebfe6dbc6dd6740fc2e29b3c543d121bc1a18 (diff)
downloadouroboros-c0b2bb854f42ed5975a5c08465fd0012c9e5ce8c.tar.gz
ouroboros-c0b2bb854f42ed5975a5c08465fd0012c9e5ce8c.zip
Merged in dstaesse/ouroboros/ipcpd-udp (pull request #57)
ipcpd: initial IPC processes
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/config.h.in12
-rw-r--r--include/ouroboros/dif_config.h4
-rw-r--r--include/ouroboros/flow.h14
3 files changed, 18 insertions, 12 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 01d7888e..6abce97a 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -23,10 +23,12 @@
#ifndef OUROBOROS_CONFIG
#define OUROBOROS_CONFIG
-#define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
-#define PROJECT_VERSION "@PACKAGE_VERSION@"
-#define INSTALL_DIR "@CMAKE_INSTALL_PREFIX@"
-#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
-#define _POSIX_C_SOURCE 199506L
+#define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
+#define PROJECT_VERSION "@PACKAGE_VERSION@"
+#define INSTALL_DIR "@CMAKE_INSTALL_PREFIX@"
+#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
+#define _POSIX_C_SOURCE 199506L
+#define IPCP_SHIM_UDP_EXEC "@IPCP_SHIM_UDP_TARGET@"
+#define IPCP_NORMAL_EXEC "@IPCP_NORMAL_TARGET@"
#endif
diff --git a/include/ouroboros/dif_config.h b/include/ouroboros/dif_config.h
index 91b44cb1..5d489b0c 100644
--- a/include/ouroboros/dif_config.h
+++ b/include/ouroboros/dif_config.h
@@ -21,12 +21,13 @@
*/
#include <ouroboros/utils.h>
+#include <ouroboros/common.h>
#ifndef OUROBOROS_DIF_CONFIG_H
#define OUROBOROS_DIF_CONFIG_H
enum ipcp_type {
- IPCP_NORMAL = 1,
+ IPCP_NORMAL = 0,
IPCP_SHIM_UDP
};
@@ -53,6 +54,7 @@ struct dif_config {
/* Shim UDP */
struct {
uint32_t ip_addr;
+ uint32_t dns_addr;
};
};
};
diff --git a/include/ouroboros/flow.h b/include/ouroboros/flow.h
index 7d8c311e..000de5ad 100644
--- a/include/ouroboros/flow.h
+++ b/include/ouroboros/flow.h
@@ -24,7 +24,7 @@
#define OUROBOROS_FLOW_H
#include <ouroboros/common.h>
-
+#include <ouroboros/list.h>
#include <pthread.h>
/* same values as fcntl.h */
@@ -39,17 +39,19 @@
#define FLOW_O_INVALID (FLOW_O_WRONLY | FLOW_O_RDWR)
enum flow_state {
- FLOW_INIT = 0,
+ FLOW_NULL = 0,
FLOW_ALLOCATED,
FLOW_PENDING
};
typedef struct flow {
- int32_t port_id;
- uint16_t oflags;
- enum flow_state state;
+ struct list_head list;
+
+ int32_t port_id;
+ uint16_t oflags;
+ enum flow_state state;
- pthread_mutex_t lock;
+ pthread_mutex_t lock;
} flow_t;
flow_t * flow_create(int32_t port_id);