From e87f2b683446fe424dc5e8fed60456240e080562 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sun, 3 Mar 2019 19:08:48 +0100 Subject: ipcpd: Refactor create_r and flow_req_arr The API calls for the IPCP to inform the IRMd of IPCP creation and incoming flow request had the pid_t in the call. This pid_t is removed and the getpid() call is now placed inside the function. Also refactors the cleanup for the main() functions of some of the lower IPCPs. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/ipcpd/normal/fa.c | 3 +-- src/ipcpd/normal/main.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/ipcpd/normal') diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c index 30d87df5..e03467c2 100644 --- a/src/ipcpd/normal/fa.c +++ b/src/ipcpd/normal/fa.c @@ -218,8 +218,7 @@ static void * fa_handle_packet(void * o) qs.in_order = msg->in_order; qs.max_gap = ntoh32(msg->max_gap); - fd = ipcp_flow_req_arr(getpid(), - (uint8_t *) (msg + 1), + fd = ipcp_flow_req_arr((uint8_t *) (msg + 1), ipcp_dir_hash_len(), qs); if (fd < 0) { diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 7a453a9e..28fc8c5a 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -334,7 +334,7 @@ int main(int argc, goto fail_boot; } - if (ipcp_create_r(getpid(), 0)) { + if (ipcp_create_r(0)) { log_err("Failed to notify IRMd we are initialized."); ipcp_set_state(IPCP_NULL); goto fail_create_r; @@ -373,6 +373,6 @@ int main(int argc, fail_rib_init: ipcp_fini(); fail_init: - ipcp_create_r(getpid(), -1); + ipcp_create_r(-1); exit(EXIT_FAILURE); } -- cgit v1.2.3