7eb3e47fa4
Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
93 lines
2.7 KiB
C
93 lines
2.7 KiB
C
/* file_packet_provider_data.c
|
|
* Routines for a packet_provider_data for packets from a file.
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#include <glib.h>
|
|
|
|
#include "cfile.h"
|
|
|
|
static int
|
|
frame_cmp(gconstpointer a, gconstpointer b, gpointer user_data _U_)
|
|
{
|
|
const frame_data *fdata1 = (const frame_data *) a;
|
|
const frame_data *fdata2 = (const frame_data *) b;
|
|
|
|
return (fdata1->num < fdata2->num) ? -1 :
|
|
(fdata1->num > fdata2->num) ? 1 :
|
|
0;
|
|
}
|
|
|
|
const char *
|
|
cap_file_provider_get_interface_name(struct packet_provider_data *prov, guint32 interface_id)
|
|
{
|
|
wtapng_iface_descriptions_t *idb_info;
|
|
wtap_block_t wtapng_if_descr = NULL;
|
|
char* interface_name;
|
|
|
|
idb_info = wtap_file_get_idb_info(prov->wth);
|
|
|
|
if (interface_id < idb_info->interface_data->len)
|
|
wtapng_if_descr = g_array_index(idb_info->interface_data, wtap_block_t, interface_id);
|
|
|
|
g_free(idb_info);
|
|
|
|
if (wtapng_if_descr) {
|
|
if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_NAME, &interface_name) == WTAP_OPTTYPE_SUCCESS)
|
|
return interface_name;
|
|
if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_DESCR, &interface_name) == WTAP_OPTTYPE_SUCCESS)
|
|
return interface_name;
|
|
if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_HARDWARE, &interface_name) == WTAP_OPTTYPE_SUCCESS)
|
|
return interface_name;
|
|
}
|
|
return "unknown";
|
|
}
|
|
|
|
const char *
|
|
cap_file_provider_get_interface_description(struct packet_provider_data *prov, guint32 interface_id)
|
|
{
|
|
wtapng_iface_descriptions_t *idb_info;
|
|
wtap_block_t wtapng_if_descr = NULL;
|
|
char* interface_name;
|
|
|
|
idb_info = wtap_file_get_idb_info(prov->wth);
|
|
|
|
if (interface_id < idb_info->interface_data->len)
|
|
wtapng_if_descr = g_array_index(idb_info->interface_data, wtap_block_t, interface_id);
|
|
|
|
g_free(idb_info);
|
|
|
|
if (wtapng_if_descr) {
|
|
if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_DESCR, &interface_name) == WTAP_OPTTYPE_SUCCESS)
|
|
return interface_name;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
const char *
|
|
cap_file_provider_get_user_comment(struct packet_provider_data *prov, const frame_data *fd)
|
|
{
|
|
if (prov->frames_user_comments)
|
|
return (const char *)g_tree_lookup(prov->frames_user_comments, fd);
|
|
|
|
/* g_warning? */
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
cap_file_provider_set_user_comment(struct packet_provider_data *prov, frame_data *fd, const char *new_comment)
|
|
{
|
|
if (!prov->frames_user_comments)
|
|
prov->frames_user_comments = g_tree_new_full(frame_cmp, NULL, NULL, g_free);
|
|
|
|
/* insert new packet comment */
|
|
g_tree_replace(prov->frames_user_comments, fd, g_strdup(new_comment));
|
|
|
|
fd->has_user_comment = TRUE;
|
|
}
|