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-15 16:22:38 +0200 |
| commit | 9c95fe698634d1663b9f321b588ac4f81d8492c6 (patch) | |
| tree | afb291410a270fd94935108c9a2b2abf315d9fba /isisd/isis_pdu.c | |
| parent | Merge pull request #4130 from donaldsharp/show_frr (diff) | |
| download | frr-9c95fe698634d1663b9f321b588ac4f81d8492c6.tar.xz frr-9c95fe698634d1663b9f321b588ac4f81d8492c6.zip | |
Issue #4032: Add IS-IS-TE support per Area
- 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 frmo 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_pdu.c')
| -rw-r--r-- | isisd/isis_pdu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 8e9302963..8fac3f98f 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -201,8 +201,9 @@ static int process_p2p_hello(struct iih_info *iih) adj); /* Update MPLS TE Remote IP address parameter if possible */ - if (IS_MPLS_TE(isisMplsTE) && iih->circuit->mtc - && IS_CIRCUIT_TE(iih->circuit->mtc) && adj->ipv4_address_count) + if (adj->ipv4_address_count && iih->circuit->area + && IS_MPLS_TE(iih->circuit->area->mta) + && IS_MPLS_TE(iih->circuit->mtc)) set_circuitparams_rmt_ipaddr(iih->circuit->mtc, adj->ipv4_addresses[0]); |