summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_zebra.c6
-rw-r--r--doc/user/zebra.rst8
-rw-r--r--tests/topotests/zebra_rib/r1/import_init_mrib_table.json16
-rw-r--r--tests/topotests/zebra_rib/r1/import_init_table.json16
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_2.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_3.json36
-rw-r--r--tests/topotests/zebra_rib/r1/import_mrib_table_4.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_2.json32
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_3.json36
-rw-r--r--tests/topotests/zebra_rib/r1/import_table_4.json32
-rw-r--r--zebra/zebra_srv6.c16
11 files changed, 15 insertions, 247 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 9053df3192..16f4a0d2df 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -3699,7 +3699,7 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
// refresh functions
for (ALL_LIST_ELEMENTS(bgp->srv6_functions, node, nnode, func)) {
tmp_prefi.family = AF_INET6;
- tmp_prefi.prefixlen = 128;
+ tmp_prefi.prefixlen = IPV6_MAX_BITLEN;
tmp_prefi.prefix = func->sid;
if (prefix_match((struct prefix *)&loc.prefix,
(struct prefix *)&tmp_prefi)) {
@@ -3717,7 +3717,7 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
tovpn_sid = bgp_vrf->vpn_policy[AFI_IP].tovpn_sid;
if (tovpn_sid) {
tmp_prefi.family = AF_INET6;
- tmp_prefi.prefixlen = 128;
+ tmp_prefi.prefixlen = IPV6_MAX_BITLEN;
tmp_prefi.prefix = *tovpn_sid;
if (prefix_match((struct prefix *)&loc.prefix,
(struct prefix *)&tmp_prefi))
@@ -3729,7 +3729,7 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
tovpn_sid = bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid;
if (tovpn_sid) {
tmp_prefi.family = AF_INET6;
- tmp_prefi.prefixlen = 128;
+ tmp_prefi.prefixlen = IPV6_MAX_BITLEN;
tmp_prefi.prefix = *tovpn_sid;
if (prefix_match((struct prefix *)&loc.prefix,
(struct prefix *)&tmp_prefi))
diff --git a/doc/user/zebra.rst b/doc/user/zebra.rst
index 242d616a5f..b862ba9f50 100644
--- a/doc/user/zebra.rst
+++ b/doc/user/zebra.rst
@@ -985,7 +985,7 @@ and this section also helps that case.
::
router# configure terminal
- router(config)# segment-routinig
+ router(config)# segment-routing
router(config-sr)# srv6
router(config-srv6)# locators
router(config-srv6-locs)# locator loc1
@@ -1013,7 +1013,7 @@ and this section also helps that case.
::
router# configure terminal
- router(config)# segment-routinig
+ router(config)# segment-routing
router(config-sr)# srv6
router(config-srv6)# locators
router(config-srv6-locators)# locator loc1
@@ -1042,7 +1042,7 @@ and this section also helps that case.
::
router# configure terminal
- router(config)# segment-routinig
+ router(config)# segment-routing
router(config-sr)# srv6
router(config-srv6)# locators
router(config-srv6-locators)# locator loc1
@@ -1099,7 +1099,7 @@ and this section also helps that case.
::
router# configure terminal
- router(config)# segment-routinig
+ router(config)# segment-routing
router(config-sr)# srv6
router(config-srv6)# formats
router(config-srv6-formats)# format usid-f3216
diff --git a/tests/topotests/zebra_rib/r1/import_init_mrib_table.json b/tests/topotests/zebra_rib/r1/import_init_mrib_table.json
index a6807d2cdd..80c19dacf2 100644
--- a/tests/topotests/zebra_rib/r1/import_init_mrib_table.json
+++ b/tests/topotests/zebra_rib/r1/import_init_mrib_table.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -76,10 +68,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -107,10 +95,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_init_table.json b/tests/topotests/zebra_rib/r1/import_init_table.json
index a6807d2cdd..80c19dacf2 100644
--- a/tests/topotests/zebra_rib/r1/import_init_table.json
+++ b/tests/topotests/zebra_rib/r1/import_init_table.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -76,10 +68,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -107,10 +95,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_2.json b/tests/topotests/zebra_rib/r1/import_mrib_table_2.json
index 0a7915df0f..61aaaede6e 100644
--- a/tests/topotests/zebra_rib/r1/import_mrib_table_2.json
+++ b/tests/topotests/zebra_rib/r1/import_mrib_table_2.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_3.json b/tests/topotests/zebra_rib/r1/import_mrib_table_3.json
index 11bbcf8ec8..27a0b9f264 100644
--- a/tests/topotests/zebra_rib/r1/import_mrib_table_3.json
+++ b/tests/topotests/zebra_rib/r1/import_mrib_table_3.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -271,10 +239,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_mrib_table_4.json b/tests/topotests/zebra_rib/r1/import_mrib_table_4.json
index 4375b9cde6..5a8f0eecd5 100644
--- a/tests/topotests/zebra_rib/r1/import_mrib_table_4.json
+++ b/tests/topotests/zebra_rib/r1/import_mrib_table_4.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_table_2.json b/tests/topotests/zebra_rib/r1/import_table_2.json
index 0a7915df0f..61aaaede6e 100644
--- a/tests/topotests/zebra_rib/r1/import_table_2.json
+++ b/tests/topotests/zebra_rib/r1/import_table_2.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_table_3.json b/tests/topotests/zebra_rib/r1/import_table_3.json
index 11bbcf8ec8..27a0b9f264 100644
--- a/tests/topotests/zebra_rib/r1/import_table_3.json
+++ b/tests/topotests/zebra_rib/r1/import_table_3.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -271,10 +239,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
diff --git a/tests/topotests/zebra_rib/r1/import_table_4.json b/tests/topotests/zebra_rib/r1/import_table_4.json
index 4375b9cde6..5a8f0eecd5 100644
--- a/tests/topotests/zebra_rib/r1/import_table_4.json
+++ b/tests/topotests/zebra_rib/r1/import_table_4.json
@@ -14,10 +14,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -45,10 +41,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 3,
- "installedNexthopGroupId": 3,
"nexthops": [
{
"flags": 3,
@@ -77,10 +69,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -110,10 +98,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 7,
- "installedNexthopGroupId": 7,
"nexthops": [
{
"flags": 3,
@@ -143,10 +127,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -176,10 +156,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 9,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 8,
- "installedNexthopGroupId": 8,
"nexthops": [
{
"flags": 3,
@@ -208,10 +184,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
@@ -239,10 +211,6 @@
"table": 254,
"internalStatus": 16,
"internalFlags": 8,
- "internalNextHopNum": 1,
- "internalNextHopActiveNum": 1,
- "nexthopGroupId": 4,
- "installedNexthopGroupId": 4,
"nexthops": [
{
"flags": 3,
diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c
index e0df47bc2c..624f60e815 100644
--- a/zebra/zebra_srv6.c
+++ b/zebra/zebra_srv6.c
@@ -1159,7 +1159,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
format = block->sid_format;
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: trying to allocate explicit SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
@@ -1305,7 +1305,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
block->u.uncompressed.num_func_allocated++;
}
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: allocated explicit SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
@@ -1331,7 +1331,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
format = block->sid_format;
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: trying to allocate dynamic SID function from block %pFX",
__func__, &block->prefix);
@@ -1465,7 +1465,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
block->u.uncompressed.num_func_allocated++;
}
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: allocated dynamic SID function %u from block %pFX",
__func__, *sid_func, &block->prefix);
@@ -1794,7 +1794,7 @@ static bool release_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
format = block->sid_format;
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: trying to release explicit SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
@@ -1918,7 +1918,7 @@ static bool release_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
zebra_srv6_sid_func_free(sid_func_ptr);
}
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: released explicit SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
@@ -1944,7 +1944,7 @@ static int release_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
format = block->sid_format;
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: trying to release dynamic SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
@@ -2107,7 +2107,7 @@ static int release_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
}
}
- if (ZEBRA_DEBUG_SRV6)
+ if (IS_ZEBRA_DEBUG_SRV6)
zlog_debug("%s: released dynamic SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix);
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-09 03:32:16 +0000