diff options
| author | Christian Hopps <chopps@labn.net> | 2022-02-24 01:43:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 01:43:48 -0500 |
| commit | 7bf63db79b7848b73e1cef49f3496038644bea16 (patch) | |
| tree | 2c95921d910689673348e60f9614de7d9d00c4e7 /pimd/pim_msdp_socket.c | |
| parent | ca6c97340b013e140c0cb31737858f7c672b7dfb (diff) | |
| parent | cc9f21da2218d95567eff1501482ce58e6600f54 (diff) | |
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'pimd/pim_msdp_socket.c')
| -rw-r--r-- | pimd/pim_msdp_socket.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index 5fff9fca0e..facb771c25 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -62,7 +62,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd) } /* passive peer socket accept */ -static int pim_msdp_sock_accept(struct thread *thread) +static void pim_msdp_sock_accept(struct thread *thread) { union sockunion su; struct pim_instance *pim = THREAD_ARG(thread); @@ -77,7 +77,7 @@ static int pim_msdp_sock_accept(struct thread *thread) if (accept_sock < 0) { flog_err(EC_LIB_DEVELOPMENT, "accept_sock is negative value %d", accept_sock); - return -1; + return; } pim->msdp.listener.thread = NULL; thread_add_read(router->master, pim_msdp_sock_accept, pim, accept_sock, @@ -88,7 +88,7 @@ static int pim_msdp_sock_accept(struct thread *thread) if (msdp_sock < 0) { flog_err_sys(EC_LIB_SOCKET, "pim_msdp_sock_accept failed (%s)", safe_strerror(errno)); - return -1; + return; } /* see if have peer config for this */ @@ -100,7 +100,7 @@ static int pim_msdp_sock_accept(struct thread *thread) "msdp peer connection refused from %pSU", &su); } close(msdp_sock); - return -1; + return; } if (PIM_DEBUG_MSDP_INTERNAL) { @@ -122,7 +122,6 @@ static int pim_msdp_sock_accept(struct thread *thread) set_nonblocking(mp->fd); pim_msdp_update_sock_send_buffer_size(mp->fd); pim_msdp_peer_established(mp); - return 0; } /* global listener for the MSDP well know TCP port */ |