diff options
| author | Dimitri Staessens <[email protected]> | 2017-11-29 18:23:48 +0100 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-11-29 18:36:27 +0100 |
| commit | a781a1611f6b1efe9711dab96dee57ea785280fb (patch) | |
| tree | e9991fe1e070b46481ec46ecb15ecf16843a737f /src/ipcpd | |
| parent | 4be8eb2ef77648e71ce22b465a49991b532d1ace (diff) | |
| download | ouroboros-a781a1611f6b1efe9711dab96dee57ea785280fb.tar.gz ouroboros-a781a1611f6b1efe9711dab96dee57ea785280fb.zip | |
ipcpd: Don't bind from the IPCP
The binding of the normal IPCP to its name is moved from the source
code to the irm tool introducing the "autobind" option for the
bootstrap and enroll commands. With this option, the IPCP will be
bound to the IPCP name and the DIF name automatically.
Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/normal/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/main.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt index c84d66ce..de0cd4af 100644 --- a/src/ipcpd/normal/CMakeLists.txt +++ b/src/ipcpd/normal/CMakeLists.txt @@ -50,7 +50,7 @@ set(SOURCE_FILES add_executable(ipcpd-normal ${SOURCE_FILES} ${IPCP_SOURCES} ${FLOW_ALLOC_SRCS} ${LS_PROTO_SRCS} ${KAD_PROTO_SRCS} ${ENROLL_PROTO_SRCS}) -target_link_libraries(ipcpd-normal LINK_PUBLIC ouroboros-dev ouroboros-irm) +target_link_libraries(ipcpd-normal LINK_PUBLIC ouroboros-dev) include(AddCompileFlags) if (CMAKE_BUILD_TYPE MATCHES "Debug*") diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 719be77c..772b5792 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -29,7 +29,6 @@ #include <ouroboros/errno.h> #include <ouroboros/hash.h> #include <ouroboros/ipcp-dev.h> -#include <ouroboros/irm.h> #include <ouroboros/logs.h> #include <ouroboros/notifier.h> #include <ouroboros/rib.h> @@ -304,11 +303,6 @@ int main(int argc, goto fail_init; } - if (irm_bind_api(getpid(), ipcpi.name)) { - log_err("Failed to bind AP name."); - goto fail_bind_api; - } - /* These components must be init at creation. */ if (rib_init("ipcpd-normal")) { log_err("Failed to initialize RIB."); @@ -357,8 +351,6 @@ int main(int argc, rib_fini(); - irm_unbind_api(getpid(), ipcpi.name); - ipcp_fini(); exit(EXIT_SUCCESS); @@ -374,8 +366,6 @@ int main(int argc, fail_connmgr_init: rib_fini(); fail_rib_init: - irm_unbind_api(getpid(), ipcpi.name); - fail_bind_api: ipcp_fini(); fail_init: ipcp_create_r(getpid(), -1); |