diff options
author | Damjan Marion <damarion@cisco.com> | 2016-07-04 21:04:40 +0200 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2016-07-06 22:38:28 +0000 |
commit | 3d9c86e9f70892c82c11530e0db7db78b7e6ce21 (patch) | |
tree | 72a715d0d0665392d3a70feb4c47219809bc9993 /vnet/vnet/pg/init.c | |
parent | 64f450da8f375e000f139fe1c8f7071dac37af29 (diff) |
Add support for capturing packets on packet generator interfaces
This patch introduces following changes:
- 4 predefined pg/stream[0-3] interfaces are removed
- Interface naming is changed form pg/streamX to pgX where X can be
any u32 value
- one pgX interface can handle multiple streams
- keyword "source pgX" is added to "packet-generator add" command, X is 0
by default
- new cli "packet-generator capture" is introduced
- new cli "create packet-generator interface pgX"
Change-Id: I768d075b9d4a34f0b5073debdc5dd4a0880c682c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/pg/init.c')
-rw-r--r-- | vnet/vnet/pg/init.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/vnet/vnet/pg/init.c b/vnet/vnet/pg/init.c index f598050c28d..5cbb6db09b2 100644 --- a/vnet/vnet/pg/init.c +++ b/vnet/vnet/pg/init.c @@ -47,9 +47,9 @@ static clib_error_t * pg_init (vlib_main_t * vm) { clib_error_t * error; pg_main_t * pg = &pg_main; - int i, j; pg->vlib_main = vm; + pg->if_index_by_if_id = hash_create (0, sizeof (uword)); if ((error = vlib_call_init_function (vm, vnet_main_init))) goto done; @@ -57,20 +57,6 @@ static clib_error_t * pg_init (vlib_main_t * vm) if ((error = vlib_call_init_function (vm, pg_cli_init))) goto done; - /* Create/free interfaces so that they exist and can be - used as a destination interface for streams. Also, create - a fixed number of pg interfaces so that interface numbering can - be made to be deterministic (at least if <= 4 streams are ever used). */ - for (i = 0; i < 4; i++) - { - j = pg_interface_find_free (pg, i); - ASSERT (j == i); - } - - /* Free interfaces. */ - for (i = j; i >= 0; i--) - vec_add1 (pg->free_interfaces, i); - done: return error; } |