diff options
| author | dimitri staessens <[email protected]> | 2016-06-22 16:56:03 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2016-06-22 16:56:03 +0200 |
| commit | 4b5eaafdc9b61307a6a4074366372df3c170372e (patch) | |
| tree | fbb6c556e833e5af3cead917c8ac547853f0382f /src/irmd/main.c | |
| parent | e24581b93fb3329a1c89b294da15e3375513cf89 (diff) | |
| parent | cf5d13dfd66afd68dd7fe93d009a4539c236b095 (diff) | |
| download | ouroboros-4b5eaafdc9b61307a6a4074366372df3c170372e.tar.gz ouroboros-4b5eaafdc9b61307a6a4074366372df3c170372e.zip | |
Merged in sandervrijders/ouroboros/be (pull request #137)
Be
Diffstat (limited to 'src/irmd/main.c')
| -rw-r--r-- | src/irmd/main.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index 50055c4d..dff052a1 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -27,7 +27,7 @@ #include <ouroboros/sockets.h> #include <ouroboros/irm.h> #include <ouroboros/ipcp.h> -#include <ouroboros/da.h> +#include <ouroboros/nsm.h> #include <ouroboros/list.h> #include <ouroboros/instance_name.h> #include <ouroboros/utils.h> @@ -572,7 +572,6 @@ static int bootstrap_ipcp(instance_name_t * api, static int enroll_ipcp(instance_name_t * api, char * dif_name) { - char * member = NULL; char ** n_1_difs = NULL; ssize_t n_1_difs_size = 0; struct ipcp_entry * entry = NULL; @@ -596,16 +595,7 @@ static int enroll_ipcp(instance_name_t * api, return -1; } - member = da_resolve_daf(dif_name); - if (member == NULL) { - free(entry->dif_name); - entry->dif_name = NULL; - pthread_rwlock_unlock(&instance->reg_lock); - pthread_rwlock_unlock(&instance->state_lock); - return -1; - } - - n_1_difs_size = da_resolve_dap(member, n_1_difs); + n_1_difs_size = nsm_resolve(dif_name, n_1_difs); if (n_1_difs_size < 1) { free(entry->dif_name); entry->dif_name = NULL; @@ -615,7 +605,7 @@ static int enroll_ipcp(instance_name_t * api, return -1; } - if (ipcp_enroll(api->id, member, n_1_difs[0])) { + if (ipcp_enroll(api->id, dif_name, n_1_difs[0])) { free(entry->dif_name); entry->dif_name = NULL; pthread_rwlock_unlock(&instance->reg_lock); |