osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Falco Bridge: API updates. 

Update to the current (c02ae4b6) API.
This commit is contained in:
Gerald Combs 2022-05-19 12:49:01 -07:00
parent fd76c7ea80
commit 6b07710188
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/epan/falco_bridge/packet-falco-bridge.c
View File

@ -156,11 +156,11 @@ configure_plugin(bridge_info* bi, char* config _U_)
*/
bi->source_id = get_sinsp_source_id(bi->ssi);
uint32_t tot_fields = get_sinsp_source_nfields(bi->ssi);
size_t tot_fields = get_sinsp_source_nfields(bi->ssi);
bi->visible_fields = 0;
uint32_t addr_fields = 0;
sinsp_field_info_t sfi;
for (uint32_t j = 0; j < tot_fields; j++) {
for (size_t j = 0; j < tot_fields; j++) {
get_sinsp_source_field_info(bi->ssi, j, &sfi);
if (sfi.is_hidden) {
/*
@ -194,10 +194,10 @@ configure_plugin(bridge_info* bi, char* config _U_)
size_t conv_fld_cnt = 0;
uint32_t addr_fld_cnt = 0;
for (uint32_t j = 0; j < tot_fields; j++)
for (size_t j = 0; j < tot_fields; j++)
{
bi->hf_ids[fld_cnt] = -1;
bi->field_ids[fld_cnt] = j;
bi->field_ids[fld_cnt] = (int) j;
bi->field_flags[fld_cnt] = BFF_NONE;
hf_register_info* ri = bi->hf + fld_cnt;
@ -343,7 +343,8 @@ import_plugin(char* fname)
static void
on_wireshark_exit(void)
{
destroy_sinsp_span(sinsp_span);
// XXX This currently crashes in a sinsp thread.
// destroy_sinsp_span(sinsp_span);
sinsp_span = NULL;
}

8
plugins/epan/falco_bridge/sinsp-span.cpp
View File

@ -115,14 +115,14 @@ const char *get_sinsp_source_description(sinsp_source_info_t *ssi)
return ssi->description;
}
uint32_t get_sinsp_source_nfields(sinsp_source_info_t *ssi)
size_t get_sinsp_source_nfields(sinsp_source_info_t *ssi)
{
return ssi->source->nfields();
return ssi->source->fields().size();
}
bool get_sinsp_source_field_info(sinsp_source_info_t *ssi, unsigned field_num, sinsp_field_info_t *field)
bool get_sinsp_source_field_info(sinsp_source_info_t *ssi, size_t field_num, sinsp_field_info_t *field)
{
if (field_num >= ssi->source->nfields()) {
if (field_num >= ssi->source->fields().size()) {
return false;
}

4
plugins/epan/falco_bridge/sinsp-span.h
View File

@ -69,8 +69,8 @@ bool init_sinsp_source(sinsp_source_info_t *ssi, const char *config);
const char *get_sinsp_source_last_error(sinsp_source_info_t *ssi);
const char *get_sinsp_source_name(sinsp_source_info_t *ssi);
const char* get_sinsp_source_description(sinsp_source_info_t *ssi);
uint32_t get_sinsp_source_nfields(sinsp_source_info_t *ssi);
bool get_sinsp_source_field_info(sinsp_source_info_t *ssi, unsigned field_num, sinsp_field_info_t *field);
size_t get_sinsp_source_nfields(sinsp_source_info_t *ssi);
bool get_sinsp_source_field_info(sinsp_source_info_t *ssi, size_t field_num, sinsp_field_info_t *field);
bool extract_sisnp_source_fields(sinsp_source_info_t *ssi, uint32_t evt_num, uint8_t *evt_data, uint32_t evt_datalen, wmem_allocator_t *pool, sinsp_field_extract_t *sinsp_fields, uint32_t sinsp_field_len);