diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-12-29 16:22:02 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-12-29 16:22:02 +0000 |
| commit | b97844bcaa2809355c33fc45a0dcdc83cd27c597 (patch) | |
| tree | bea7ee72d844f8a41b19a7bb46757eeffd3171db /epan/dissectors/packet-ltp.c | |
| parent | 87d587b53f2027d430d3addb3e12a29a3f8eb56e (diff) | |
Fix LTP multiple bundle bug and allow LTP/DCCP. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5035
svn path=/trunk/; revision=40325
Diffstat (limited to 'epan/dissectors/packet-ltp.c')
| -rw-r--r-- | epan/dissectors/packet-ltp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 489cd89c88..84bb55a359 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -350,7 +350,7 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int if(new_tvb) { data_length = tvb_length(new_tvb); - while((unsigned)dissected_data_size < length) + while(dissected_data_size < data_length) { ltp_data_data_item = proto_tree_add_text(ltp_data_tree, tvb,frame_offset, 0, "Data[%d]",data_count); ltp_data_data_tree = proto_item_add_subtree(ltp_data_data_item, ett_data_data_segm); @@ -957,8 +957,9 @@ proto_register_ltp(void) proto_register_subtree_array(ett, array_length(ett)); ltp_module = prefs_register_protocol(proto_ltp, proto_reg_handoff_ltp); - prefs_register_uint_preference(ltp_module, "udp.port", "LTP UDP Port", - "UDP Port to accept LTP Connections", + prefs_register_obsolete_preference(ltp_module, "udp.port"); + prefs_register_uint_preference(ltp_module, "port", "LTP Port", + "The UDP or DCCP port to accept LTP Connections", 10, <p_port); register_init_routine(ltp_defragment_init); } @@ -975,9 +976,11 @@ proto_reg_handoff_ltp(void) initialized = TRUE; } else { dissector_delete_uint("udp.port", currentPort, ltp_handle); + dissector_delete_uint("dccp.port", currentPort, ltp_handle); } currentPort = ltp_port; dissector_add_uint("udp.port", currentPort, ltp_handle); + dissector_add_uint("dccp.port", currentPort, ltp_handle); } |