proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 18:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Cleanup code to test for failure once

Browse Source 
Cleanup the zebra code to test for failure for reading
from stream once instead of once to see if we should
debug and once for the actual failure.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-06-13 09:19:37 -04:00
parent b65928513f
commit 03f290185b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zebra/zserv.c
View File

@ -318,11 +318,12 @@ static int zserv_read(struct thread *thread)
if (already < ZEBRA_HEADER_SIZE) {
nb = stream_read_try(client->ibuf_work, sock,
ZEBRA_HEADER_SIZE - already);
if ((nb == 0 || nb == -1) && IS_ZEBRA_DEBUG_EVENT)
zlog_debug("connection closed socket [%d]",
sock);
if ((nb == 0 || nb == -1))
if ((nb == 0 || nb == -1)) {
if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("connection closed socket [%d]",
sock);
goto zread_fail;
}
if (nb != (ssize_t)(ZEBRA_HEADER_SIZE - already)) {
/* Try again later. */
break;
@ -375,12 +376,13 @@ static int zserv_read(struct thread *thread)
if (already < hdr.length) {
nb = stream_read_try(client->ibuf_work, sock,
hdr.length - already);
if ((nb == 0 || nb == -1) && IS_ZEBRA_DEBUG_EVENT)
zlog_debug(
"connection closed [%d] when reading zebra data",
sock);
if ((nb == 0 || nb == -1))
if ((nb == 0 || nb == -1)) {
if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug(
"connection closed [%d] when reading zebra data",
sock);
goto zread_fail;
}
if (nb != (ssize_t)(hdr.length - already)) {
/* Try again later. */
break;