Commit Graph

46017 Commits

Author SHA1 Message Date
Michael Mann 3592313c82 Use uint instead of int
svn path=/trunk/; revision=48748
2013-04-05 13:50:49 +00:00
Michael Mann 4b4297a7ff Replace proto_tree_add_text with itemized filters
svn path=/trunk/; revision=48747
2013-04-05 13:41:32 +00:00
Michael Tüxen a88e677724 Don't forget to move the trailing '\0'.
svn path=/trunk/; revision=48746
2013-04-05 09:56:11 +00:00
Irene Rüngeler b34e4d5fee Add checkbox for the direction indication to the "Import from Hex Dump" dialog.
svn path=/trunk/; revision=48745
2013-04-05 06:43:38 +00:00
Anders Broman 352b96d735 From Cal Turney:
Patch 45480 introduced the following check: 

"tvb_ensure_bytes_exist(tvb, offset, neo ? neo : *bcp - ((unsigned)offset + 1));:     

When the last entry in the directory listing is processed, 'neo' the next entry offset is zero so bcp is checked. The 'bcp' variable is set to the remaining reported bytes in the tvb.  Subtracting the current offset +1 from *bcp usually produces a negative result and causes the error.

Removed "- ((unsigned)offset + 1)" and added "CHECK_BYTE_COUNT_SUBR(4);"

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8549

svn path=/trunk/; revision=48744
2013-04-05 05:20:41 +00:00
Anders Broman 198149f148 From Tim Ringenbach:
makes the TDMoE dissector call the LAPD bitstream dissector on the D-Channel. As a result, LAPD calls Q.931, and you can actually see call setup and tear down, instead of just a hex dump.

It adds a preference for which channel the D-Channel is.

It patches the LAPD code to fix a few bugs, not pass the checksum to Q.931 (who isn't expecting it), to register the lapd-bitstream dissector, and to mark packets with aborts or resets.

also storing more data on the lapd_byte_state_t.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8374

svn path=/trunk/; revision=48743
2013-04-05 05:09:31 +00:00
Guy Harris 9bd43d3c28 If we somehow manage to find libnl version 2 or 3, but don't manage to
find the corresponding libnl-genl or libnl-route libraries, act as if we
didn't find libnl.

If we didn't find libnl version 2 or 3, don't check whether it's version
2 or 3.

svn path=/trunk/; revision=48742
2013-04-04 21:09:10 +00:00
Pascal Quantin 5312d37e93 Update ASN.1 conformance files with the changes from r48634
svn path=/trunk/; revision=48741
2013-04-04 21:01:27 +00:00
Chris Maynard 95bad136a0 Fix Coverity CID 280402: Logically dead code.
svn path=/trunk/; revision=48740
2013-04-04 20:40:32 +00:00
Chris Maynard 3d7ea4a6b5 Fix Coverity CID 280404: Logically dead code.
svn path=/trunk/; revision=48739
2013-04-04 20:28:42 +00:00
Chris Maynard 2239e7618d As forewarned at http://www.wireshark.org/lists/wireshark-dev/201304/msg00009.html, change the default snaplen to 65KiB-1. While we're at it, push the max packet size to that value as well.
Also: convert the few tabs to spaces and add modelines.


svn path=/trunk/; revision=48738
2013-04-04 19:48:20 +00:00
Martin Kaiser 2a3dee91ff use mpeg_pmt_stream_tree for the descriptor loop
(this fixes a bug from my last commit)

svn path=/trunk/; revision=48737
2013-04-04 18:32:26 +00:00
Jaap Keuter a092ef9862 Set 'details' radio button sensitivity also at the creation of the dialog.
svn path=/trunk/; revision=48736
2013-04-04 17:20:36 +00:00
Jaap Keuter f4a29a59f6 Remove a shadow variable.
svn path=/trunk/; revision=48735
2013-04-04 17:15:10 +00:00
Anders Broman b1fc95c5cf - Dissect Packet filters and QoS list(partly).
- Update value_strings.

svn path=/trunk/; revision=48734
2013-04-04 16:23:55 +00:00
Chris Maynard 38a02b35ad Fix the 2nd occurrence of Coverity CID 280417: Logically dead code. This, plus r48657, should resolve the CID.
svn path=/trunk/; revision=48733
2013-04-04 15:57:29 +00:00
Chris Maynard e08b7c3a38 Fix encoding arg for proto_tree_add_item() and friends.
svn path=/trunk/; revision=48732
2013-04-04 15:33:14 +00:00
Pascal Quantin 3322a952f6 Try to fix compilation on Linux
svn path=/trunk/; revision=48731
2013-04-04 15:01:56 +00:00
Michael Mann f39b47420b Fix checkAPI.pl complaints
svn path=/trunk/; revision=48730
2013-04-04 15:00:27 +00:00
Michael Mann 719dca4797 Enhancements to Ethernet/IP DLR dissector, bug 8560 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8560)
From Joakim Wiberg

