summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-06-21 09:35:10 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-06-21 09:35:10 +0000
commit22020246ac2b6f03f42dffb48ced19e43b3e9b77 (patch)
treed5a384272b52874393ebb88f4265e5602913d77f /src
parent3961bee6c37b3e53de2ab737c03c130eaa3c74d2 (diff)
parent6453bdc03a0d02bde8a08fb9857cf6e5c317bfb6 (diff)
downloadouroboros-22020246ac2b6f03f42dffb48ced19e43b3e9b77.tar.gz
ouroboros-22020246ac2b6f03f42dffb48ced19e43b3e9b77.zip
Merged in dstaesse/ouroboros/be-dev-include (pull request #519)
lib: include missing headers in dev.c
Diffstat (limited to 'src')
-rw-r--r--src/lib/dev.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c
index aa9d8bc5..3cdcc4d3 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -24,6 +24,8 @@
#include <ouroboros/config.h>
#include <ouroboros/errno.h>
#include <ouroboros/dev.h>
+#include <ouroboros/ipcp-dev.h>
+#include <ouroboros/local-dev.h>
#include <ouroboros/sockets.h>
#include <ouroboros/fcntl.h>
#include <ouroboros/bitmap.h>
@@ -1122,10 +1124,10 @@ int ipcp_create_r(pid_t api,
return ret;
}
-int ipcp_flow_req_arr(pid_t api,
- uint8_t * dst,
- size_t len,
- qoscube_t cube)
+int ipcp_flow_req_arr(pid_t api,
+ const uint8_t * dst,
+ size_t len,
+ qoscube_t cube)
{
irm_msg_t msg = IRM_MSG__INIT;
irm_msg_t * recv_msg = NULL;
@@ -1140,7 +1142,7 @@ int ipcp_flow_req_arr(pid_t api,
msg.api = api;
msg.has_hash = true;
msg.hash.len = len;
- msg.hash.data = dst;
+ msg.hash.data = (uint8_t *) dst;
msg.has_qoscube = true;
msg.qoscube = cube;
@@ -1349,7 +1351,7 @@ int ipcp_sdb_reserve(struct shm_du_buff ** sdb,
return 0;
}
-int ipcp_flow_fini(int fd)
+void ipcp_flow_fini(int fd)
{
struct shm_rbuff * rx_rb;
@@ -1362,8 +1364,6 @@ int ipcp_flow_fini(int fd)
pthread_rwlock_unlock(&ai.flows_lock);
shm_rbuff_fini(rx_rb);
-
- return 0;
}
int ipcp_flow_get_qoscube(int fd,