summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-11 16:46:59 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-11 16:46:59 +0200
commitcf30e07cf862b117013e8c7fa2fb5c2ac8fef245 (patch)
treedf02b2c3659bd69a146586eaef985a3749780648 /src
parente5a7b3bd7ebe473c035df2cee58416f848f56389 (diff)
parentb3c27cda358c24e867a42199e0d5702d9d0b1607 (diff)
downloadouroboros-cf30e07cf862b117013e8c7fa2fb5c2ac8fef245.tar.gz
ouroboros-cf30e07cf862b117013e8c7fa2fb5c2ac8fef245.zip
Merged in dstaesse/ouroboros/be-bind-api (pull request #208)
ipcpd: normal: Fix log message
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/ipcp.c4
-rw-r--r--src/ipcpd/normal/main.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 784d845a..24f580e5 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -173,6 +173,7 @@ void * ipcp_main_loop(void * o)
}
conf_msg = msg->conf;
conf.type = conf_msg->ipcp_type;
+ conf.dif_name = conf_msg->dif_name;
if (conf_msg->ipcp_type == IPCP_NORMAL) {
conf.addr_size = conf_msg->addr_size;
conf.cep_id_size = conf_msg->cep_id_size;
@@ -202,8 +203,7 @@ void * ipcp_main_loop(void * o)
break;
}
ret_msg.has_result = true;
- ret_msg.result =
- _ipcp->ops->ipcp_enroll(msg->dif_name);
+ ret_msg.result = _ipcp->ops->ipcp_enroll(msg->dif_name);
break;
case IPCP_MSG_CODE__IPCP_NAME_REG:
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 1599166d..b5aad271 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -135,7 +135,7 @@ static int normal_ipcp_enroll(char * dif_name)
if (_ipcp->state != IPCP_INIT) {
pthread_rwlock_unlock(&_ipcp->state_lock);
- LOG_DBGF("Won't enroll an IPCP that is not in INIT.");
+ LOG_ERR("Won't enroll an IPCP that is not in INIT.");
return -1; /* -ENOTINIT */
}
@@ -161,11 +161,13 @@ static int normal_ipcp_enroll(char * dif_name)
static int normal_ipcp_bootstrap(struct dif_config * conf)
{
+ LOG_DBGF("bootstrapping in dif %s.", conf->dif_name);
+
pthread_rwlock_rdlock(&_ipcp->state_lock);
if (_ipcp->state != IPCP_INIT) {
pthread_rwlock_unlock(&_ipcp->state_lock);
- LOG_DBGF("Won't bootstrap an IPCP that is not in INIT.");
+ LOG_ERR("Won't bootstrap an IPCP that is not in INIT.");
return -1; /* -ENOTINIT */
}
@@ -176,7 +178,7 @@ static int normal_ipcp_bootstrap(struct dif_config * conf)
}
if (api_bind(conf->dif_name) < 0) {
- printf("Failed to bind the server api.");
+ LOG_ERR("Failed to bind the server AP instance.");
return -1;
}