osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug 2112 

svn path=/trunk/; revision=23915
This commit is contained in:
Tomas Kukosa 2007-12-18 09:51:49 +00:00
parent 255f856ec1
commit 2dbe8bb2ac
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
asn1/h245/packet-h245-template.c
View File

@ -366,6 +366,10 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
guint32 offset=0;
asn1_ctx_t asn1_ctx;
/* Clean up from any previous packet dissection */
if (upcoming_channel)
upcoming_channel = NULL;
if (check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
}
@ -388,6 +392,11 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
void
dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str) {
/* Clean up from any previous packet dissection */
if (upcoming_channel)
upcoming_channel = NULL;
dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree);
if (h245_pi != NULL)

13
epan/dissectors/packet-h245.c
View File

@ -14120,6 +14120,10 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
guint32 offset=0;
asn1_ctx_t asn1_ctx;
/* Clean up from any previous packet dissection */
if (upcoming_channel)
upcoming_channel = NULL;
if (check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
}
@ -14142,6 +14146,11 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
void
dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str) {
/* Clean up from any previous packet dissection */
if (upcoming_channel)
upcoming_channel = NULL;
dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree);
if (h245_pi != NULL)
@ -19749,7 +19758,7 @@ void proto_register_h245(void) {
"h245.EncryptedAlphanumeric", HFILL }},
/*--- End of included file: packet-h245-hfarr.c ---*/
#line 414 "packet-h245-template.c"
#line 423 "packet-h245-template.c"
};
/* List of subtrees */
@ -20252,7 +20261,7 @@ void proto_register_h245(void) {
&ett_h245_MobileMultilinkReconfigurationIndication,
/*--- End of included file: packet-h245-ettarr.c ---*/
#line 421 "packet-h245-template.c"
#line 430 "packet-h245-template.c"
};
module_t *h245_module;