From 611aba00053ce1566425db717fd959466b791b85 Mon Sep 17 00:00:00 2001 From: Michel Stam Date: Mon, 21 Jul 2014 17:30:28 +0200 Subject: [PATCH] cdp: Make it possible to enable CDPv2 without enabling CDPv1 --- src/daemon/lldpd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c index 05e323a4..4848f6f3 100644 --- a/src/daemon/lldpd.c +++ b/src/daemon/lldpd.c @@ -1598,6 +1598,16 @@ lldpd_main(int argc, char *argv[], char *envp[]) protos[i].enabled = 1; } + /* With -cccc disable CDPV1, enable CDPV2 */ + if (protos[i].mode == LLDPD_MODE_CDPV1 && protos[i].enabled >= 4) { + protos[i].enabled = 0; + } + + /* With -cccc disable CDPV1, enable CDPV2; -ccccc will force CDPv2 */ + if (protos[i].mode == LLDPD_MODE_CDPV2 && protos[i].enabled == 4) { + protos[i].enabled = 1; + } + if (protos[i].enabled > 1) log_info("main", "protocol %s enabled and forced", protos[i].name); else if (protos[i].enabled) -- 2.39.5