sr: srv6 API cleanup

[vpp.git] / src / vpp / api / custom_dump.c

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index f9524a9..657a580 100644 (file)
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -1078,7 +1078,7 @@ static void *vl_api_sr_localsid_add_del_t_print
     {
     case SR_BEHAVIOR_END:
       s = format (s, "Address: %U\nBehavior: End",
-                 format_ip6_address, (ip6_address_t *) mp->localsid.addr);
+                 format_ip6_address, (ip6_address_t *) mp->localsid);
       s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
       break;
     case SR_BEHAVIOR_X:
@@ -1086,9 +1086,9 @@ static void *vl_api_sr_localsid_add_del_t_print
        format (s,
                "Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)"
                "\nIface: %U\nNext hop: %U", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr,
+               (ip6_address_t *) mp->localsid,
                format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
-               format_ip6_address, (ip6_address_t *) mp->nh_addr6);
+               format_ip6_address, (ip6_address_t *) mp->nh_addr.un.ip6);
       s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
       break;
     case SR_BEHAVIOR_DX4:
@@ -1096,25 +1096,25 @@ static void *vl_api_sr_localsid_add_del_t_print
        format (s,
                "Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)"
                "\nIface: %U\nNext hop: %U", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr,
+               (ip6_address_t *) mp->localsid,
                format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
-               format_ip4_address, (ip4_address_t *) mp->nh_addr4);
+               format_ip4_address, (ip4_address_t *) mp->nh_addr.un.ip4);
       break;
     case SR_BEHAVIOR_DX6:
       s =
        format (s,
                "Address: %U\nBehavior: DX6 (Endpoint with decapsulation with IPv6 cross-connect)"
                "\nIface: %UNext hop: %U", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr,
+               (ip6_address_t *) mp->localsid,
                format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
-               format_ip6_address, (ip6_address_t *) mp->nh_addr6);
+               format_ip6_address, (ip6_address_t *) mp->nh_addr.un.ip6);
       break;
     case SR_BEHAVIOR_DX2:
       s =
        format (s,
                "Address: %U\nBehavior: DX2 (Endpoint with decapulation and Layer-2 cross-connect)"
                "\nIface: %U", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr,
+               (ip6_address_t *) mp->localsid,
                format_vnet_sw_if_index_name, vnm, (mp->sw_if_index));
       break;
     case SR_BEHAVIOR_DT6:
@@ -1122,20 +1122,20 @@ static void *vl_api_sr_localsid_add_del_t_print
        format (s,
                "Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)"
                "\nTable: %u", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr, (mp->fib_table));
+               (ip6_address_t *) mp->localsid, (mp->fib_table));
       break;
     case SR_BEHAVIOR_DT4:
       s =
        format (s,
                "Address: %U\nBehavior: DT4 (Endpoint with decapsulation and specific IPv4 table lookup)"
                "\nTable: %u", format_ip6_address,
-               (ip6_address_t *) mp->localsid.addr, (mp->fib_table));
+               (ip6_address_t *) mp->localsid, (mp->fib_table));
       break;
     default:
       if (mp->behavior >= SR_BEHAVIOR_LAST)
        {
          s = format (s, "Address: %U\n Behavior: %u",
-                     format_ip6_address, (ip6_address_t *) mp->localsid.addr,
+                     format_ip6_address, (ip6_address_t *) mp->localsid,
                      mp->behavior);
        }
       else
@@ -1162,11 +1162,13 @@ static void *vl_api_sr_steering_add_del_t_print
       break;
     case SR_STEER_IPV4:
       s = format (s, "Traffic type: IPv4 %U/%u", format_ip4_address,
-                 (ip4_address_t *) mp->prefix_addr, (mp->mask_width));
+                 (ip4_address_t *) mp->prefix.address.un.ip4,
+                 (mp->prefix.len));
       break;
     case SR_STEER_IPV6:
       s = format (s, "Traffic type: IPv6 %U/%u", format_ip6_address,
-                 (ip6_address_t *) mp->prefix_addr, (mp->mask_width));
+                 (ip6_address_t *) mp->prefix.address.un.ip6,
+                 (mp->prefix.len));
       break;
     default:
       s = format (s, "Traffic type: Unknown(%u)", mp->traffic_type);
@@ -1210,7 +1212,7 @@ static void *vl_api_sr_policy_add_t_print
 
   s = format (s, "FIB_table: %u", (mp->fib_table));
 
-  s = format (s, (mp->type ? "Type: Default" : "Type: Spray"));
+  s = format (s, (mp->is_spray ? "Type: Default" : "Type: Spray"));
 
   s = format (s, "SID list weight: %u", (mp->weight));