proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:09:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3364 from opensourcerouting/bugfix/isis-ipv6-only

Browse Source 
IS-IS: Bugfix ipv6 only
This commit is contained in:
Russ White 2018-11-26 08:00:25 -05:00 committed by GitHub
commit 63d3ca26f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
isisd/isis_mt.c
View File

@ -398,7 +398,7 @@ bool tlvs_to_adj_mt_set(struct isis_tlvs *tlvs, bool v4_usable, bool v6_usable,
&& !tlvs->mt_router_info_empty) { && !tlvs->mt_router_info_empty) {
/* Other end does not have MT enabled */ /* Other end does not have MT enabled */
if (mt_settings[i]->mtid == ISIS_MT_IPV4_UNICAST if (mt_settings[i]->mtid == ISIS_MT_IPV4_UNICAST
&& v4_usable) && (v4_usable || v6_usable))
adj_mt_set(adj, intersect_count++, adj_mt_set(adj, intersect_count++,
ISIS_MT_IPV4_UNICAST); ISIS_MT_IPV4_UNICAST);
} else { } else {

2
isisd/isis_tlvs.c
View File

@ -3407,7 +3407,7 @@ static void tlvs_protocols_supported_to_adj(struct isis_tlvs *tlvs,
reduced.nlpids[0] = NLPID_IP; reduced.nlpids[0] = NLPID_IP;
} else if (ipv6_supported) { } else if (ipv6_supported) {
reduced.count = 1; reduced.count = 1;
reduced.nlpids[1] = NLPID_IPV6; reduced.nlpids[0] = NLPID_IPV6;
} else { } else {
reduced.count = 0; reduced.count = 0;
} }