From 7ee3d13d363700877d02e581cccdb0686996341f Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Wed, 11 Dec 2013 11:55:12 +0100 Subject: [PATCH] cdp: fix regression in CDP packet building The associativity of the ternary operator was not as expected. Put a bunch of parentheses to fix that. --- src/daemon/cdp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/daemon/cdp.c b/src/daemon/cdp.c index 58a0a84a..a66843c5 100644 --- a/src/daemon/cdp.c +++ b/src/daemon/cdp.c @@ -94,9 +94,9 @@ cdp_send(struct lldpd *global, /* Chassis ID */ if (!( POKE_START_CDP_TLV(CDP_TLV_CHASSIS) && - chassis->c_name? - POKE_BYTES(chassis->c_name, strlen(chassis->c_name)): - POKE_BYTES("", 0) && + (chassis->c_name? + POKE_BYTES(chassis->c_name, strlen(chassis->c_name)): + POKE_BYTES("", 0)) && POKE_END_CDP_TLV)) goto toobig; @@ -136,10 +136,10 @@ cdp_send(struct lldpd *global, /* Port ID */ if (!( POKE_START_CDP_TLV(CDP_TLV_PORT) && - hardware->h_lport.p_descr? - POKE_BYTES(hardware->h_lport.p_descr, - strlen(hardware->h_lport.p_descr)): - POKE_BYTES("", 0) && + (hardware->h_lport.p_descr? + POKE_BYTES(hardware->h_lport.p_descr, + strlen(hardware->h_lport.p_descr)): + POKE_BYTES("", 0)) && POKE_END_CDP_TLV)) goto toobig; @@ -189,9 +189,9 @@ cdp_send(struct lldpd *global, /* Software version */ if (!( POKE_START_CDP_TLV(CDP_TLV_SOFTWARE) && - chassis->c_descr? - POKE_BYTES(chassis->c_descr, strlen(chassis->c_descr)): - POKE_BYTES("", 0) && + (chassis->c_descr? + POKE_BYTES(chassis->c_descr, strlen(chassis->c_descr)): + POKE_BYTES("", 0)) && POKE_END_CDP_TLV)) goto toobig; -- 2.39.5