summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-03 18:16:13 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-03 18:16:13 +0100
commit6df75c8d3c8b0c4820b930d5126620fd48b2c011 (patch)
tree5761c728e8c14604936b143d4b14748986788893 /include
parenta16840ada8b783704385d2a25d4a48476165fa75 (diff)
parent87f14f365efdcbda7fb7b77e0b0e5faddd13f4a3 (diff)
downloadouroboros-6df75c8d3c8b0c4820b930d5126620fd48b2c011.tar.gz
ouroboros-6df75c8d3c8b0c4820b930d5126620fd48b2c011.zip
Merged in dstaesse/ouroboros/be-common (pull request #20)
include: Fixed missing 'struct', renamed dif_info
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/common.h2
-rw-r--r--include/ouroboros/ipcp.h2
-rw-r--r--include/ouroboros/irm.h2
-rw-r--r--include/ouroboros/sockets.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index f5810bcd..00d1f482 100644
--- a/include/ouroboros/common.h
+++ b/include/ouroboros/common.h
@@ -54,7 +54,7 @@ struct qos_spec {
/* FIXME: What should be configurable in the DIF? */
struct dif_config {
/* general data */
- qos_spec * qosspecs;
+ struct qos_spec * qosspecs;
/* TODO: efficient policies */
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 91223bec..7b53d827 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -35,7 +35,7 @@ int ipcp_unreg(int instance,
char ** difs);
int ipcp_bootstrap(int instance,
- struct dif_info info);
+ struct dif_conf conf);
int ipcp_enroll(int instance,
char * dif_name,
rina_name_t member);
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 819675d1..459b0e9f 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -30,7 +30,7 @@ int irm_create_ipcp(rina_name_t name,
int irm_destroy_ipcp(rina_name_t name);
int irm_bootstrap_ipcp(rina_name_t name,
- struct dif_info info);
+ struct dif_config conf);
int irm_enroll_ipcp(rina_name_t name,
char * dif_name);
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 88e9564b..e2409c2b 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -39,7 +39,7 @@ struct irm_msg {
enum irm_msg_code code;
rina_name_t * name;
char * ipcp_type;
- struct dif_info * info;
+ struct dif_config * conf;
char * dif_name;
char ** difs;
size_t difs_size;