aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam
diff options
context:
space:
mode:
authorJon Loeliger <jdl@netgate.com>2017-01-31 14:03:33 -0600
committerDave Barach <openvpp@barachs.net>2017-02-02 17:31:37 +0000
commit7bc770ceb62ede18414b7bb5788692e32477e373 (patch)
treea0898e2e7b3b994c9edbc2442328545513849bec /src/plugins/ioam
parent614e97d87b46853384cf0dcf1d59aaf9f4b2fa92 (diff)
Convert message macro S to accept a message pointer parameter;
Rather than blindly assume an unbound, fixed message parameter explicilty pass it as a paramter to the S() macro. Change-Id: Ieea1f1815cadd2eec7d9240408d69acdc3caa49a 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.c2
-rw-r--r--src/plugins/ioam/export/ioam_export_test.c2
-rw-r--r--src/plugins/ioam/lib-pot/pot_test.c12
-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, 19 insertions, 15 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 b9f61d9aed5..161b5241624 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
@@ -110,7 +110,7 @@ api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam)
mp->is_disable = is_disable;
/* send it... */
- S;
+ S (mp);
/* Wait for a reply... */
W;
diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c
index b96860583a5..45c4ca56ff7 100644
--- a/src/plugins/ioam/export/ioam_export_test.c
+++ b/src/plugins/ioam/export/ioam_export_test.c
@@ -112,7 +112,7 @@ api_ioam_export_ip6_enable_disable (vat_main_t * vam)
mp->is_disable = is_disable;
/* send it... */
- S;
+ S(mp);
/* Wait for a reply... */
W;
diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index 48d5bd404da..4f049be8e8a 100644
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -188,7 +188,8 @@ static int api_pot_profile_add (vat_main_t *vam)
mp->id = id;
mp->max_bits = bits;
- S; W;
+ S(mp);
+ W;
OUT:
vec_free(name);
@@ -228,7 +229,8 @@ static int api_pot_profile_activate (vat_main_t *vam)
clib_memcpy(mp->list_name, name, mp->list_name_len);
mp->id = id;
- S; W;
+ S(mp);
+ W;
OUT:
vec_free(name);
@@ -243,7 +245,8 @@ static int api_pot_profile_del (vat_main_t *vam)
M(POT_PROFILE_DEL, mp);
mp->list_name_len = 0;
- S; W;
+ S(mp);
+ W;
return 0;
}
@@ -264,7 +267,8 @@ static int api_pot_profile_show_config_dump (vat_main_t *vam)
mp->id = id;
- S; W;
+ S(mp);
+ W;
return 0;
}
diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c
index a1354327582..5093f33086e 100644
--- a/src/plugins/ioam/lib-trace/trace_test.c
+++ b/src/plugins/ioam/lib-trace/trace_test.c
@@ -157,7 +157,7 @@ api_trace_profile_add (vat_main_t * vam)
mp->app_data = htonl (app_data);
mp->num_elts = num_elts;
- S;
+ S (mp);
W;
return (rv);
@@ -172,7 +172,7 @@ api_trace_profile_del (vat_main_t * vam)
f64 timeout;
M (TRACE_PROFILE_DEL, mp);
- S;
+ S (mp);
W;
return 0;
}
@@ -183,7 +183,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, mp);
- S;
+ S (mp);
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 5d36547fcae..ee25a874918 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -132,7 +132,7 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam)
mp->trace_enable = has_trace_option;
- S;
+ S (mp);
W;
return (0);
@@ -146,7 +146,7 @@ api_vxlan_gpe_ioam_disable (vat_main_t * vam)
f64 timeout;
M (VXLAN_GPE_IOAM_DISABLE, mp);
- S;
+ S (mp);
W;
return 0;
}
@@ -240,7 +240,7 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
mp->vni = ntohl (vni);
mp->is_ipv6 = ipv6_set;
- S;
+ S (mp);
W;
return (0);
@@ -335,7 +335,7 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
mp->vni = ntohl (vni);
mp->is_ipv6 = ipv6_set;
- S;
+ S (mp);
W;
return 0;
@@ -405,7 +405,7 @@ api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
mp->outer_fib_index = htonl (outer_fib_index);
mp->is_ipv6 = ipv6_set;
- S;
+ S (mp);
W;
return (0);
@@ -474,7 +474,7 @@ api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
mp->outer_fib_index = htonl (outer_fib_index);
mp->is_ipv6 = ipv6_set;
- S;
+ S (mp);
W;