diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2019-04-15 16:11:40 +0200 |
|---|---|---|
| committer | Olivier Dugeon <olivier.dugeon@orange.com> | 2019-04-25 18:59:26 +0200 |
| commit | 2e2a8b913607fa7ea8744f1fee98208e38cef5df (patch) | |
| tree | 2cee1a8859c39a3f75913c277fb3c8ace65284f3 /isisd/isis_lsp.c | |
| parent | Merge pull request #4187 from donaldsharp/doc_pim (diff) | |
| download | frr-2e2a8b913607fa7ea8744f1fee98208e38cef5df.tar.xz frr-2e2a8b913607fa7ea8744f1fee98208e38cef5df.zip | |
isisd: Add IS-IS-TE support per Area
Solve issue #4032
- Change MPLS-TE from global to per Area
- Add new mpls_te_area structure to area in replacement of global variable
isisMPLS_TE
- Move mpls-te from global to instance in frr-isisd.yang
- Change code in isis_te.c, isis_northbound.c, isis_cli.c, isis_pdu.c,
isis_lsp.c and isis_zebra.c accordingly
Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'isisd/isis_lsp.c')
| -rw-r--r-- | isisd/isis_lsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index b56a56fa3..0a9f13e6d 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -1070,7 +1070,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area) uint8_t subtlvs[256]; uint8_t subtlv_len; - if (IS_MPLS_TE(isisMplsTE) + if (IS_MPLS_TE(area->mta) && circuit->interface && HAS_LINK_PARAMS( circuit->interface)) @@ -1112,7 +1112,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area) uint8_t subtlvs[256]; uint8_t subtlv_len; - if (IS_MPLS_TE(isisMplsTE) + if (IS_MPLS_TE(area->mta) && circuit->interface != NULL && HAS_LINK_PARAMS( circuit->interface)) |