summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2017-02-07 10:35:49 +0000
committerSander Vrijders <sander.vrijders@intec.ugent.be>2017-02-07 10:35:49 +0000
commit1bf2dd6aef3af6c81794c0551278373e44310b5c (patch)
tree2c5bb331021e0b15eb43827d05cd06082b6c8edb /include
parent129d5e06d627346cb30ce60cdf43f8a1ae023dcb (diff)
parentd64f05e8bf1277132b648bda2e1175ad8c1d2d5c (diff)
downloadouroboros-1bf2dd6aef3af6c81794c0551278373e44310b5c.tar.gz
ouroboros-1bf2dd6aef3af6c81794c0551278373e44310b5c.zip
Merged in dstaesse/ouroboros/be-wip (pull request #362)
ipcpd, lib: Revise normal IPCP
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/config.h.in9
-rw-r--r--include/ouroboros/irm_config.h6
-rw-r--r--include/ouroboros/shm_rdrbuff.h4
3 files changed, 14 insertions, 5 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 5597bb0b..b95fe927 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -47,7 +47,7 @@
#define SHM_RBUFF_PREFIX "/ouroboros.rbuff."
#define SHM_FLOW_SET_PREFIX "/ouroboros.sets."
#define IRMD_MAX_FLOWS 4096
-#define IRMD_THREADPOOL_SIZE 5
+#define IRMD_THREADPOOL_SIZE 16
#define IPCPD_THREADPOOL_SIZE 3
#define IPCPD_MAX_CONNS IRMD_MAX_FLOWS
#define LOG_DIR "/@LOG_DIR@/"
@@ -61,6 +61,11 @@
#define SOCKET_TIMEOUT 4000
#define CDAP_REPLY_TIMEOUT 1000
#define ENROLL_TIMEOUT 2000
+/* RIB configuration for normal */
#define RIB_MAX_PATH_LEN 256
+#define BOOT_NAME "boot"
+#define MEMBERS_NAME "members"
+#define DIF_NAME "dif_name"
+#define DIR_NAME "directory"
-#endif
+#endif /* OUROBOROS_CONFIG */
diff --git a/include/ouroboros/irm_config.h b/include/ouroboros/irm_config.h
index c4a81c23..2be4273e 100644
--- a/include/ouroboros/irm_config.h
+++ b/include/ouroboros/irm_config.h
@@ -47,6 +47,10 @@ enum pol_gam {
COMPLETE = 0
};
+enum pol_cacep {
+ NO_AUTH = 0
+};
+
struct dif_config {
char * dif_name;
enum ipcp_type type;
@@ -57,7 +61,6 @@ struct dif_config {
uint8_t addr_size;
uint8_t cep_id_size;
uint8_t pdu_length_size;
- uint8_t qos_id_size;
uint8_t seqno_size;
bool has_ttl;
@@ -68,6 +71,7 @@ struct dif_config {
enum pol_addr_auth addr_auth_type;
enum pol_gam dt_gam_type;
+ enum pol_gam rm_gam_type;
};
/* Shim UDP */
struct {
diff --git a/include/ouroboros/shm_rdrbuff.h b/include/ouroboros/shm_rdrbuff.h
index cdac51f0..2e23381b 100644
--- a/include/ouroboros/shm_rdrbuff.h
+++ b/include/ouroboros/shm_rdrbuff.h
@@ -78,9 +78,9 @@ uint8_t * shm_du_buff_head_alloc(struct shm_du_buff * sdb,
uint8_t * shm_du_buff_tail_alloc(struct shm_du_buff * sdb,
size_t size);
-int shm_du_buff_head_release(struct shm_du_buff * sdb,
+void shm_du_buff_head_release(struct shm_du_buff * sdb,
size_t size);
-int shm_du_buff_tail_release(struct shm_du_buff * sdb,
+void shm_du_buff_tail_release(struct shm_du_buff * sdb,
size_t size);
#endif /* OUROBOROS_SHM_RDRBUFF_H */