svn path=/trunk/; revision=48729
2013-04-04 14:34:26 +00:00
Chris Maynard 998e940ec9 Use a consistent bracketing style throughout. Add modelines.
svn path=/trunk/; revision=48728
2013-04-04 14:10:44 +00:00
Michael Mann 4e7e06ca3a RTPS Cleanup, Part 3 (final)
Merged packet-rtps.c and packet-rtps2.c into a single dissector.  It appears packet-rtps2.[ch] "API" needs to be externally available, otherwise I would have rolled (the newly merged) packet-rtps.h into packet-rtps.c as well.

Converted many of the remaining proto_tree_add_text to proto_tree_add_item/expert_info and cleaned up the manual string manipulation so checkAPIs.pl is happy.

Added a "cooked" capture file to the SampleCaptures page on the wiki for future fuzztesting/regression.

svn path=/trunk/; revision=48727
2013-04-04 12:22:04 +00:00
Pascal Quantin 595a893406 From Lukasz Wachowski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8559 :
Fix dissection of RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications

svn path=/trunk/; revision=48726
2013-04-04 09:14:11 +00:00
Pascal Quantin e157cf5bf4 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8558 :
Fix incompatible field type for field name "btsdp.service_uuid"

svn path=/trunk/; revision=48725
2013-04-04 08:45:30 +00:00
Guy Harris c5d1d8d80e From Anthony Coddington: don't check for MPEG-2 Transport before
checking for ERF.

From me: note some heuristic checkers that are in the "magic number" set.

#BACKPORT 1.8

svn path=/trunk/; revision=48724
2013-04-04 04:35:09 +00:00
Jeff Morriss afb4cff52f Get rid of a shadowed variable and remove a set-but-not-used variable. Reindent a little.
svn path=/trunk/; revision=48723
2013-04-03 17:50:13 +00:00
Jeff Morriss 4508745e3b Get rid of non-ASCII characters.
svn path=/trunk/; revision=48722
2013-04-03 17:46:39 +00:00
Anders Broman a54f786099 Sort LocalCode value string.
svn path=/trunk/; revision=48721
2013-04-03 16:53:53 +00:00
Anders Broman a9ed804565 From Tomas Kukosa:
Make it possible to sort LocalCode value_strings.

svn path=/trunk/; revision=48720
2013-04-03 16:52:56 +00:00
Anders Broman 7ddf39a340 Dissect more of 3GPP Object.
svn path=/trunk/; revision=48719
2013-04-03 16:50:35 +00:00
Anders Broman c534f5e0db - Extend and correct value strings.
- Fix tree handling for QoS.
- Add references.

svn path=/trunk/; revision=48718
2013-04-03 16:49:55 +00:00
Guy Harris 88324c19ea Add a bunch of casts to squelch -Wc++-compat warnings.
Don't assume that enum nl80211_channel_type and enum
ws80211_channel_type happen to have matching values, map between them,
and always assign the right enum value to the right type.  This is safer
(yes, they do happen to have matching values, but it's not very clean to
assume that), and also eliminates some -Wc++-compat warnings.

