summaryrefslogtreecommitdiff
path: root/zebra/interface.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2017-06-27 18:47:03 +0000
committerQuentin Young <qlyoung@cumulusnetworks.com>2017-06-27 19:04:41 +0000
commitfacfee22f55631992113af5606cf8ade069684b3 (patch)
treeb7ca477d3a90724929f2af749b09bdd6306ae8a6 /zebra/interface.c
parent5ce1d8b118ae85765d135aaf06bf04a554607d12 (diff)
*: remove VTY_GET_*
CLI validates input tokens, so there's no need to do it in handler functions anymore. spatch follows ---------------- @getull@ expression v; expression str; @@ <... - VTY_GET_ULL(..., v, str) + v = strtoull (str, NULL, 10) ...> @getul@ expression v; expression str; @@ <... - VTY_GET_ULONG(..., v, str) + v = strtoul (str, NULL, 10) ...> @getintrange@ expression name; expression v; expression str; @@ <... - VTY_GET_INTEGER_RANGE(name, v, str, ...) + v = strtoul (str, NULL, 10) ...> @getint@ expression v; expression str; @@ <... - VTY_GET_INTEGER(..., v, str) + v = strtoul (str, NULL, 10) ...> @getv4@ expression v; expression str; @@ <... - VTY_GET_IPV4_ADDRESS(..., v, str) + inet_aton (str, &v) ...> @getv4pfx@ expression v; expression str; @@ <... - VTY_GET_IPV4_PREFIX(..., v, str) + str2prefix_ipv4 (str, &v) ...> Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra/interface.c')
-rw-r--r--zebra/interface.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index 9393305f06..e8b1cf733b 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1806,7 +1806,7 @@ DEFUN (link_params_metric,
struct if_link_params *iflp = if_link_params_get (ifp);
u_int32_t metric;
- VTY_GET_ULONG("metric", metric, argv[idx_number]->arg);
+ metric = strtoul(argv[idx_number]->arg, NULL, 10);
/* Update TE metric if needed */
link_param_cmd_set_uint32 (ifp, &iflp->te_metric, LP_TE_METRIC, metric);
@@ -2011,7 +2011,7 @@ DEFUN (link_params_inter_as,
return CMD_WARNING;
}
- VTY_GET_ULONG("AS number", as, argv[idx_number]->arg);
+ as = strtoul(argv[idx_number]->arg, NULL, 10);
/* Update Remote IP and Remote AS fields if needed */
if (IS_PARAM_UNSET(iflp, LP_RMT_AS)
@@ -2064,11 +2064,11 @@ DEFUN (link_params_delay,
{
/* Get and Check new delay values */
u_int32_t delay = 0, low = 0, high = 0;
- VTY_GET_ULONG("delay", delay, argv[1]->arg);
+ delay = strtoul(argv[1]->arg, NULL, 10);
if (argc == 6)
{
- VTY_GET_ULONG("minimum delay", low, argv[3]->arg);
- VTY_GET_ULONG("maximum delay", high, argv[5]->arg);
+ low = strtoul(argv[3]->arg, NULL, 10);
+ high = strtoul(argv[5]->arg, NULL, 10);
}
VTY_DECLVAR_CONTEXT (interface, ifp);
@@ -2167,7 +2167,7 @@ DEFUN (link_params_delay_var,
struct if_link_params *iflp = if_link_params_get (ifp);
u_int32_t value;
- VTY_GET_ULONG("delay variation", value, argv[idx_number]->arg);
+ value = strtoul(argv[idx_number]->arg, NULL, 10);
/* Update Delay Variation if needed */
link_param_cmd_set_uint32 (ifp, &iflp->delay_var, LP_DELAY_VAR, value);