diff options
| author | lynne <lynne@voltanet.io> | 2020-08-13 01:15:24 +0200 |
|---|---|---|
| committer | lynne <lynne@voltanet.io> | 2020-09-04 15:24:47 +0200 |
| commit | 955357174f5eae2e28f0ce58a4dc55f530ce87c6 (patch) | |
| tree | 3478b02cf06fc3e1f3cdf08e1412a76e84fb97f3 /ldpd/ldpe.c | |
| parent | Merge pull request #6906 from donaldsharp/poll_error (diff) | |
| download | frr-955357174f5eae2e28f0ce58a4dc55f530ce87c6.tar.xz frr-955357174f5eae2e28f0ce58a4dc55f530ce87c6.zip | |
ldpd: Fix issue when starting up LDP with no configuration.
LDP would mark all routes as learned on a non-ldp interface. Then
when LDP was configured the labels were not updated correctly. This
commit fixes issues 6841 and 6842.
Signed-off-by: Lynne Morrison <lynne@voltanet.io>
Diffstat (limited to 'ldpd/ldpe.c')
| -rw-r--r-- | ldpd/ldpe.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index 655313bf1..9078e711f 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -614,10 +614,8 @@ ldpe_dispatch_lde(struct thread *thread) map = imsg.data; nbr = nbr_find_peerid(imsg.hdr.peerid); - if (nbr == NULL) { - log_debug("ldpe_dispatch_lde: cannot find neighbor"); + if (nbr == NULL) break; - } if (nbr->state != NBR_STA_OPER) break; @@ -641,10 +639,8 @@ ldpe_dispatch_lde(struct thread *thread) case IMSG_REQUEST_ADD_END: case IMSG_WITHDRAW_ADD_END: nbr = nbr_find_peerid(imsg.hdr.peerid); - if (nbr == NULL) { - log_debug("ldpe_dispatch_lde: cannot find neighbor"); + if (nbr == NULL) break; - } if (nbr->state != NBR_STA_OPER) break; |