summaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam
diff options
context:
space:
mode:
authorJon Loeliger <jdl@netgate.com>2017-01-31 13:19:40 -0600
committerDave Barach <openvpp@barachs.net>2017-02-02 17:30:40 +0000
commit8a2aea3fce9dad7c729c82ee39ce95b4f357bc83 (patch)
treeb8bec671aa04e8f98a369ebb66f7d03f5523980b /src/plugins/ioam
parenta9374df5f351d25e968f5f90a827796203cbafdd (diff)
Ensure all M() and M2() second parameters are the message pointer.
Rather than maintain (?) an unused second parameter, t, and pull an unbound message pointer, mp, out of context, explicitly list the message pointer as the second parameter. Change-Id: I92143efda6211cdf6b935470f8c71579742a6b64 Signed-off-by: Jon Loeliger <jdl@netgate.com>
Diffstat (limited to 'src/plugins/ioam')
-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
5 files changed, 15 insertions, 16 deletions
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 d35bf399a98..b9f61d9aed5 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 8bfee5834c7..b96860583a5 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 deeb563c1b7..48d5bd404da 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 0ccb675ef95..a1354327582 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 0748c5b793b..5d36547fcae 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)