From 93fbcc6af9252fda8c261c190b24aaf6c09a38f4 Mon Sep 17 00:00:00 2001 From: "satish.karunanithi" Date: Wed, 6 Dec 2017 16:11:59 +0530 Subject: VPP-259 Coding standards cleanup - vnet/vnet/lawful-intercept Change-Id: Ie750c9fe06c067226b90bdcc3ea423b74d16562d Signed-off-by: satish.karunanithi --- src/vnet/lawful-intercept/lawful_intercept.c | 96 +++++++++++++++------------- 1 file changed, 53 insertions(+), 43 deletions(-) (limited to 'src/vnet/lawful-intercept/lawful_intercept.c') diff --git a/src/vnet/lawful-intercept/lawful_intercept.c b/src/vnet/lawful-intercept/lawful_intercept.c index e48e1cf4bd1..484b898d69a 100644 --- a/src/vnet/lawful-intercept/lawful_intercept.c +++ b/src/vnet/lawful-intercept/lawful_intercept.c @@ -19,10 +19,9 @@ li_main_t li_main; static clib_error_t * set_li_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) + unformat_input_t * input, vlib_cli_command_t * cmd) { - li_main_t * lm = &li_main; + li_main_t *lm = &li_main; ip4_address_t collector; u8 collector_set = 0; ip4_address_t src; @@ -32,18 +31,19 @@ set_li_command_fn (vlib_main_t * vm, u8 is_add = 1; int i; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "collector %U", unformat_ip4_address, &collector)) - collector_set = 1; - if (unformat (input, "src %U", unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (input, "udp-port %d", &tmp)) - udp_port = tmp; - else if (unformat (input, "del")) - is_add = 0; - else - break; - } + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "collector %U", unformat_ip4_address, &collector)) + collector_set = 1; + if (unformat (input, "src %U", unformat_ip4_address, &src)) + src_set = 1; + else if (unformat (input, "udp-port %d", &tmp)) + udp_port = tmp; + else if (unformat (input, "del")) + is_add = 0; + else + break; + } if (collector_set == 0) return clib_error_return (0, "collector must be set..."); @@ -55,19 +55,19 @@ set_li_command_fn (vlib_main_t * vm, if (is_add == 1) { for (i = 0; i < vec_len (lm->collectors); i++) - { - if (lm->collectors[i].as_u32 == collector.as_u32) - { - if (lm->ports[i] == udp_port) - return clib_error_return - (0, "collector %U:%d already configured", - &collector, udp_port); - else - return clib_error_return - (0, "collector %U already configured with port %d", - &collector, (int)(lm->ports[i])); - } - } + { + if (lm->collectors[i].as_u32 == collector.as_u32) + { + if (lm->ports[i] == udp_port) + return clib_error_return + (0, "collector %U:%d already configured", + &collector, udp_port); + else + return clib_error_return + (0, "collector %U already configured with port %d", + &collector, (int) (lm->ports[i])); + } + } vec_add1 (lm->collectors, collector); vec_add1 (lm->ports, udp_port); vec_add1 (lm->src_addrs, src); @@ -76,39 +76,49 @@ set_li_command_fn (vlib_main_t * vm, else { for (i = 0; i < vec_len (lm->collectors); i++) - { - if ((lm->collectors[i].as_u32 == collector.as_u32) - && lm->ports[i] == udp_port) - { - vec_delete (lm->collectors, 1, i); - vec_delete (lm->ports, 1, i); - vec_delete (lm->src_addrs, 1, i); - return 0; - } - } + { + if ((lm->collectors[i].as_u32 == collector.as_u32) + && lm->ports[i] == udp_port) + { + vec_delete (lm->collectors, 1, i); + vec_delete (lm->ports, 1, i); + vec_delete (lm->src_addrs, 1, i); + return 0; + } + } return clib_error_return (0, "collector %U:%d not configured", - &collector, udp_port); + &collector, udp_port); } return 0; } +/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_li_command, static) = { .path = "set li", - .short_help = + .short_help = "set li src collector udp-port ", .function = set_li_command_fn, }; +/* *INDENT-ON* */ static clib_error_t * li_init (vlib_main_t * vm) { - li_main_t * lm = &li_main; + li_main_t *lm = &li_main; lm->vlib_main = vm; - lm->vnet_main = vnet_get_main(); + lm->vnet_main = vnet_get_main (); lm->hit_node_index = li_hit_node.index; return 0; } -VLIB_INIT_FUNCTION(li_init); +VLIB_INIT_FUNCTION (li_init); + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg