From e9a9d494fd0d6f04a4d3494b61552f7a8d7b601b Mon Sep 17 00:00:00 2001 From: dv1tas Date: Fri, 21 Jun 2013 09:04:20 +0000 Subject: [PATCH] Don't send BPDUs when in Disabled state Signed-off-by: Satish Ashok Signed-off-by: Vitalii Demianets git-svn-id: svn://svn.code.sf.net/p/mstpd/code/trunk@49 fbe50366-0c72-4402-a84b-5d246361dba7 --- mstp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mstp.c b/mstp.c index 7c329d7..1869e31 100644 --- a/mstp.c +++ b/mstp.c @@ -2243,7 +2243,7 @@ static void txConfig(port_t *prt) bpdu_t b; per_tree_port_t *cist = GET_CIST_PTP_FROM_PORT(prt); - if(prt->deleted || prt->dontTxmtBpdu) + if(prt->deleted || (roleDisabled == cist->role) || prt->dontTxmtBpdu) return; b.protocolIdentifier = 0; @@ -2303,7 +2303,7 @@ static void txMstp(port_t *prt) per_tree_port_t *ptp; msti_configuration_message_t *msti_msg; - if(prt->deleted || prt->dontTxmtBpdu) + if(prt->deleted || (roleDisabled == cist->role) || prt->dontTxmtBpdu) return; b.protocolIdentifier = 0; @@ -2400,8 +2400,9 @@ static void txMstp(port_t *prt) static void txTcn(port_t *prt) { bpdu_t b; + per_tree_port_t *cist = GET_CIST_PTP_FROM_PORT(prt); - if(prt->deleted || prt->dontTxmtBpdu) + if(prt->deleted || (roleDisabled == cist->role) || prt->dontTxmtBpdu) return; b.protocolIdentifier = 0; -- 2.47.2