Add sw_if_index to af_packet_create and various clean ups

[vpp.git] / vpp-api-test / vat / api_format.c

diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 0fb7d1f..d4e5392 100644 (file)
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -474,7 +474,23 @@ u8 * format_ip6_address (u8 * s, va_list * args)
 u8 * format_ip46_address (u8 * s, va_list * args)
 {
   ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  return ip46_address_is_ip4(ip46)?
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+  int is_ip4 = 1;
+
+  switch (type)
+    {
+      case IP46_TYPE_ANY:
+       is_ip4 = ip46_address_is_ip4(ip46);
+       break;
+      case IP46_TYPE_IP4:
+       is_ip4 = 1;
+       break;
+      case IP46_TYPE_IP6:
+       is_ip4 = 0;
+       break;
+    }
+
+  return is_ip4 ?
       format(s, "%U", format_ip4_address, &ip46->ip4):
       format(s, "%U", format_ip6_address, &ip46->ip6);
 }
@@ -517,8 +533,9 @@ static void vl_api_create_loopback_reply_t_handler
     i32 retval = ntohl(mp->retval);
 
     vam->retval = retval;
-    vam->result_ready = 1;
     vam->regenerate_interface_table = 1;
+    vam->sw_if_index = ntohl (mp->sw_if_index);
+    vam->result_ready = 1;
 }
 
 static void vl_api_create_loopback_reply_t_handler_json
@@ -531,6 +548,34 @@ static void vl_api_create_loopback_reply_t_handler_json
     vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
     vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
 
+    vat_json_print(vam->ofp, &node);
+    vat_json_free(&node);
+    vam->retval = ntohl(mp->retval);
+    vam->result_ready = 1;
+}
+
+static void vl_api_af_packet_create_reply_t_handler 
+(vl_api_af_packet_create_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    i32 retval = ntohl(mp->retval);
+
+    vam->retval = retval;
+    vam->regenerate_interface_table = 1;
+    vam->sw_if_index = ntohl (mp->sw_if_index);
+    vam->result_ready = 1;
+}
+
+static void vl_api_af_packet_create_reply_t_handler_json
+(vl_api_af_packet_create_reply_t * mp)
+{
+    vat_main_t * vam = &vat_main;
+    vat_json_node_t node;
+
+    vat_json_init_object(&node);
+    vat_json_object_add_int(&node, "retval", ntohl(mp->retval));
+    vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index));
+
     vat_json_print(vam->ofp, &node);
     vat_json_free(&node);
 
@@ -545,8 +590,9 @@ static void vl_api_create_vlan_subif_reply_t_handler
     i32 retval = ntohl(mp->retval);
 
     vam->retval = retval;
-    vam->result_ready = 1;
     vam->regenerate_interface_table = 1;
+    vam->sw_if_index = ntohl (mp->sw_if_index);
+    vam->result_ready = 1;
 }
 
 static void vl_api_create_vlan_subif_reply_t_handler_json
@@ -573,8 +619,9 @@ static void vl_api_create_subif_reply_t_handler
     i32 retval = ntohl(mp->retval);
 
     vam->retval = retval;
-    vam->result_ready = 1;
     vam->regenerate_interface_table = 1;
+    vam->sw_if_index = ntohl (mp->sw_if_index);
+    vam->result_ready = 1;
 }
 
 static void vl_api_create_subif_reply_t_handler_json
@@ -601,8 +648,8 @@ static void vl_api_interface_name_renumber_reply_t_handler
     i32 retval = ntohl(mp->retval);
 
     vam->retval = retval;
-    vam->result_ready = 1;
     vam->regenerate_interface_table = 1;
+    vam->result_ready = 1;
 }
 
 static void vl_api_interface_name_renumber_reply_t_handler_json
@@ -768,7 +815,6 @@ static void vl_api_classify_add_del_table_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
-        vam->result_ready = 1;
         if (retval == 0 && 
             ((mp->new_table_index != 0xFFFFFFFF) ||
              (mp->skip_n_vectors != 0xFFFFFFFF) ||
@@ -780,6 +826,7 @@ static void vl_api_classify_add_del_table_reply_t_handler
             errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d\n",
                     ntohl(mp->new_table_index),
                     ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
+       vam->result_ready = 1;
     }
 }
 
