diff options
| author | dimitri staessens <[email protected]> | 2016-06-24 18:57:34 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2016-06-24 18:57:34 +0200 |
| commit | 76eff8e31eb1e6a6b65284ec4d33cfa088008c3d (patch) | |
| tree | bbb7186d986f9555e457768504f9ad0ad7cbbaad /src/irmd | |
| parent | 0abbbd9fb6499d02d04a5007e803eb79306c341b (diff) | |
| parent | 4b5eaafdc9b61307a6a4074366372df3c170372e (diff) | |
| download | ouroboros-76eff8e31eb1e6a6b65284ec4d33cfa088008c3d.tar.gz ouroboros-76eff8e31eb1e6a6b65284ec4d33cfa088008c3d.zip | |
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-irmd-registry
Diffstat (limited to 'src/irmd')
| -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 edbf2d69..bc57c4b2 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> @@ -1049,7 +1049,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; @@ -1079,16 +1078,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; @@ -1098,7 +1088,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); |