aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/acl/acl_test.c16
-rw-r--r--src/plugins/flowperpkt/flowperpkt_test.c2
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c3
-rw-r--r--src/plugins/ioam/export/ioam_export_test.c2
-rw-r--r--src/plugins/ioam/lib-pot/pot_test.c8
-rw-r--r--src/plugins/ioam/lib-trace/trace_test.c6
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c12
-rw-r--r--src/plugins/lb/lb_test.c12
-rw-r--r--src/plugins/snat/snat_test.c34
9 files changed, 50 insertions, 45 deletions
diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c
index 4ea6bcc8..04683a12 100644
--- a/src/plugins/acl/acl_test.c
+++ b/src/plugins/acl/acl_test.c
@@ -498,7 +498,7 @@ static int api_acl_del (vat_main_t * vam)
}
/* Construct the API message */
- M(ACL_DEL, acl_del);
+ M(ACL_DEL, mp);
mp->acl_index = ntohl(acl_index);
/* send it... */
@@ -521,7 +521,7 @@ static int api_macip_acl_del (vat_main_t * vam)
}
/* Construct the API message */
- M(MACIP_ACL_DEL, acl_del);
+ M(MACIP_ACL_DEL, mp);
mp->acl_index = ntohl(acl_index);
/* send it... */
@@ -585,7 +585,7 @@ static int api_acl_interface_add_del (vat_main_t * vam)
/* Construct the API message */
- M(ACL_INTERFACE_ADD_DEL, acl_interface_add_del);
+ M(ACL_INTERFACE_ADD_DEL, mp);
mp->acl_index = ntohl(acl_index);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
@@ -636,7 +636,7 @@ static int api_macip_acl_interface_add_del (vat_main_t * vam)
/* Construct the API message */
- M(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del);
+ M(MACIP_ACL_INTERFACE_ADD_DEL, mp);
mp->acl_index = ntohl(acl_index);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
@@ -690,7 +690,7 @@ static int api_acl_interface_set_acl_list (vat_main_t * vam)
}
/* Construct the API message */
- M2(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
+ M2(ACL_INTERFACE_SET_ACL_LIST, mp, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
mp->sw_if_index = ntohl(sw_if_index);
mp->n_input = vec_len(inacls);
mp->count = vec_len(inacls) + vec_len(outacls);
@@ -724,7 +724,7 @@ static int api_acl_interface_list_dump (vat_main_t * vam)
}
/* Construct the API message */
- M(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump);
+ M(ACL_INTERFACE_LIST_DUMP, mp);
mp->sw_if_index = ntohl (sw_if_index);
/* send it... */
@@ -750,7 +750,7 @@ static int api_acl_dump (vat_main_t * vam)
}
/* Construct the API message */
- M(ACL_DUMP, acl_dump);
+ M(ACL_DUMP, mp);
mp->acl_index = ntohl (acl_index);
/* send it... */
@@ -776,7 +776,7 @@ static int api_macip_acl_dump (vat_main_t * vam)
}
/* Construct the API message */
- M(MACIP_ACL_DUMP, macip_acl_dump);
+ M(MACIP_ACL_DUMP, mp);
mp->acl_index = ntohl (acl_index);
/* send it... */
diff --git a/src/plugins/flowperpkt/flowperpkt_test.c b/src/plugins/flowperpkt/flowperpkt_test.c
index 4dcfdf05..70b4a34a 100644
--- a/src/plugins/flowperpkt/flowperpkt_test.c
+++ b/src/plugins/flowperpkt/flowperpkt_test.c
@@ -123,7 +123,7 @@ api_flowperpkt_tx_interface_add_del (vat_main_t * vam)
}
/* Construct the API message */
- M (FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del);
+ M (FLOWPERPKT_TX_INTERFACE_ADD_DEL, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = enable_disable;
mp->which = which;
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
index d35bf399..b9f61d9a 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
@@ -106,8 +106,7 @@ api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam)
}
/* Construct the API message */
- M (VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE,
- vxlan_gpe_ioam_export_enable_disable);
+ M (VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE, mp);
mp->is_disable = is_disable;
/* send it... */
diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c
index 8bfee583..b9686058 100644
--- a/src/plugins/ioam/export/ioam_export_test.c
+++ b/src/plugins/ioam/export/ioam_export_test.c
@@ -108,7 +108,7 @@ api_ioam_export_ip6_enable_disable (vat_main_t * vam)
}
/* Construct the API message */
- M (IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable);
+ M(IOAM_EXPORT_IP6_ENABLE_DISABLE, mp);
mp->is_disable = is_disable;
/* send it... */
diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index deeb563c..48d5bd40 100644
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -168,7 +168,7 @@ static int api_pot_profile_add (vat_main_t *vam)
goto OUT;
}
- M2(POT_PROFILE_ADD, pot_profile_add, vec_len(name));
+ M2(POT_PROFILE_ADD, mp, vec_len(name));
mp->list_name_len = vec_len(name);
clib_memcpy(mp->list_name, name, mp->list_name_len);
@@ -222,7 +222,7 @@ static int api_pot_profile_activate (vat_main_t *vam)
goto OUT;
}
- M2(POT_PROFILE_ACTIVATE, pot_profile_activate, vec_len(name));
+ M2(POT_PROFILE_ACTIVATE, mp, vec_len(name));
mp->list_name_len = vec_len(name);
clib_memcpy(mp->list_name, name, mp->list_name_len);
@@ -241,7 +241,7 @@ static int api_pot_profile_del (vat_main_t *vam)
vl_api_pot_profile_del_t *mp;
f64 timeout;
- M(POT_PROFILE_DEL, pot_profile_del);
+ M(POT_PROFILE_DEL, mp);
mp->list_name_len = 0;
S; W;
return 0;
@@ -260,7 +260,7 @@ static int api_pot_profile_show_config_dump (vat_main_t *vam)
else
break;
}
- M(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump);
+ M(POT_PROFILE_SHOW_CONFIG_DUMP, mp);
mp->id = id;
diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c
index 0ccb675e..a1354327 100644
--- a/src/plugins/ioam/lib-trace/trace_test.c
+++ b/src/plugins/ioam/lib-trace/trace_test.c
@@ -149,7 +149,7 @@ api_trace_profile_add (vat_main_t * vam)
}
- M (TRACE_PROFILE_ADD, trace_profile_add);
+ M (TRACE_PROFILE_ADD, mp);
mp->trace_type = trace_type;
mp->trace_tsp = trace_tsp;
@@ -171,7 +171,7 @@ api_trace_profile_del (vat_main_t * vam)
vl_api_trace_profile_del_t *mp;
f64 timeout;
- M (TRACE_PROFILE_DEL, trace_profile_del);
+ M (TRACE_PROFILE_DEL, mp);
S;
W;
return 0;
@@ -182,7 +182,7 @@ api_trace_profile_show_config (vat_main_t * vam)
{
vl_api_trace_profile_show_config_t *mp;
f64 timeout;
- M (TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config);
+ M (TRACE_PROFILE_SHOW_CONFIG, mp);
S;
W;
return 0;
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
index 0748c5b7..5d36547f 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -125,7 +125,7 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam)
else
break;
}
- M (VXLAN_GPE_IOAM_ENABLE, vxlan_gpe_ioam_enable);
+ M (VXLAN_GPE_IOAM_ENABLE, mp);
mp->id = htons (id);
mp->trace_ppc = has_ppc_option;
mp->pow_enable = has_pow_option;
@@ -145,7 +145,7 @@ api_vxlan_gpe_ioam_disable (vat_main_t * vam)
vl_api_vxlan_gpe_ioam_disable_t *mp;
f64 timeout;
- M (VXLAN_GPE_IOAM_DISABLE, vxlan_gpe_ioam_disable);
+ M (VXLAN_GPE_IOAM_DISABLE, mp);
S;
W;
return 0;
@@ -223,7 +223,7 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
return -99;
}
- M (VXLAN_GPE_IOAM_VNI_ENABLE, vxlan_gpe_ioam_vni_enable);
+ M (VXLAN_GPE_IOAM_VNI_ENABLE, mp);
if (ipv6_set)
@@ -318,7 +318,7 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
return -99;
}
- M (VXLAN_GPE_IOAM_VNI_DISABLE, vxlan_gpe_ioam_vni_disable);
+ M (VXLAN_GPE_IOAM_VNI_DISABLE, mp);
if (ipv6_set)
@@ -389,7 +389,7 @@ api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
}
- M (VXLAN_GPE_IOAM_TRANSIT_ENABLE, vxlan_gpe_ioam_transit_enable);
+ M (VXLAN_GPE_IOAM_TRANSIT_ENABLE, mp);
if (ipv6_set)
@@ -459,7 +459,7 @@ api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
}
- M (VXLAN_GPE_IOAM_TRANSIT_DISABLE, vxlan_gpe_ioam_transit_disable);
+ M (VXLAN_GPE_IOAM_TRANSIT_DISABLE, mp);
if (ipv6_set)
diff --git a/src/plugins/lb/lb_test.c b/src/plugins/lb/lb_test.c
index 9d55e4a7..c150ea32 100644
--- a/src/plugins/lb/lb_test.c
+++ b/src/plugins/lb/lb_test.c
@@ -145,7 +145,9 @@ static int api_lb_conf (vat_main_t * vam)
return -99;
}
- M(LB_CONF, lb_conf); S; W;
+ M(LB_CONF, mp);
+ S;
+ W;
/* NOTREACHED */
return 0;
@@ -183,7 +185,9 @@ static int api_lb_add_del_vip (vat_main_t * vam)
mps.is_del = 1;
}
- M(LB_ADD_DEL_VIP, lb_add_del_vip); S; W;
+ M(LB_ADD_DEL_VIP, mp);
+ S;
+ W;
/* NOTREACHED */
return 0;
}
@@ -206,7 +210,9 @@ static int api_lb_add_del_as (vat_main_t * vam)
mps.is_del = 1;
}
- M(LB_ADD_DEL_AS, lb_add_del_as); S; W;
+ M(LB_ADD_DEL_AS, mp);
+ S;
+ W;
/* NOTREACHED */
return 0;
}
diff --git a/src/plugins/snat/snat_test.c b/src/plugins/snat/snat_test.c
index db53470c..c6f9a8ff 100644
--- a/src/plugins/snat/snat_test.c
+++ b/src/plugins/snat/snat_test.c
@@ -152,7 +152,7 @@ static int api_snat_add_address_range (vat_main_t * vam)
count);
}
- M(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range);
+ M(SNAT_ADD_ADDRESS_RANGE, mp);
memcpy (mp->first_ip_address, &start_addr, 4);
memcpy (mp->last_ip_address, &end_addr, 4);
@@ -200,7 +200,7 @@ static int api_snat_interface_add_del_feature (vat_main_t * vam)
return -99;
}
- M(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature);
+ M(SNAT_INTERFACE_ADD_DEL_FEATURE, mp);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
mp->is_inside = is_inside;
@@ -262,7 +262,7 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
return -99;
}
- M(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping);
+ M(SNAT_ADD_STATIC_MAPPING, mp);
mp->is_add = is_add;
mp->is_ip4 = 1;
mp->addr_only = addr_only;
@@ -330,12 +330,12 @@ static int api_snat_static_mapping_dump(vat_main_t * vam)
fformat (vam->ofp, "%15s%6s%15s%6s%11s\n", "address", "port", "address",
"port", "vrf");
- M(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump);
+ M(SNAT_STATIC_MAPPING_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
+ M(SNAT_CONTROL_PING, mp);
S;
}
W;
@@ -385,7 +385,7 @@ static int api_snat_show_config(vat_main_t * vam)
return -99;
}
- M(SNAT_SHOW_CONFIG, snat_show_config);
+ M(SNAT_SHOW_CONFIG, mp);
S; W;
/* NOTREACHED */
return 0;
@@ -411,12 +411,12 @@ static int api_snat_address_dump(vat_main_t * vam)
return -99;
}
- M(SNAT_ADDRESS_DUMP, snat_address_dump);
+ M(SNAT_ADDRESS_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
+ M(SNAT_CONTROL_PING, mp);
S;
}
W;
@@ -445,12 +445,12 @@ static int api_snat_interface_dump(vat_main_t * vam)
return -99;
}
- M(SNAT_INTERFACE_DUMP, snat_interface_dump);
+ M(SNAT_INTERFACE_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
+ M(SNAT_CONTROL_PING, mp);
S;
}
W;
@@ -476,7 +476,7 @@ static int api_snat_set_workers (vat_main_t * vam)
}
}
- M(SNAT_SET_WORKERS, snat_set_workers);
+ M(SNAT_SET_WORKERS, mp);
mp->worker_mask = clib_host_to_net_u64 (bitmap[0]);
S; W;
@@ -506,12 +506,12 @@ static int api_snat_worker_dump(vat_main_t * vam)
return -99;
}
- M(SNAT_WORKER_DUMP, snat_worker_dump);
+ M(SNAT_WORKER_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
+ M(SNAT_CONTROL_PING, mp);
S;
}
W;
@@ -549,7 +549,7 @@ static int api_snat_ipfix_enable_disable (vat_main_t * vam)
return -99;
}
- M(SNAT_ADD_DEL_INTERFACE_ADDR, snat_add_del_interface_addr);
+ M(SNAT_ADD_DEL_INTERFACE_ADDR, mp);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
@@ -578,12 +578,12 @@ static int api_snat_interface_addr_dump(vat_main_t * vam)
return -99;
}
- M(SNAT_INTERFACE_ADDR_DUMP, snat_interface_addr_dump);
+ M(SNAT_INTERFACE_ADDR_DUMP, mp);
S;
/* Use a control ping for synchronization */
{
vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
+ M(SNAT_CONTROL_PING, mp);
S;
}
W;
@@ -615,7 +615,7 @@ static int api_snat_add_del_interface_addr (vat_main_t * vam)
}
}
- M(SNAT_IPFIX_ENABLE_DISABLE, snat_ipfix_enable_disable);
+ M(SNAT_IPFIX_ENABLE_DISABLE, mp);
mp->domain_id = htonl(domain_id);
mp->src_port = htons((u16) src_port);
mp->enable = enable;