@@ -811,9 +858,9 @@ static void vl_api_get_node_index_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
-        vam->result_ready = 1;
         if (retval == 0)
             errmsg ("node index %d\n", ntohl(mp->node_index));
+        vam->result_ready = 1;
     }
 }
 
@@ -843,9 +890,9 @@ static void vl_api_add_node_next_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
-        vam->result_ready = 1;
         if (retval == 0)
             errmsg ("next index %d\n", ntohl(mp->next_index));
+        vam->result_ready = 1;
     }
 }
 
@@ -1143,8 +1190,10 @@ static void vl_api_tap_connect_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
-        vam->result_ready = 1;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
+       vam->result_ready = 1;
     }
+    
 }
 
 static void vl_api_tap_connect_reply_t_handler_json
@@ -1162,6 +1211,7 @@ static void vl_api_tap_connect_reply_t_handler_json
 
     vam->retval = ntohl(mp->retval);
     vam->result_ready = 1;
+    
 }
 
 static void vl_api_tap_modify_reply_t_handler
@@ -1173,6 +1223,7 @@ static void vl_api_tap_modify_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
         vam->result_ready = 1;
     }
 }
@@ -1262,6 +1313,7 @@ static void vl_api_l2tpv3_create_tunnel_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
         vam->result_ready = 1;
     }
 }
@@ -1292,6 +1344,7 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
         vam->result_ready = 1;
     }
 }
@@ -1322,6 +1375,7 @@ static void vl_api_gre_add_del_tunnel_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
         vam->result_ready = 1;
     }
 }
@@ -1352,6 +1406,7 @@ static void vl_api_create_vhost_user_if_reply_t_handler
         vam->async_errors += (retval < 0);
     } else {
         vam->retval = retval;
+       vam->sw_if_index = ntohl (mp->sw_if_index);
         vam->result_ready = 1;
     }
 }
@@ -2122,6 +2177,8 @@ vl_api_lisp_enable_disable_status_details_t_handler_json
     gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
     feature_status = format (0, "%s",
                             mp->feature_status ? "enabled" : "disabled");
+    vec_add1 (gpe_status, 0);
+    vec_add1 (feature_status, 0);
 
     if (VAT_JSON_ARRAY != vam->json_tree.type) {
         ASSERT(VAT_JSON_NONE == vam->json_tree.type);
@@ -2353,7 +2410,6 @@ _(lisp_gpe_add_del_iface_reply)                         \
 _(lisp_enable_disable_reply)                            \
 _(lisp_pitr_set_locator_set_reply)                      \
 _(vxlan_gpe_add_del_tunnel_reply)                      \
-_(af_packet_create_reply)                               \
 _(af_packet_delete_reply)                               \
 _(policer_add_del_reply)                                \
 _(netmap_create_reply)                                  \
@@ -2582,6 +2638,20 @@ do {                                            \
     return -99;                                 \
 } while(0);
 
+/* W2: wait for results, with timeout */
+#define W2(body)                               \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+         (body);                               \
+         return (vam->retval);                 \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
 typedef struct {
     u8 * name;
     u32 value;
@@ -3098,6 +3168,13 @@ int api_sw_interface_dump (vat_main_t * vam)
     strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1);
     S;
 
+
+    /* and vxlan-gpe tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "vxlan_gpe", sizeof(mp->name_filter)-1);
+    S;
+
     /* and vxlan tunnel interfaces */
     M(SW_INTERFACE_DUMP, sw_interface_dump);
     mp->name_filter_valid = 1;
@@ -7520,7 +7597,9 @@ static void vl_api_vxlan_tunnel_details_t_handler
     fformat(vam->ofp, "%11d%24U%24U%14d%18d%13d\n",
             ntohl(mp->sw_if_index),
             format_ip46_address, &(mp->src_address[0]),
+           IP46_TYPE_ANY,
             format_ip46_address, &(mp->dst_address[0]),
+           IP46_TYPE_ANY,
             ntohl(mp->encap_vrf_id),
             ntohl(mp->decap_next_index),
             ntohl(mp->vni));
@@ -10527,7 +10606,7 @@ api_af_packet_create (vat_main_t * vam)
     mp->use_random_hw_addr = random_hw_addr;
     vec_free (host_if_name);
 
-    S; W;
+    S; W2(fprintf(vam->ofp," new sw_if_index = %d ", vam->sw_if_index));
     /* NOTREACHED */
     return 0;
 }