aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sccp.c
diff options
context:
space:
mode:
authorAnders Broman <a.broman58@gmail.com>2017-05-23 10:56:03 +0000
committerAnders Broman <a.broman58@gmail.com>2017-05-23 11:03:43 +0000
commit8fd14b796055fc45f0aac0ee6d24bfb183bebe43 (patch)
tree8163824642d9c6b4c4f26f5681c72b503fa3b62e /epan/dissectors/packet-sccp.c
parent8bc9f9ad5615c86f80ea319b77cd40ea893286ce (diff)
Revert "Fix issue with dissecting multiple DT1 packets in the frame"
Bug: 13651 This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5. Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46 Reviewed-on: https://code.wireshark.org/review/21738 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sccp.c')
-rw-r--r--epan/dissectors/packet-sccp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index e4c2c0ab39..c54cf77f8c 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2887,8 +2887,8 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree,
offset, SEGMENTING_REASSEMBLING_LENGTH, &sccp_info);
VARIABLE_POINTER(variable_pointer1, hf_sccp_variable_pointer1, POINTER_LENGTH);
- /* Reassemble (only if there are fragments involved) */
- if ((!sccp_reassemble) || (!more && (fragment_get_reassembled(&sccp_xudt_msg_reassembly_table, source_local_ref) == NULL))) {
+ /* Reassemble */
+ if (!sccp_reassemble) {
proto_tree_add_item(sccp_tree, hf_sccp_segmented_data, tvb, variable_pointer1,
tvb_get_guint8(tvb, variable_pointer1)+1, ENC_NA);
dissect_sccp_variable_parameter(tvb, pinfo, sccp_tree, tree,