#include <time.h>
#include "packet.h"
-//#include "proto.h"
#include "timestamp.h"
#include "atalk-utils.h"
void
set_actual_length(tvbuff_t *tvb, guint specified_len)
{
- if (specified_len < tvb_reported_length(tvb)) {
- /* Adjust the length of this tvbuff to include only the specified
- payload length.
+ if (specified_len < tvb_reported_length(tvb)) {
+ /* Adjust the length of this tvbuff to include only the specified
+ payload length.
- The dissector above the one calling us (the dissector above is
- probably us) may use that to determine how much of its packet
- was padding. */
- tvb_set_reported_length(tvb, specified_len);
- }
+ The dissector above the one calling us (the dissector above is
+ probably us) may use that to determine how much of its packet
+ was padding. */
+ tvb_set_reported_length(tvb, specified_len);
+ }
}
/* Allow protocols to register "init" routines, which are called before
/* Initialize the common data structures for fragment reassembly.
Must be done *after* calling init routines, as those routines
may free up space for fragments, which they find by using the
- data structures that "reassemble_init()" frees. */
+ data structures that "reassemble_cleanup()" frees. */
reassemble_init();
/* Initialize the stream-handling tables */
void
cleanup_dissection(void)
{
- init_dissection();
+ /* Reclaim all memory of seasonal scope */
+ se_free_all();
+
+ /* Cleanup the table of conversations. */
+ epan_conversation_cleanup();
+
+ /* Cleanup the table of circuits. */
+ epan_circuit_cleanup();
+
+ /* TODO: Introduce cleanup_routines */
+ /* Cleanup protocol-specific variables. */
+ g_slist_foreach(init_routines, &call_init_routine, NULL);
+
+ /* Cleanup the common data structures for fragment reassembly.
+ Must be done *after* calling init routines, as those routines
+ may free up space for fragments, which they find by using the
+ data structures that "reassemble_cleanup()" frees. */
+ reassemble_cleanup();
+
+ /* Cleanup the stream-handling tables */
+ stream_cleanup();
+
+ /* Initialize the expert infos */
+ expert_cleanup();
}
/* Allow protocols to register a "cleanup" routine to be
src = ep_alloc(sizeof (data_source));
src->tvb = tvb;
- src->name_initialized = FALSE;
+ src->name_initialized = FALSE;
src->name = name;
pinfo->data_src = g_slist_append(pinfo->data_src, src);
}
+/*
+ * This should only add a data source to the list of data sources for
+ * a frame if the data sources are being used. Note that they can
+ * be used even if the protocol tree isn't being built or isn't visible,
+ * e.g. if you run tshark with -x but without -V or anything else to
+ * cause the protocol tree to be built.
+ */
+void
+packet_add_new_data_source(packet_info *pinfo, proto_tree *tree _U_,
+ tvbuff_t *tvb, const char *name)
+{
+ add_new_data_source(pinfo, tvb, name);
+}
+
const char*
get_data_source_name(data_source *src)
{
void
free_data_sources(packet_info *pinfo)
{
- g_slist_free(pinfo->data_src);
- pinfo->data_src = NULL;
+ if (pinfo->data_src) {
+ g_slist_free(pinfo->data_src);
+ pinfo->data_src = NULL;
+ }
}
/* Allow dissectors to register a "final_registration" routine
edt->pi.dcerpc_procedure_name="";
edt->pi.link_dir = LINK_DIR_UNKNOWN;
- EP_CHECK_CANARY(("before dissecting frame %d",fd->num));
-
+ EP_CHECK_CANARY(("before dissecting frame %d",fd->num));
+
TRY {
edt->tvb = tvb_new_real_data(pd, fd->cap_len, fd->pkt_len);
/* Add this tvbuffer into the data_src list */
- add_new_data_source(&edt->pi, edt->tvb, "Frame");
+ packet_add_new_data_source(&edt->pi, edt->tree, edt->tvb, "Frame");
/* Even though dissect_frame() catches all the exceptions a
* sub-dissector can throw, dissect_frame() itself may throw
CATCH(ReportedBoundsError) {
if(proto_malformed != -1){
proto_tree_add_protocol_format(edt->tree, proto_malformed, edt->tvb, 0, 0,
- "[Malformed Frame: Packet Length]" );
+ "[Malformed Frame: Packet Length]" );
} else {
g_assert_not_reached();
}
RETHROW;
}
ENDTRY;
-
- EP_CHECK_CANARY(("after dissecting frame %d",fd->num));
+
+ EP_CHECK_CANARY(("after dissecting frame %d",fd->num));
fd->flags.visited = 1;
}
*/
static int
call_dissector_through_handle(dissector_handle_t handle, tvbuff_t *tvb,
- packet_info *pinfo, proto_tree *tree)
+ packet_info *pinfo, proto_tree *tree)
{
const char *saved_proto;
int ret;
if (handle->protocol != NULL) {
pinfo->current_proto =
- proto_get_protocol_short_name(handle->protocol);
+ proto_get_protocol_short_name(handle->protocol);
}
if (handle->is_new) {
- EP_CHECK_CANARY(("before calling handle->dissector.new for %s",handle->name));
+ EP_CHECK_CANARY(("before calling handle->dissector.new for %s",handle->name));
ret = (*handle->dissector.new)(tvb, pinfo, tree);
- EP_CHECK_CANARY(("after calling handle->dissector.new for %s",handle->name));
+ EP_CHECK_CANARY(("after calling handle->dissector.new for %s",handle->name));
} else {
- EP_CHECK_CANARY(("before calling handle->dissector.old for %s",handle->name));
+ EP_CHECK_CANARY(("before calling handle->dissector.old for %s",handle->name));
(*handle->dissector.old)(tvb, pinfo, tree);
- EP_CHECK_CANARY(("after calling handle->dissector.old for %s",handle->name));
+ EP_CHECK_CANARY(("after calling handle->dissector.old for %s",handle->name));
ret = tvb_length(tvb);
if (ret == 0) {
/*
static int
call_dissector_work_error(dissector_handle_t handle, tvbuff_t *tvb,
- packet_info *pinfo_arg, proto_tree *tree);
+ packet_info *pinfo_arg, proto_tree *tree);
static int
call_dissector_work(dissector_handle_t handle, tvbuff_t *tvb,
pinfo->can_desegment = saved_can_desegment-(saved_can_desegment>0);
if (handle->protocol != NULL) {
pinfo->current_proto =
- proto_get_protocol_short_name(handle->protocol);
+ proto_get_protocol_short_name(handle->protocol);
/*
* Add the protocol name to the layers
if ((pinfo->layer_names)&&(add_proto_name)) {
if (pinfo->layer_names->len > 0)
g_string_append(pinfo->layer_names, ":");
- g_string_append(pinfo->layer_names,
- proto_get_protocol_filter_name(proto_get_id(handle->protocol)));
+ g_string_append(pinfo->layer_names,
+ proto_get_protocol_filter_name(proto_get_id(handle->protocol)));
}
}
* of protocols.
*/
if ((pinfo->layer_names != NULL)&&(add_proto_name)) {
- g_string_truncate(pinfo->layer_names,
- saved_layer_names_len);
+ g_string_truncate(pinfo->layer_names, saved_layer_names_len);
}
}
pinfo->current_proto = saved_proto;
static int
call_dissector_work_error(dissector_handle_t handle, tvbuff_t *tvb,
- packet_info *pinfo_arg, proto_tree *tree)
+ packet_info *pinfo_arg, proto_tree *tree)
{
packet_info *pinfo = pinfo_arg;
const char *saved_proto;
}
CATCH(OutOfMemoryError) {
RETHROW;
- }
+ }
ENDTRY;
col_set_writable(pinfo->cinfo, save_writable);
* Find the entry.
*/
return g_hash_table_lookup(sub_dissectors->hash_table,
- GUINT_TO_POINTER(pattern));
+ GUINT_TO_POINTER(pattern));
}
+#if 0
+static void
+dissector_add_sanity_check(const char *name, guint32 pattern, dissector_handle_t handle, dissector_table_t sub_dissectors)
+{
+ dtbl_entry_t *dtbl_entry;
+
+ if (pattern == 0) {
+ g_warning("%s: %s registering using a pattern of 0",
+ name, proto_get_protocol_filter_name(proto_get_id(handle->protocol)));
+ }
+
+ dtbl_entry = g_hash_table_lookup(sub_dissectors->hash_table, GUINT_TO_POINTER(pattern));
+ if (dtbl_entry != NULL) {
+ g_warning("%s: %s registering using pattern %d already registered by %s",
+ name, proto_get_protocol_filter_name(proto_get_id(handle->protocol)),
+ pattern, proto_get_protocol_filter_name(proto_get_id(dtbl_entry->initial->protocol)));
+ }
+}
+#endif
+
/* Add an entry to a uint dissector table. */
void
dissector_add(const char *name, guint32 pattern, dissector_handle_t handle)
dtbl_entry_t *dtbl_entry;
sub_dissectors = find_dissector_table(name);
-/* sanity checks */
+ /* sanity checks */
g_assert(sub_dissectors);
+ g_assert(handle!=NULL);
switch (sub_dissectors->type) {
case FT_UINT8:
}
#if 0
- if (pattern == 0) {
- g_warning("%s: %s registering using a pattern of 0",
- name, proto_get_protocol_filter_name(proto_get_id(handle->protocol)));
- }
-
- dtbl_entry = g_hash_table_lookup(sub_dissectors->hash_table, GUINT_TO_POINTER(pattern));
- if (dtbl_entry != NULL) {
- g_warning("%s: %s registering using pattern %d already registered by %s",
- name, proto_get_protocol_filter_name(proto_get_id(handle->protocol)),
- pattern, proto_get_protocol_filter_name(proto_get_id(dtbl_entry->initial->protocol)));
- }
+ dissector_add_sanity_check(name, pattern, handle, sub_dissectors);
#endif
+
dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
dtbl_entry->current = handle;
dtbl_entry->initial = dtbl_entry->current;
/* do the table insertion */
- g_hash_table_insert( sub_dissectors->hash_table,
- GUINT_TO_POINTER( pattern), (gpointer)dtbl_entry);
+ g_hash_table_insert( sub_dissectors->hash_table,
+ GUINT_TO_POINTER( pattern), (gpointer)dtbl_entry);
/*
* Now add it to the list of handles that could be used with this
* Found - remove it.
*/
g_hash_table_remove(sub_dissectors->hash_table,
- GUINT_TO_POINTER(pattern));
+ GUINT_TO_POINTER(pattern));
/*
* Now free up the entry.
dtbl_entry->current = handle;
/* do the table insertion */
- g_hash_table_insert( sub_dissectors->hash_table,
- GUINT_TO_POINTER( pattern), (gpointer)dtbl_entry);
+ g_hash_table_insert( sub_dissectors->hash_table,
+ GUINT_TO_POINTER( pattern), (gpointer)dtbl_entry);
}
/* Reset an entry in a uint dissector table to its initial value. */
dtbl_entry->current = dtbl_entry->initial;
} else {
g_hash_table_remove(sub_dissectors->hash_table,
- GUINT_TO_POINTER(pattern));
+ GUINT_TO_POINTER(pattern));
g_free(dtbl_entry);
}
}
gboolean
dissector_try_port_new(dissector_table_t sub_dissectors, guint32 port,
- tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean add_proto_name)
+ tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean add_proto_name)
{
dtbl_entry_t *dtbl_entry;
struct dissector_handle *handle;
gboolean
dissector_try_port(dissector_table_t sub_dissectors, guint32 port,
- tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+ tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return dissector_try_port_new(sub_dissectors, port, tvb, pinfo, tree, TRUE);
/* Add an entry to a string dissector table. */
void
dissector_add_string(const char *name, const gchar *pattern,
- dissector_handle_t handle)
+ dissector_handle_t handle)
{
dissector_table_t sub_dissectors = find_dissector_table( name);
dtbl_entry_t *dtbl_entry;
dtbl_entry->initial = dtbl_entry->current;
/* do the table insertion */
- g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern,
- (gpointer)dtbl_entry);
+ g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern,
+ (gpointer)dtbl_entry);
/*
* Now add it to the list of handles that could be used with this
with a particular pattern to use a new dissector handle. */
void
dissector_change_string(const char *name, gchar *pattern,
- dissector_handle_t handle)
+ dissector_handle_t handle)
{
dissector_table_t sub_dissectors = find_dissector_table( name);
dtbl_entry_t *dtbl_entry;
dtbl_entry->current = handle;
/* do the table insertion */
- g_hash_table_insert( sub_dissectors->hash_table, pattern,
- (gpointer)dtbl_entry);
+ g_hash_table_insert( sub_dissectors->hash_table, pattern,
+ (gpointer)dtbl_entry);
}
/* Reset an entry in a string sub-dissector table to its initial value. */
return FALSE. */
gboolean
dissector_try_string(dissector_table_t sub_dissectors, const gchar *string,
- tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+ tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dtbl_entry_t *dtbl_entry;
struct dissector_handle *handle;
return the dissector handle for that value. */
dissector_handle_t
dissector_get_string_handle(dissector_table_t sub_dissectors,
- const gchar *string)
+ const gchar *string)
{
dtbl_entry_t *dtbl_entry;
/* Add it to the list. */
sub_dissectors->dissector_handles =
- g_slist_append(sub_dissectors->dissector_handles, (gpointer)handle);
+ g_slist_append(sub_dissectors->dissector_handles, (gpointer)handle);
}
dissector_handle_t
info = user_data;
info->caller_func(info->table_name, info->selector_type, key, value,
- info->caller_data);
+ info->caller_data);
}
/*
GSList *tmp;
for (tmp = sub_dissectors->dissector_handles; tmp != NULL;
- tmp = g_slist_next(tmp))
+ tmp = g_slist_next(tmp))
func(name, tmp->data, user_data);
}
info = user_data;
info->caller_func(info->table_name, info->selector_type, key, value,
- info->caller_data);
+ info->caller_data);
}
/*
info.caller_func = func;
info.caller_data = user_data;
g_hash_table_foreach(sub_dissectors->hash_table,
- dissector_table_foreach_changed_func, &info);
+ dissector_table_foreach_changed_func, &info);
}
typedef struct dissector_foreach_table_info {
- gpointer caller_data;
- DATFunc_table caller_func;
+ gpointer caller_data;
+ DATFunc_table caller_func;
} dissector_foreach_table_info_t;
/*
dissector_table_t
register_dissector_table(const char *name, const char *ui_name, ftenum_t type,
- int base)
+ int base)
{
dissector_table_t sub_dissectors;
* so we use "g_direct_hash()" and "g_direct_equal()".
*/
sub_dissectors->hash_table = g_hash_table_new( g_direct_hash,
- g_direct_equal );
+ g_direct_equal );
break;
case FT_STRING:
case FT_STRINGZ:
sub_dissectors->hash_table = g_hash_table_new( g_str_hash,
- g_str_equal );
+ g_str_equal );
break;
default:
static int find_matching_heur_dissector( gconstpointer a, gconstpointer b) {
- const heur_dtbl_entry_t *dtbl_entry_a = (const heur_dtbl_entry_t *) a;
- const heur_dtbl_entry_t *dtbl_entry_b = (const heur_dtbl_entry_t *) b;
- return (dtbl_entry_a->dissector == dtbl_entry_b->dissector) &&
+ const heur_dtbl_entry_t *dtbl_entry_a = (const heur_dtbl_entry_t *) a;
+ const heur_dtbl_entry_t *dtbl_entry_b = (const heur_dtbl_entry_t *) b;
+ return (dtbl_entry_a->dissector == dtbl_entry_b->dissector) &&
(dtbl_entry_a->protocol == dtbl_entry_b->protocol) ? 0 : 1;
}
gboolean
dissector_try_heuristic(heur_dissector_list_t sub_dissectors,
- tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+ tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gboolean status;
const char *saved_proto;
if (dtbl_entry->protocol != NULL) {
pinfo->current_proto =
- proto_get_protocol_short_name(dtbl_entry->protocol);
+ proto_get_protocol_short_name(dtbl_entry->protocol);
/*
* Add the protocol name to the layers; we'll remove it
if (pinfo->layer_names) {
if (pinfo->layer_names->len > 0)
g_string_append(pinfo->layer_names, ":");
- g_string_append(pinfo->layer_names,
+ g_string_append(pinfo->layer_names,
proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol)));
}
}
- EP_CHECK_CANARY(("before calling heuristic dissector for protocol: %s",
- proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
+ EP_CHECK_CANARY(("before calling heuristic dissector for protocol: %s",
+ proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
if ((*dtbl_entry->dissector)(tvb, pinfo, tree)) {
- EP_CHECK_CANARY(("after heuristic dissector for protocol: %s has accepted and dissected packet",
- proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
+ EP_CHECK_CANARY(("after heuristic dissector for protocol: %s has accepted and dissected packet",
+ proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
status = TRUE;
break;
} else {
- EP_CHECK_CANARY(("after heuristic dissector for protocol: %s has returned true",
- proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
+ EP_CHECK_CANARY(("after heuristic dissector for protocol: %s has returned true",
+ proto_get_protocol_filter_name(proto_get_id(dtbl_entry->protocol))));
/*
* That dissector didn't accept the packet, so
* of protocols.
*/
if (pinfo->layer_names != NULL) {
- g_string_truncate(pinfo->layer_names,
- saved_layer_names_len);
- }
+ g_string_truncate(pinfo->layer_names, saved_layer_names_len);
+ }
}
}
pinfo->current_proto = saved_proto;
*sub_dissectors = NULL; /* initially empty */
g_hash_table_insert(heur_dissector_lists, (gpointer)name,
- (gpointer) sub_dissectors);
+ (gpointer) sub_dissectors);
}
/*
handle->protocol = find_protocol_by_id(proto);
g_hash_table_insert(registered_dissectors, (gpointer)name,
- (gpointer) handle);
+ (gpointer) handle);
}
void
handle->protocol = find_protocol_by_id(proto);
g_hash_table_insert(registered_dissectors, (gpointer)name,
- (gpointer) handle);
+ (gpointer) handle);
}
/* Call a dissector through a handle but if the dissector rejected it
*/
int
call_dissector_only(dissector_handle_t handle, tvbuff_t *tvb,
- packet_info *pinfo, proto_tree *tree)
+ packet_info *pinfo, proto_tree *tree)
{
int ret;
*/
int
call_dissector(dissector_handle_t handle, tvbuff_t *tvb,
- packet_info *pinfo, proto_tree *tree)
+ packet_info *pinfo, proto_tree *tree)
{
int ret;
* The protocol was disabled, or the dissector rejected
* it. Just dissect this packet as data.
*/
- g_assert(data_handle != NULL);
+ g_assert(data_handle != NULL);
g_assert(data_handle->protocol != NULL);
call_dissector_work(data_handle, tvb, pinfo, tree, TRUE);
return tvb_length(tvb);
static void
dissector_dump_decodes_display(const gchar *table_name,
- ftenum_t selector_type _U_, gpointer key, gpointer value,
- gpointer user_data _U_)
+ ftenum_t selector_type _U_, gpointer key, gpointer value,
+ gpointer user_data _U_)
{
guint32 selector = (guint32)(unsigned long) key;
dissector_table_t sub_dissectors = find_dissector_table(table_name);
void
register_postdissector(dissector_handle_t handle)
{
- if (!post_dissectors)
- post_dissectors = g_ptr_array_new();
+ if (!post_dissectors)
+ post_dissectors = g_ptr_array_new();
- g_ptr_array_add(post_dissectors, handle);
- num_of_postdissectors++;
+ g_ptr_array_add(post_dissectors, handle);
+ num_of_postdissectors++;
}
gboolean
have_postdissector()
{
- guint i;
- dissector_handle_t handle;
+ guint i;
+ dissector_handle_t handle;
- for(i = 0; i < num_of_postdissectors; i++) {
- handle = (dissector_handle_t) g_ptr_array_index(post_dissectors,i);
+ for(i = 0; i < num_of_postdissectors; i++) {
+ handle = (dissector_handle_t) g_ptr_array_index(post_dissectors,i);
- if (handle->protocol != NULL
- && proto_is_protocol_enabled(handle->protocol)) {
- /* We have at least one enabled postdissector */
- return TRUE;
+ if (handle->protocol != NULL
+ && proto_is_protocol_enabled(handle->protocol)) {
+ /* We have at least one enabled postdissector */
+ return TRUE;
+ }
}
- }
- return FALSE;
+ return FALSE;
}
void
call_all_postdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- guint i;
+ guint i;
- for(i = 0; i < num_of_postdissectors; i++) {
- call_dissector_only((dissector_handle_t) g_ptr_array_index(post_dissectors,i),
- tvb,pinfo,tree);
- }
+ for(i = 0; i < num_of_postdissectors; i++) {
+ call_dissector_only((dissector_handle_t) g_ptr_array_index(post_dissectors,i),
+ tvb,pinfo,tree);
+ }
}
git.samba.org / obnox / wireshark / wip.git / blobdiff