diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/oddbuf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/oddbuf/node.c | 4 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf.api | 4 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf.c | 12 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf.h | 4 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf_all_api_h.h | 4 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf_msg_enum.h | 4 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf_periodic.c | 117 | ||||
| -rw-r--r-- | src/plugins/oddbuf/oddbuf_test.c | 4 |
9 files changed, 21 insertions, 134 deletions
diff --git a/src/plugins/oddbuf/CMakeLists.txt b/src/plugins/oddbuf/CMakeLists.txt index 06f8e6f7e61..cee05240d81 100644 --- a/src/plugins/oddbuf/CMakeLists.txt +++ b/src/plugins/oddbuf/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright (c) <current-year> <your-organization> +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/node.c b/src/plugins/oddbuf/node.c index d495abaf950..d26ee441162 100644 --- a/src/plugins/oddbuf/node.c +++ b/src/plugins/oddbuf/node.c @@ -1,7 +1,7 @@ /* - * node.c - skeleton vpp engine plug-in dual-loop node skeleton + * node.c - - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/oddbuf.api b/src/plugins/oddbuf/oddbuf.api index 32f91548ea2..b63dc5dfe73 100644 --- a/src/plugins/oddbuf/oddbuf.api +++ b/src/plugins/oddbuf/oddbuf.api @@ -1,7 +1,7 @@ /* - * oddbuf.api - binary API skeleton + * oddbuf.api - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/oddbuf.c b/src/plugins/oddbuf/oddbuf.c index db2e682a676..9b95fcc8a85 100644 --- a/src/plugins/oddbuf/oddbuf.c +++ b/src/plugins/oddbuf/oddbuf.c @@ -1,7 +1,7 @@ /* - * oddbuf.c - skeleton vpp engine plug-in + * oddbuf.c - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -147,11 +147,15 @@ static void vl_api_oddbuf_enable_disable_t_handler { vl_api_oddbuf_enable_disable_reply_t *rmp; oddbuf_main_t *omp = &oddbuf_main; + u32 sw_if_index; int rv; - rv = oddbuf_enable_disable (omp, ntohl (mp->sw_if_index), - (int) (mp->enable_disable)); + VALIDATE_SW_IF_INDEX (mp); + sw_if_index = clib_net_to_host_u32 (mp->sw_if_index); + rv = oddbuf_enable_disable (omp, sw_if_index, (int) (mp->enable_disable)); + + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_ODDBUF_ENABLE_DISABLE_REPLY); } diff --git a/src/plugins/oddbuf/oddbuf.h b/src/plugins/oddbuf/oddbuf.h index 1aa51e4fe07..c2c07e7a647 100644 --- a/src/plugins/oddbuf/oddbuf.h +++ b/src/plugins/oddbuf/oddbuf.h @@ -1,8 +1,8 @@ /* - * oddbuf.h - skeleton vpp engine plug-in header file + * oddbuf.h - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/oddbuf_all_api_h.h b/src/plugins/oddbuf/oddbuf_all_api_h.h index 64a1a6bf951..3aac2a076d3 100644 --- a/src/plugins/oddbuf/oddbuf_all_api_h.h +++ b/src/plugins/oddbuf/oddbuf_all_api_h.h @@ -1,8 +1,8 @@ /* - * oddbuf_all_api_h.h - skeleton vpp engine plug-in api #include file + * oddbuf_all_api_h.h awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/oddbuf_msg_enum.h b/src/plugins/oddbuf/oddbuf_msg_enum.h index 8e324d67c55..084c049d5cd 100644 --- a/src/plugins/oddbuf/oddbuf_msg_enum.h +++ b/src/plugins/oddbuf/oddbuf_msg_enum.h @@ -1,8 +1,8 @@ /* - * oddbuf_msg_enum.h - skeleton vpp engine plug-in message enumeration + * oddbuf_msg_enum.h - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: diff --git a/src/plugins/oddbuf/oddbuf_periodic.c b/src/plugins/oddbuf/oddbuf_periodic.c deleted file mode 100644 index c88e74915a6..00000000000 --- a/src/plugins/oddbuf/oddbuf_periodic.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * oddbuf_periodic.c - skeleton plug-in periodic function - * - * Copyright (c) <current-year> <your-organization> - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <vlib/vlib.h> -#include <vppinfra/error.h> -#include <oddbuf/oddbuf.h> - -static void -handle_event1 (oddbuf_main_t * pm, f64 now, uword event_data) -{ - clib_warning ("received ODDBUF_EVENT1"); -} - -static void -handle_event2 (oddbuf_main_t * pm, f64 now, uword event_data) -{ - clib_warning ("received ODDBUF_EVENT2"); -} - -static void -handle_periodic_enable_disable (oddbuf_main_t * pm, f64 now, uword event_data) -{ - clib_warning ("Periodic timeouts now %s", - event_data ? "enabled" : "disabled"); - pm->periodic_timer_enabled = event_data; -} - -static void -handle_timeout (oddbuf_main_t * pm, f64 now) -{ - clib_warning ("timeout at %.2f", now); -} - -static uword -oddbuf_periodic_process (vlib_main_t * vm, - vlib_node_runtime_t * rt, vlib_frame_t * f) -{ - oddbuf_main_t *pm = &oddbuf_main; - f64 now; - f64 timeout = 10.0; - uword *event_data = 0; - uword event_type; - int i; - - while (1) - { - if (pm->periodic_timer_enabled) - vlib_process_wait_for_event_or_clock (vm, timeout); - else - vlib_process_wait_for_event (vm); - - now = vlib_time_now (vm); - - event_type = vlib_process_get_events (vm, (uword **) & event_data); - - switch (event_type) - { - /* Handle ODDBUF_EVENT1 */ - case ODDBUF_EVENT1: - for (i = 0; i < vec_len (event_data); i++) - handle_event1 (pm, now, event_data[i]); - break; - - /* Handle ODDBUF_EVENT2 */ - case ODDBUF_EVENT2: - for (i = 0; i < vec_len (event_data); i++) - handle_event2 (pm, now, event_data[i]); - break; - /* Handle the periodic timer on/off event */ - case ODDBUF_EVENT_PERIODIC_ENABLE_DISABLE: - for (i = 0; i < vec_len (event_data); i++) - handle_periodic_enable_disable (pm, now, event_data[i]); - break; - - /* Handle periodic timeouts */ - case ~0: - handle_timeout (pm, now); - break; - } - vec_reset_length (event_data); - } - return 0; /* or not */ -} - -void -oddbuf_create_periodic_process (oddbuf_main_t * omp) -{ - /* Already created the process node? */ - if (omp->periodic_node_index > 0) - return; - - /* No, create it now and make a note of the node index */ - omp->periodic_node_index = vlib_process_create (omp->vlib_main, "oddbuf-periodic-process", oddbuf_periodic_process, 16 /* log2_n_stack_bytes */ - ); -} - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/plugins/oddbuf/oddbuf_test.c b/src/plugins/oddbuf/oddbuf_test.c index a9c846559c8..25c0bc05336 100644 --- a/src/plugins/oddbuf/oddbuf_test.c +++ b/src/plugins/oddbuf/oddbuf_test.c @@ -1,7 +1,7 @@ /* - * oddbuf.c - skeleton vpp-api-test plug-in + * oddbuf.c - awkward chained buffer geometry test tool * - * Copyright (c) <current-year> <your-organization> + * Copyright (c) 2019 by Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: |