proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 16:39:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1764 from Orange-OpenSource/SR-dev

Browse Source 
OSPFD: Fix Segment Routing Lan Adjacency TLVs
This commit is contained in:
Russ White 2018-02-27 08:56:33 -05:00 committed by GitHub
commit 3eef1b20ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ospfd/ospf_ext.c
View File

@ -334,10 +334,12 @@ static void set_prefix_sid(struct ext_itf *exti, uint8_t algorithm,
/* Set Label or Index value */ /* Set Label or Index value */
if (value_type == SID_LABEL) { if (value_type == SID_LABEL) {
TLV_LEN(exti->node_sid) = htons(SID_LABEL_SIZE); TLV_LEN(exti->node_sid) =
htons(SID_LABEL_SIZE(EXT_SUBTLV_PREFIX_SID_SIZE));
exti->node_sid.value = htonl(SET_LABEL(value)); exti->node_sid.value = htonl(SET_LABEL(value));
} else { } else {
TLV_LEN(exti->node_sid) = htons(SID_INDEX_SIZE); TLV_LEN(exti->node_sid) =
htons(SID_INDEX_SIZE(EXT_SUBTLV_PREFIX_SID_SIZE));
exti->node_sid.value = htonl(value); exti->node_sid.value = htonl(value);
} }
@ -370,11 +372,13 @@ static void set_adj_sid(struct ext_itf *exti, bool backup, uint32_t value,
/* Adjust Length, Flags and Value depending on the type of Label */ /* Adjust Length, Flags and Value depending on the type of Label */
if (value_type == SID_LABEL) { if (value_type == SID_LABEL) {
SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG); SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG);
TLV_LEN(exti->adj_sid[index]) = htons(SID_LABEL_SIZE); TLV_LEN(exti->adj_sid[index]) =
htons(SID_LABEL_SIZE(EXT_SUBTLV_ADJ_SID_SIZE));
exti->adj_sid[index].value = htonl(SET_LABEL(value)); exti->adj_sid[index].value = htonl(SET_LABEL(value));
} else { } else {
UNSET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG); UNSET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG);
TLV_LEN(exti->adj_sid[index]) = htons(SID_INDEX_SIZE); TLV_LEN(exti->adj_sid[index]) =
htons(SID_INDEX_SIZE(EXT_SUBTLV_ADJ_SID_SIZE));
exti->adj_sid[index].value = htonl(value); exti->adj_sid[index].value = htonl(value);
} }
@ -402,7 +406,7 @@ static void set_lan_adj_sid(struct ext_itf *exti, bool backup, uint32_t value,
} }
/* Set Header */ /* Set Header */
TLV_TYPE(exti->lan_sid[index]) = htons(EXT_SUBTLV_ADJ_SID); TLV_TYPE(exti->lan_sid[index]) = htons(EXT_SUBTLV_LAN_ADJ_SID);
/* Only Local ADJ-SID is supported for the moment */ /* Only Local ADJ-SID is supported for the moment */
SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_LFLG); SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_LFLG);
@ -410,11 +414,13 @@ static void set_lan_adj_sid(struct ext_itf *exti, bool backup, uint32_t value,
/* Adjust Length, Flags and Value depending on the type of Label */ /* Adjust Length, Flags and Value depending on the type of Label */
if (value_type == SID_LABEL) { if (value_type == SID_LABEL) {
SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG); SET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG);
TLV_LEN(exti->lan_sid[index]) = htons(SID_LABEL_SIZE); TLV_LEN(exti->lan_sid[index]) =
htons(SID_LABEL_SIZE(EXT_SUBTLV_PREFIX_RANGE_SIZE));
exti->lan_sid[index].value = htonl(SET_LABEL(value)); exti->lan_sid[index].value = htonl(SET_LABEL(value));
} else { } else {
UNSET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG); UNSET_FLAG(flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG);
TLV_LEN(exti->lan_sid[index]) = htons(SID_INDEX_SIZE); TLV_LEN(exti->lan_sid[index]) =
htons(SID_INDEX_SIZE(EXT_SUBTLV_PREFIX_RANGE_SIZE));
exti->lan_sid[index].value = htonl(value); exti->lan_sid[index].value = htonl(value);
} }
@ -906,7 +912,7 @@ static void ospf_ext_link_lsa_body_set(struct stream *s, struct ext_itf *exti)
/* Build LSA body for an Extended Link TLV with Adj. SID */ /* Build LSA body for an Extended Link TLV with Adj. SID */
build_tlv_header(s, &exti->link.header); build_tlv_header(s, &exti->link.header);
stream_put(s, TLV_DATA(&exti->link.header), EXT_TLV_LINK_SIZE); stream_put(s, TLV_DATA(&exti->link.header), EXT_TLV_LINK_SIZE);
/* then add Ajacency SubTLVs */ /* then add Adjacency SubTLVs */
build_tlv(s, &exti->adj_sid[1].header); build_tlv(s, &exti->adj_sid[1].header);
build_tlv(s, &exti->adj_sid[0].header); build_tlv(s, &exti->adj_sid[0].header);
@ -921,8 +927,8 @@ static void ospf_ext_link_lsa_body_set(struct stream *s, struct ext_itf *exti)
/* Build LSA body for an Extended Link TLV with LAN SID */ /* Build LSA body for an Extended Link TLV with LAN SID */
build_tlv_header(s, &exti->link.header); build_tlv_header(s, &exti->link.header);
stream_put(s, &exti->link.header, EXT_TLV_LINK_SIZE); stream_put(s, TLV_DATA(&exti->link.header), EXT_TLV_LINK_SIZE);
/* then add LAN-Ajacency SubTLVs */ /* then add LAN-Adjacency SubTLVs */
build_tlv(s, &exti->lan_sid[1].header); build_tlv(s, &exti->lan_sid[1].header);
build_tlv(s, &exti->lan_sid[0].header); build_tlv(s, &exti->lan_sid[0].header);
} }
@ -1671,8 +1677,9 @@ static uint16_t show_vty_ext_link_lan_adj_sid(struct vty *vty,
vty_out(vty, vty_out(vty,
" LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: " " LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: "
"0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: " "0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: "
"%s\n\tLabel: %u\n", "%s\n\t%s: %u\n",
ntohs(top->header.length), top->flags, top->mtid, top->weight, ntohs(top->header.length), top->flags, top->mtid, top->weight,
inet_ntoa(top->neighbor_id),
CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label" CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label"
: "Index", : "Index",
CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG)

6
ospfd/ospf_sr.c
View File

@ -491,6 +491,12 @@ static int compute_link_nhlfe(struct sr_link *srl)
srl->nhlfe[0].ifindex = nh->oi->ifp->ifindex; srl->nhlfe[0].ifindex = nh->oi->ifp->ifindex;
srl->nhlfe[1].ifindex = nh->oi->ifp->ifindex; srl->nhlfe[1].ifindex = nh->oi->ifp->ifindex;
/* Update neighbor address for LAN_ADJ_SID */
if (srl->type == LAN_ADJ_SID) {
IPV4_ADDR_COPY(&srl->nhlfe[0].nexthop, &nh->src);
IPV4_ADDR_COPY(&srl->nhlfe[1].nexthop, &nh->src);
}
/* Set Input & Output Label */ /* Set Input & Output Label */
if (CHECK_FLAG(srl->flags[0], EXT_SUBTLV_LINK_ADJ_SID_VFLG)) if (CHECK_FLAG(srl->flags[0], EXT_SUBTLV_LINK_ADJ_SID_VFLG))
srl->nhlfe[0].label_in = srl->sid[0]; srl->nhlfe[0].label_in = srl->sid[0];

5
ospfd/ospf_sr.h
View File

@ -49,11 +49,10 @@
/* Segment Routing TLVs as per draft-ietf-ospf-segment-routing-extensions-19 */ /* Segment Routing TLVs as per draft-ietf-ospf-segment-routing-extensions-19 */
/* Segment ID could be a Label (3 bytes) or an Index (4 bytes) */ /* Segment ID could be a Label (3 bytes) or an Index (4 bytes) */
#define SID_BASE_SIZE 4
#define SID_LABEL 3 #define SID_LABEL 3
#define SID_LABEL_SIZE (SID_BASE_SIZE + SID_LABEL) #define SID_LABEL_SIZE(U) (U - 1)
#define SID_INDEX 4 #define SID_INDEX 4
#define SID_INDEX_SIZE (SID_BASE_SIZE + SID_INDEX) #define SID_INDEX_SIZE(U) (U)
/* SID/Label Sub TLV - section 2.1 */ /* SID/Label Sub TLV - section 2.1 */
#define SUBTLV_SID_LABEL 1 #define SUBTLV_SID_LABEL 1