diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-27 10:05:42 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-27 10:05:42 +0000 |
| commit | 9a66525b71ff30396b80804406affa14de450e55 (patch) | |
| tree | 69259b6684b8aad1f7c4dcce2eb04218ad1695e7 /asn1/h225 | |
| parent | 70f17cd417a5faff43642b42a1f6f820401e7544 (diff) | |
new option whether tunnelled H.245 and tunnelled protocol are displayed inside H.225 tree or outside
svn path=/trunk/; revision=16020
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/h225.cnf | 6 | ||||
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 25e2689291..8d952da369 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -230,14 +230,14 @@ CallIdentifier/guid guid tvbuff_t *h245_tvb = NULL; %(DEFAULT_BODY)s - next_tvb_add(&h245_list, h245_tvb, tree, h245dg_handle); + next_tvb_add(&h245_list, h245_tvb, (h225_h245_in_tree)?tree:NULL, h245dg_handle); #.END #---------------------------------------------------------------------------------------- #.FN_BODY H245Control/_item VAL_PTR = &h245_tvb tvbuff_t *h245_tvb = NULL; %(DEFAULT_BODY)s - next_tvb_add(&h245_list, h245_tvb, tree, h245dg_handle); + next_tvb_add(&h245_list, h245_tvb, (h225_h245_in_tree)?tree:NULL, h245dg_handle); #.END #---------------------------------------------------------------------------------------- #.FN_FTR H323-UU-PDU/h323-message-body/empty @@ -481,7 +481,7 @@ ReleaseCompleteReason VAL_PTR = &value tvbuff_t *next_tvb = NULL; %(DEFAULT_BODY)s - next_tvb_add(&tp_list, next_tvb, tree, tp_handle); + next_tvb_add(&tp_list, next_tvb, (h225_tp_in_tree)?tree:NULL, tp_handle); #.END #--- NonStandardParameter --------------------------------------------------------------- diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 5ecc1affdf..194320ee76 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -172,11 +172,15 @@ static int hf_h225_fastStart_item_length = -1; static gint ett_h225 = -1; #include "packet-h225-ett.c" +/* Preferences */ +static gboolean h225_reassembly = TRUE; +static gboolean h225_h245_in_tree = TRUE; +static gboolean h225_tp_in_tree = TRUE; + /* Global variables */ static guint32 ipv4_address; static guint32 ipv4_port; guint32 T38_manufacturer_code; -static gboolean h225_reassembly = TRUE; guint32 value; static gboolean contains_faststart = FALSE; @@ -321,6 +325,14 @@ void proto_register_h225(void) { "Whether the H.225 dissector should reassemble messages spanning multiple TCP segments." " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &h225_reassembly); + prefs_register_bool_preference(h225_module, "h245_in_tree", + "Display tunnelled H.245 inside H.225.0 tree", + "ON - display tunnelled H.245 inside H.225.0 tree, OFF - display tunnelled H.245 in root tree after H.225.0", + &h225_h245_in_tree); + prefs_register_bool_preference(h225_module, "tp_in_tree", + "Display tunnelled protocols inside H.225.0 tree", + "ON - display tunnelled protocols inside H.225.0 tree, OFF - display tunnelled protocols in root tree after H.225.0", + &h225_tp_in_tree); new_register_dissector("h225", dissect_h225_H323UserInformation, proto_h225); new_register_dissector("h323ui",dissect_h225_H323UserInformation, proto_h225); |