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 0f3df5c51386f9be6b66a4adadbcf235068a1ad9..62d75ae289eb8dceddfc59a99a991d8cc2cbbdc6 100644 (file)
--- a/src/cdp.c
+++ b/src/cdp.c
@@ -79,7 +79,7 @@ cdp_send(struct lldpd *global,
        /* 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)))