pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39176?usp=email )

(

2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcap-client: Allow recording on several interfaces ......................................................................

pcap-client: Allow recording on several interfaces

This commit enables basic support for multi-interface capturing. The transmitted data to the osmo-pcap-server is not yet in pcapng format, which means no information regarding the iface it was captured on is provided when opening the resulting pcap file.

Related: SYS#5822 Change-Id: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 --- M src/osmo_client_vty.c 1 file changed, 1 insertion(+), 7 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved

diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index c976a1a..009c735 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -170,14 +170,8 @@ PCAP_STRING "the device to filter\n" "device name\n") { struct osmo_pcap_handle *ph = osmo_client_find_handle(pcap_client, argv[0]); - if (!ph) { - /* Only allow max one for now:*/ - if (llist_count(&pcap_client->handles) > 0) { - vty_out(vty, "Only one 'pcap device' allowed! Remove the old one with 'no pcap device' first!%s", VTY_NEWLINE); - return CMD_WARNING; - } + if (!ph) osmo_pcap_handle_alloc(pcap_client, argv[0]); - } return CMD_SUCCESS; }