diff options
| author | dimitri staessens <[email protected]> | 2017-08-28 18:54:22 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2017-08-28 20:49:34 +0200 |
| commit | 9de8dc4948cf7ce239232aae0889c39ffa39ede2 (patch) | |
| tree | 396295b2d36f69ee55e5080e556891f11210aed8 /src/ipcpd/normal/main.c | |
| parent | 176698e8c2fd7ab8007b8074515d6144e7177d8e (diff) | |
| download | ouroboros-9de8dc4948cf7ce239232aae0889c39ffa39ede2.tar.gz ouroboros-9de8dc4948cf7ce239232aae0889c39ffa39ede2.zip | |
tools: Add tool to connect IPCP components
This enables user-written tools to instruct IPCPs to establish and
tear down connections (a.k.a. adjacencies) between its internal
components (Management and Data Transfer).
For more info, do "irm ipcp connect" or "irm ipcp disconnect" on the
command line.
This commit exposes a deletion bug in the RIB where FSO's fail to
unpack/parse. This will be fixed when the RIB is deprecated.
Diffstat (limited to 'src/ipcpd/normal/main.c')
| -rw-r--r-- | src/ipcpd/normal/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index d9fbc2dd..bef04b7a 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -263,11 +263,12 @@ static int normal_ipcp_enroll(const char * dst, } if (enroll_components(dt_conn.conn_info.addr)) { + enroll_done(&er_conn, -1); log_err("Failed to enroll components."); goto fail_enroll_comp; } - if (enroll_done(&er_conn)) + if (enroll_done(&er_conn, 0)) log_warn("Failed to confirm enrollment with peer."); if (connmgr_dealloc(AEID_DT, &dt_conn)) @@ -346,6 +347,8 @@ static int normal_ipcp_query(const uint8_t * dst) static struct ipcp_ops normal_ops = { .ipcp_bootstrap = normal_ipcp_bootstrap, .ipcp_enroll = normal_ipcp_enroll, + .ipcp_connect = connmgr_ipcp_connect, + .ipcp_disconnect = connmgr_ipcp_disconnect, .ipcp_reg = dir_reg, .ipcp_unreg = dir_unreg, .ipcp_query = normal_ipcp_query, |