diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-09-17 10:54:25 -0400 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2015-09-24 15:26:44 +0100 |
| commit | a9d4cb33faa6af622240190a80f41c4672374925 (patch) | |
| tree | 9590bb1715d7418b50a742a3c83363d4e4b67755 /pimd/pim_zlookup.c | |
| parent | f733280419f18b1a0e3b06ec3681781689d57053 (diff) | |
| download | quagga-a9d4cb33faa6af622240190a80f41c4672374925.tar.bz2 quagga-a9d4cb33faa6af622240190a80f41c4672374925.tar.xz | |
lib/zclient: Consolidate error reporting for zclient_read_header
All functions that call zclient_read_header immediately turn around
and check to ensure that the version and marker fields are correct
Move this code into zclient_read_header
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zlookup.c')
| -rw-r--r-- | pimd/pim_zlookup.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index fae8f81c..67896d96 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -196,14 +196,7 @@ static int zclient_read_nexthop(struct zclient *zlookup, zclient_lookup_failed(zlookup); return -3; } - - if (version != ZSERV_VERSION || marker != ZEBRA_HEADER_MARKER) { - zlog_err("%s: socket %d version mismatch, marker %d, version %d", - __func__, zlookup->sock, marker, version); - zclient_lookup_failed(zlookup); - return -4; - } - + if (command != ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB) { zlog_err("%s: socket %d command mismatch: %d", __func__, zlookup->sock, command); |