diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-05 09:33:27 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-05 09:33:27 +0000 |
| commit | 9688d693e9eab58d3c67afebdba880e4cd67f00c (patch) | |
| tree | 4420ca68cc30d29a3fa32b3cbfbf3aacf9bb5bec /packet-isup.c | |
| parent | 133c26d8d697ca168f04c361ab5225aeb2c90c54 (diff) | |
Subdissectors must be called regardless of whether a protocol tree is
being built.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9175 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-isup.c')
| -rw-r--r-- | packet-isup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-isup.c b/packet-isup.c index 6c987df3c2..c5807eb092 100644 --- a/packet-isup.c +++ b/packet-isup.c @@ -5,7 +5,7 @@ * <anders.broman@ericsson.com> * Inserted routines for BICC dissection according to Q.765.5 Q.1902 Q.1970 Q.1990, * calling SDP dissector for RFC2327 decoding. - * $Id: packet-isup.c,v 1.38 2003/12/04 05:47:38 gram Exp $ + * $Id: packet-isup.c,v 1.39 2003/12/05 09:33:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -5514,7 +5514,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; - proto_tree *isup_tree; + proto_tree *isup_tree = NULL; tvbuff_t *message_tvb; guint16 cic; guint8 message_type; @@ -5540,10 +5540,10 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x0FFF; /*since upper 4 bits spare */ proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic); - - message_tvb = tvb_new_subset(tvb, CIC_LENGTH, -1, -1); - dissect_isup_message(message_tvb, pinfo, isup_tree); } + + message_tvb = tvb_new_subset(tvb, CIC_LENGTH, -1, -1); + dissect_isup_message(message_tvb, pinfo, isup_tree); } /* ------------------------------------------------------------------ */ @@ -5553,7 +5553,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; - proto_tree *bicc_tree; + proto_tree *bicc_tree = NULL; tvbuff_t *message_tvb; guint32 bicc_cic; guint8 message_type; @@ -5579,10 +5579,10 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bicc_cic = tvb_get_letohl(tvb, BICC_CIC_OFFSET); proto_tree_add_uint_format(bicc_tree, hf_bicc_cic, tvb, BICC_CIC_OFFSET, BICC_CIC_LENGTH, bicc_cic, "CIC: %u", bicc_cic); - - message_tvb = tvb_new_subset(tvb, BICC_CIC_LENGTH, -1, -1); - dissect_isup_message(message_tvb, pinfo, bicc_tree); } + + message_tvb = tvb_new_subset(tvb, BICC_CIC_LENGTH, -1, -1); + dissect_isup_message(message_tvb, pinfo, bicc_tree); } /*---------------------------------------------------------------------*/ /* Register the protocol with Ethereal */ |