svn path=/trunk/; revision=48717
2013-04-03 08:10:55 +00:00
Guy Harris b6ee206d2f Distribute CMakeLists.txt.
svn path=/trunk/; revision=48716
2013-04-03 07:38:44 +00:00
Guy Harris e4271a94fc OK, if we're setting the file path for the window - which we want to do,
at least on OS X, to set the "proxy icon" - we need to clear the window
title *and* the file path before we set it, otherwise the set doesn't
happen.

While we're at it, clear the file path whenever we're *not* using a
path.  For temporary files, don't set the file path.

The file path is, in fact, the *full path*, not just the last component.

svn path=/trunk/; revision=48715
2013-04-02 22:10:16 +00:00
Pascal Quantin a9833c921f Use extended value strings
svn path=/trunk/; revision=48714
2013-04-02 21:56:40 +00:00
Pascal Quantin f28a077f97 Update E.164 dissection to ITU Operational Bulletin No. 991
svn path=/trunk/; revision=48711
2013-04-02 21:16:32 +00:00
Chris Maynard ee5c5e9361 Both tvb_length_remaining and tvb_reported_length_remaining can return -1.
#BACKPORT(1.6,1.8 ... manually as other occurrences are in those trunks)

svn path=/trunk/; revision=48710
2013-04-02 21:13:02 +00:00
Guy Harris 432e914dbd Rename cf_not_saved() to cf_has_unsaved_data() to clarify what it
indicates.  (Note: "unsaved data" is more than just "unsaved changes";
it could also mean "temporary file that hasn't been saved anywhere".)

svn path=/trunk/; revision=48709
2013-04-02 20:35:46 +00:00
Guy Harris f32a839bb0 Handle the case of there being no comment view.
svn path=/trunk/; revision=48708
2013-04-02 20:19:54 +00:00
Guy Harris 019cc8fbd2 Show the comment area only if we could write out the comments were the
user to enter any.

svn path=/trunk/; revision=48707
2013-04-02 20:01:10 +00:00
Martin Kaiser 33314c8106 use proto_mpeg_descriptor_loop_dissect() for the EIT
svn path=/trunk/; revision=48706
2013-04-02 19:04:25 +00:00
Martin Kaiser 9bdb946964 use proto_mpeg_descriptor_loop_dissect() in the BAT
svn path=/trunk/; revision=48705
2013-04-02 19:03:05 +00:00
Martin Kaiser c851bd97f1 use proto_mpeg_descriptor_loop_dissect() for the PMT
svn path=/trunk/; revision=48704
2013-04-02 19:01:14 +00:00
Martin Kaiser 99c490d375 use proto_mpeg_descriptor_loop_dissect() for the TOT
svn path=/trunk/; revision=48703
2013-04-02 19:00:09 +00:00
Jeff Morriss ba0b025dd3 Include padding length in the AVP's length.
svn path=/trunk/; revision=48702
2013-04-02 18:15:42 +00:00
Guy Harris 71c751f3c1 An explicit cast that was missing; at least some version of GCC
complains about its absence with -Wc++-compat.

svn path=/trunk/; revision=48701
2013-04-02 17:05:50 +00:00
Anders Broman a9045908df Dissect more 3GPP2 extensions.
svn path=/trunk/; revision=48700
2013-04-02 16:58:18 +00:00
Guy Harris 3fd4767110 Only enable Edit->Packet Comment... if we can save the file without
losing the packet comments, just as we now do in the GTK+ version.

svn path=/trunk/; revision=48699
2013-04-02 16:05:25 +00:00
Evan Huus 0a26433321 From Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8461
Enhancements for the Honeypot Feeds dissector.

From me: misc. cleanup, modelines, etc.

svn path=/trunk/; revision=48698
2013-04-02 15:55:35 +00:00
Pascal Quantin e832253278 From Vineeth via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8450 :
Do not try to systematically fetch a third digit for Country Code: its length can be from 1 to 3 digits.

svn path=/trunk/; revision=48697
2013-04-02 13:09:15 +00:00