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_circuit.h | |
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_circuit.h')
-rw-r--r-- | isisd/isis_circuit.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h index e0ea4f78b..2371c0b73 100644 --- a/isisd/isis_circuit.h +++ b/isisd/isis_circuit.h @@ -121,8 +121,7 @@ struct isis_circuit { uint16_t psnp_interval[2]; /* psnp-interval in seconds */ uint8_t metric[2]; uint32_t te_metric[2]; - struct mpls_te_circuit - *mtc; /* Support for MPLS-TE parameters - see isis_te.[c,h] */ + struct mpls_te_circuit *mtc; /* MPLS-TE parameters */ int ip_router; /* Route IP ? */ int is_passive; /* Is Passive ? */ struct list *mt_settings; /* IS-IS MT Settings */ |