From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 7 Jul 2009 09:42:35 +0000 (+0200)
Subject: Fix bug in CDP packet generation: CDP version was always 1.
X-Git-Tag: 0.4.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be685f6debbc8e4c3afe7433837e93aa2c96ad1d;p=thirdparty%2Flldpd.git

Fix bug in CDP packet generation: CDP version was always 1.

"(a && b) || c" gives 0 or 1, not b or c. Replace with a?b:c.
---

diff --git a/src/cdp.c b/src/cdp.c
index 3febcb19..95cb6c87 100644
--- a/src/cdp.c
+++ b/src/cdp.c
@@ -76,7 +76,7 @@ cdp_send(struct lldpd *global, struct lldpd_chassis *chassis,
 	/* CDP header */
 	if (!(
 	      POKE_SAVE(pos_cdp) &&
-	      POKE_UINT8(((version == 0) && 1) || version) &&
+	      POKE_UINT8((version == 0)?1:version) &&
 	      POKE_UINT8(chassis->c_ttl) &&
 	      POKE_SAVE(pos_checksum) && /* Save checksum position */
 	      POKE_UINT16(0)))