summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--src/irmd/main.c4
-rw-r--r--src/lib/irm.c4
-rw-r--r--src/lib/sockets.c2
-rw-r--r--src/tools/irm/irm_bootstrap_ipcp.c6
8 files changed, 12 insertions, 12 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;
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 0c69de2f..262b737c 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -50,7 +50,7 @@ static void destroy_ipcp(rina_name_t * name)
}
static void bootstrap_ipcp(rina_name_t * name,
- struct dif_info * info)
+ struct dif_config * conf)
{
LOG_MISSING;
}
@@ -114,7 +114,7 @@ int main()
break;
case IRM_BOOTSTRAP_IPCP:
bootstrap_ipcp(msg->name,
- msg->info);
+ msg->conf);
break;
case IRM_ENROLL_IPCP:
enroll_ipcp(msg->name,
diff --git a/src/lib/irm.c b/src/lib/irm.c
index 8756d7fc..519b4eb8 100644
--- a/src/lib/irm.c
+++ b/src/lib/irm.c
@@ -91,13 +91,13 @@ int irm_destroy_ipcp(rina_name_t name)
}
int irm_bootstrap_ipcp(rina_name_t name,
- struct dif_info info)
+ struct dif_config conf)
{
struct irm_msg msg;
msg.code = IRM_BOOTSTRAP_IPCP;
msg.name = &name;
- msg.info = &info;
+ msg.conf = &conf;
if (send_irm_msg(&msg)) {
LOG_ERR("Failed to send message to daemon");
diff --git a/src/lib/sockets.c b/src/lib/sockets.c
index 6cd70a8b..eebd223b 100644
--- a/src/lib/sockets.c
+++ b/src/lib/sockets.c
@@ -223,7 +223,7 @@ buffer_t * serialize_irm_msg(struct irm_msg * msg)
case IRM_DESTROY_IPCP:
break;
case IRM_BOOTSTRAP_IPCP:
- /* FIXME: Fields missing, need to define dif_info properly */
+ /* FIXME: Fields missing, need to define dif_conf properly */
break;
case IRM_ENROLL_IPCP:
if (msg->dif_name == NULL) {
diff --git a/src/tools/irm/irm_bootstrap_ipcp.c b/src/tools/irm/irm_bootstrap_ipcp.c
index 6b640c14..e17ed5ef 100644
--- a/src/tools/irm/irm_bootstrap_ipcp.c
+++ b/src/tools/irm/irm_bootstrap_ipcp.c
@@ -29,7 +29,7 @@
static void usage()
{
- /* FIXME: Add dif_info stuff */
+ /* FIXME: Add dif_config stuff */
printf("Usage: irm bootstrap_ipcp\n"
" ap <application process name>\n"
" [api <application process instance>]\n"
@@ -41,7 +41,7 @@ static void usage()
int do_bootstrap_ipcp(int argc, char ** argv)
{
rina_name_t name;
- struct dif_info info;
+ struct dif_config conf;
name.ap_name = NULL;
name.api_id = 0;
@@ -64,5 +64,5 @@ int do_bootstrap_ipcp(int argc, char ** argv)
return -1;
}
- return irm_bootstrap_ipcp(name, info);
+ return irm_bootstrap_ipcp(name, conf);
}