diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-10-26 15:12:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-26 15:12:32 +0000 |
| commit | 6d8f1356ba1446eac15b5af3de6dd3209101fba9 (patch) | |
| tree | 02e0bcaa79871ab428cd6657052bf4eaec2e2188 | |
| parent | 5c33e9f52597fe9339a46a9f1f60bed0b7aaf6ed (diff) | |
| download | wireshark-6d8f1356ba1446eac15b5af3de6dd3209101fba9.tar.gz wireshark-6d8f1356ba1446eac15b5af3de6dd3209101fba9.tar.bz2 wireshark-6d8f1356ba1446eac15b5af3de6dd3209101fba9.zip | |
RelocationRequired incorrectly dissected.
svn path=/trunk/; revision=30710
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ranap.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 68e728513a..d7b12a2ae8 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -146,10 +146,11 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto switch(ProcedureCode){ case id_RelocationPreparation: if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){ - key = SPECIAL || ProtocolIE_ID; + key = SPECIAL | ProtocolIE_ID; ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; + break; } - break; + /* Fall trough */ default: /* no special handling */ ret = (dissector_try_port_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index a68892e354..9bd27edd5f 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -11570,10 +11570,11 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto switch(ProcedureCode){ case id_RelocationPreparation: if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){ - key = SPECIAL || ProtocolIE_ID; + key = SPECIAL | ProtocolIE_ID; ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; + break; } - break; + /* Fall trough */ default: /* no special handling */ ret = (dissector_try_port_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; @@ -14206,7 +14207,7 @@ void proto_register_ranap(void) { "ranap.T_value", HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 293 "packet-ranap-template.c" +#line 294 "packet-ranap-template.c" }; /* List of subtrees */ @@ -14510,7 +14511,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 300 "packet-ranap-template.c" +#line 301 "packet-ranap-template.c" }; @@ -14863,7 +14864,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 344 "packet-ranap-template.c" +#line 345 "packet-ranap-template.c" } else { dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } |