matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #15841 from pguibert6WIND/dx6_support

Browse source 
zebra, sharpd: add srv6 End.DX6 support
This commit is contained in:
Donatas Abraitis 2024-04-26 23:25:34 +03:00 committed by GitHub
parent d3c556652a f6e58d26f6
commit 03a4765cda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sharpd/sharp_vty.c
View file

@ -448,6 +448,7 @@ DEFPY (install_seg6local_routes,
End_X$seg6l_endx X:X::X:X$seg6l_endx_nh6|\ End_X$seg6l_endx X:X::X:X$seg6l_endx_nh6|\
End_T$seg6l_endt (1-4294967295)$seg6l_endt_table|\ End_T$seg6l_endt (1-4294967295)$seg6l_endt_table|\
End_DX4$seg6l_enddx4 A.B.C.D$seg6l_enddx4_nh4|\ End_DX4$seg6l_enddx4 A.B.C.D$seg6l_enddx4_nh4|\
End_DX6$seg6l_enddx6 X:X::X:X$seg6l_enddx6_nh6|\
End_DT6$seg6l_enddt6 (1-4294967295)$seg6l_enddt6_table|\ End_DT6$seg6l_enddt6 (1-4294967295)$seg6l_enddt6_table|\
End_DT4$seg6l_enddt4 (1-4294967295)$seg6l_enddt4_table|\ End_DT4$seg6l_enddt4 (1-4294967295)$seg6l_enddt4_table|\
End_DT46$seg6l_enddt46 (1-4294967295)$seg6l_enddt46_table>\ End_DT46$seg6l_enddt46 (1-4294967295)$seg6l_enddt46_table>\
@ -467,6 +468,8 @@ DEFPY (install_seg6local_routes,
"Redirect table id to use\n" "Redirect table id to use\n"
"SRv6 End.DX4 function to use\n" "SRv6 End.DX4 function to use\n"
"V4 Nexthop address to use\n" "V4 Nexthop address to use\n"
"SRv6 End.DX6 function to use\n"
"V6 Nexthop address to use\n"
"SRv6 End.DT6 function to use\n" "SRv6 End.DT6 function to use\n"
"Redirect table id to use\n" "Redirect table id to use\n"
"SRv6 End.DT4 function to use\n" "SRv6 End.DT4 function to use\n"
@ -516,6 +519,9 @@ DEFPY (install_seg6local_routes,
if (seg6l_enddx4) { if (seg6l_enddx4) {
action = ZEBRA_SEG6_LOCAL_ACTION_END_DX4; action = ZEBRA_SEG6_LOCAL_ACTION_END_DX4;
ctx.nh4 = seg6l_enddx4_nh4; ctx.nh4 = seg6l_enddx4_nh4;
} else if (seg6l_enddx6) {
action = ZEBRA_SEG6_LOCAL_ACTION_END_DX6;
ctx.nh6 = seg6l_enddx6_nh6;
} else if (seg6l_endx) { } else if (seg6l_endx) {
action = ZEBRA_SEG6_LOCAL_ACTION_END_X; action = ZEBRA_SEG6_LOCAL_ACTION_END_X;
ctx.nh6 = seg6l_endx_nh6; ctx.nh6 = seg6l_endx_nh6;

23
zebra/rt_netlink.c
View file

@ -1683,6 +1683,16 @@ static bool _netlink_route_build_singlepath(const struct prefix *p,
sizeof(struct in_addr))) sizeof(struct in_addr)))
return false; return false;
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_DX6:
if (!nl_attr_put32(nlmsg, req_size,
SEG6_LOCAL_ACTION,
SEG6_LOCAL_ACTION_END_DX6))
return false;
if (!nl_attr_put(nlmsg, req_size,
SEG6_LOCAL_NH6, &ctx->nh6,
sizeof(struct in_addr)))
return false;
break;
case ZEBRA_SEG6_LOCAL_ACTION_END_DT6: case ZEBRA_SEG6_LOCAL_ACTION_END_DT6:
if (!nl_attr_put32(nlmsg, req_size, if (!nl_attr_put32(nlmsg, req_size,
SEG6_LOCAL_ACTION, SEG6_LOCAL_ACTION,
@ -1714,7 +1724,6 @@ static bool _netlink_route_build_singlepath(const struct prefix *p,
return false; return false;
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_DX2: case ZEBRA_SEG6_LOCAL_ACTION_END_DX2:
case ZEBRA_SEG6_LOCAL_ACTION_END_DX6:
case ZEBRA_SEG6_LOCAL_ACTION_END_B6: case ZEBRA_SEG6_LOCAL_ACTION_END_B6:
case ZEBRA_SEG6_LOCAL_ACTION_END_B6_ENCAP: case ZEBRA_SEG6_LOCAL_ACTION_END_B6_ENCAP:
case ZEBRA_SEG6_LOCAL_ACTION_END_BM: case ZEBRA_SEG6_LOCAL_ACTION_END_BM:
@ -2931,6 +2940,18 @@ ssize_t netlink_nexthop_msg_encode(uint16_t cmd,
sizeof(struct in_addr))) sizeof(struct in_addr)))
return 0; return 0;
break; break;
case SEG6_LOCAL_ACTION_END_DX6:
if (!nl_attr_put32(&req->n,
buflen,
SEG6_LOCAL_ACTION,
SEG6_LOCAL_ACTION_END_DX6))
return 0;
if (!nl_attr_put(&req->n, buflen,
SEG6_LOCAL_NH6,
&ctx->nh6,
sizeof(struct in_addr)))
return 0;
break;
case SEG6_LOCAL_ACTION_END_DT6: case SEG6_LOCAL_ACTION_END_DT6:
if (!nl_attr_put32( if (!nl_attr_put32(
&req->n, buflen, &req->n, buflen,