From a85e1334c9a49f4fdf9a74ff2bc1c6ec5ef48d37 Mon Sep 17 00:00:00 2001 From: lego Date: Thu, 10 Feb 2005 16:55:08 +0000 Subject: [PATCH] add "mate" as a protocol to its tree git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13380 f5534014-38df-0310-8fa8-9805f1628bb7 --- plugins/mate/mate.h | 5 +++-- plugins/mate/mate_setup.c | 5 +++-- plugins/mate/packet-mate.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index ea898313b2..27bf3478ab 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -226,7 +226,8 @@ typedef struct _mate_config { avpl_match_mode match_mode; avpl_replace_mode replace_mode; gboolean gop_as_subtree; - + int hfid_mate; + float gop_expiration; float gop_idle_timeout; float gop_lifetime; @@ -338,7 +339,7 @@ extern mate_pdu* mate_get_pdus(guint32 framenum); extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree); /* from mate_setup.c */ -extern mate_config* mate_make_config(guint8* filename); +extern mate_config* mate_make_config(guint8* filename, int mate_hfid); extern mate_config* mate_cfg(void); #endif diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c index 72bde2b532..055b12fd73 100644 --- a/plugins/mate/mate_setup.c +++ b/plugins/mate/mate_setup.c @@ -1594,7 +1594,7 @@ extern mate_config* mate_cfg() { return matecfg; } -extern mate_config* mate_make_config(guint8* filename) { +extern mate_config* mate_make_config(guint8* filename, int mate_hfid) { gint* ett; avp_init(); @@ -1630,7 +1630,8 @@ extern mate_config* mate_make_config(guint8* filename) { matecfg->hfrs = g_array_new(FALSE,TRUE,sizeof(hf_register_info)); matecfg->ett = g_array_new(FALSE,TRUE,sizeof(gint*)); matecfg->ett_root = -1; - + matecfg->hfid_mate = mate_hfid; + ett = &matecfg->ett_root; g_array_append_val(matecfg->ett,ett); diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c index 70fd15e0da..7344869867 100644 --- a/plugins/mate/packet-mate.c +++ b/plugins/mate/packet-mate.c @@ -231,7 +231,7 @@ extern void mate_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (( pdus = mate_get_pdus(pinfo->fd->num) )) { for ( ; pdus; pdus = pdus->next_in_frame) { - mate_i = proto_tree_add_text(tree,tvb,0,0,"MATE"); + mate_i = proto_tree_add_protocol_format(tree,mc->hfid_mate,tvb,0,0,"MATE"); mate_t = proto_item_add_subtree(mate_i, mc->ett_root); mate_pdu_tree(pdus,tvb,mate_t); } @@ -277,7 +277,7 @@ proto_reg_handoff_mate(void) } if (!mc) { - mc = mate_make_config((char*)pref_mate_config_filename); + mc = mate_make_config((char*)pref_mate_config_filename,proto_mate); current_mate_config_filename = pref_mate_config_filename; if (mc) { /* XXX: alignment warnings, what do they mean? */ -- 2.34.1