summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/irmd/main.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 8ac645df..5f793afd 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -425,7 +425,7 @@ static int enroll_ipcp(pid_t api,
return -1;
}
- pthread_rwlock_rdlock(&irmd->reg_lock);
+ pthread_rwlock_wrlock(&irmd->reg_lock);
entry = get_ipcp_entry_by_api(api);
if (entry == NULL) {
@@ -435,6 +435,13 @@ static int enroll_ipcp(pid_t api,
return -1;
}
+ if (entry->dif_name != NULL) {
+ pthread_rwlock_unlock(&irmd->reg_lock);
+ pthread_rwlock_unlock(&irmd->state_lock);
+ LOG_ERR("IPCP in wrong state");
+ return -1;
+ }
+
entry->dif_name = strdup(dif_name);
if (entry->dif_name == NULL) {
pthread_rwlock_unlock(&irmd->reg_lock);
@@ -443,7 +450,12 @@ static int enroll_ipcp(pid_t api,
return -1;
}
+ pthread_rwlock_unlock(&irmd->reg_lock);
+ pthread_rwlock_unlock(&irmd->state_lock);
+
if (ipcp_enroll(api, dif_name)) {
+ pthread_rwlock_rdlock(&irmd->state_lock);
+ pthread_rwlock_wrlock(&irmd->reg_lock);
free(entry->dif_name);
entry->dif_name = NULL;
pthread_rwlock_unlock(&irmd->reg_lock);
@@ -452,11 +464,8 @@ static int enroll_ipcp(pid_t api,
return -1;
}
- pthread_rwlock_unlock(&irmd->reg_lock);
- pthread_rwlock_unlock(&irmd->state_lock);
-
LOG_INFO("Enrolled IPCP %d in DIF %s.",
- entry->api, dif_name);
+ api, dif_name);
return 0;
}