Bill Meier [Fri, 13 May 2011 15:39:43 +0000 (15:39 -0000)]
(Trivial) fix a spelling error.
svn path=/trunk/; revision=37126
Jeff Morriss [Fri, 13 May 2011 15:07:54 +0000 (15:07 -0000)]
Make it work when we have plugins
svn path=/trunk/; revision=37125
Jeff Morriss [Fri, 13 May 2011 15:04:40 +0000 (15:04 -0000)]
Don't try to export the plugin symbols if we're not building with plugins.
svn path=/trunk/; revision=37124
Jeff Morriss [Fri, 13 May 2011 14:21:58 +0000 (14:21 -0000)]
As suggested by Anders: back out 37112.
svn path=/trunk/; revision=37123
Michael Tüxen [Fri, 13 May 2011 13:04:13 +0000 (13:04 -0000)]
Fix a copy/paste error.
svn path=/trunk/; revision=37122
Stig Bjørlykke [Fri, 13 May 2011 11:50:33 +0000 (11:50 -0000)]
Simplified string handling in packets_bar_update to use GString.
This allows both Dropped and Ignored count, combined with Load time.
svn path=/trunk/; revision=37121
Michael Tüxen [Fri, 13 May 2011 11:28:51 +0000 (11:28 -0000)]
Get -L and -d working with multiple interface. Internally get some functions
using the array of interface data.
Improve output of -L by printing the interface name.
svn path=/trunk/; revision=37120
Stig Bjørlykke [Fri, 13 May 2011 08:12:27 +0000 (08:12 -0000)]
Regenerate ASN.1 dissectors to update the #line directive.
svn path=/trunk/; revision=37118
Stig Bjørlykke [Fri, 13 May 2011 07:51:27 +0000 (07:51 -0000)]
Build with S1AP-SonTransfer-IEs.asn
svn path=/trunk/; revision=37117
Guy Harris [Fri, 13 May 2011 06:55:11 +0000 (06:55 -0000)]
That's *application*/vnd.tcpdump.pcap to you.
svn path=/trunk/; revision=37116
Guy Harris [Fri, 13 May 2011 06:23:58 +0000 (06:23 -0000)]
Pcap files now have an official MIME type.
svn path=/trunk/; revision=37115
Guy Harris [Fri, 13 May 2011 06:11:19 +0000 (06:11 -0000)]
Pcap files now have an official MIME type.
svn path=/trunk/; revision=37114
Michael Tüxen [Fri, 13 May 2011 06:04:28 +0000 (06:04 -0000)]
Use the same default value for the snaplen in the new array as in the
old way.
svn path=/trunk/; revision=37113
Anders Broman [Fri, 13 May 2011 05:19:23 +0000 (05:19 -0000)]
We should get rid of g_mem_chunk_alloc() as it leaks memory
http://www.wireshark.org/lists/wireshark-dev/200910/msg00074.html
g_slice allocing the keys should make it possible to walk the
fragment table and free the fragments once they are g_slice_alloced.
It remains fo figure out how to do that.
svn path=/trunk/; revision=37112
Michael Tüxen [Fri, 13 May 2011 05:14:00 +0000 (05:14 -0000)]
Add a comment what needs to be changed when adopting wireshark and tshark.
svn path=/trunk/; revision=37111
Jeff Morriss [Fri, 13 May 2011 02:48:08 +0000 (02:48 -0000)]
From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
1. Reload framing protocol no longer encapsulates the Reload message, instead
the latter is in its own tree following Reload framing, much like IP, UDP, etc.
2. Similarly, DTLS no longer encapsulates its data payload if the payload can
be dissected. The recognized payload is in its own tree following the DTLS,
much like IP, UDP, etc.
4. DTLS now has its own heuristic table for dissecting its payload, and
reload-framing is added to this DTLS heuristic table.
6. DTLS will try to dissect its payload if the agreed upon cipher is
RSA-NULL-MD5 (0x0001) or RSA-NULL-SHA (0x0002), even when DTLS is not
configured with the client/server private keys.
Still to do: make DTLS a heuristic dissector on top of UDP (item 3 in the bug).
svn path=/trunk/; revision=37110
Jeff Morriss [Fri, 13 May 2011 00:34:31 +0000 (00:34 -0000)]
Allocate wslua_plugin_list even if we do not HAVE_PLUGINS
svn path=/trunk/; revision=37109
Gerald Combs [Fri, 13 May 2011 00:29:10 +0000 (00:29 -0000)]
Try to fix distcheck.
svn path=/trunk/; revision=37108
Gerald Combs [Thu, 12 May 2011 23:46:31 +0000 (23:46 -0000)]
More OS X installer fixes and tweaks.
svn path=/trunk/; revision=37107
Gerald Combs [Thu, 12 May 2011 22:51:10 +0000 (22:51 -0000)]
Another attempt to fix the OS X .dmg builds.
svn path=/trunk/; revision=37106
Gerald Combs [Thu, 12 May 2011 21:42:55 +0000 (21:42 -0000)]
Fix the OS X packaging build.
svn path=/trunk/; revision=37105
Jeff Morriss [Thu, 12 May 2011 21:37:55 +0000 (21:37 -0000)]
From Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
I have created a dissector for the Multiple MAC Registration Protocol based on
the exiting dissector of the Multiple Stream Reservation Protocol (bugzilla id:
4757 ) You can found the documentation of the Protocol here:
http://standards.ieee.org/getieee802/download/802.1ak-2007.pdf It's also
includes the corrections of the protocol you will found here:
http://standards.ieee.org/getieee802/download/802.1Q-2005_Cor1-2008.pdf
svn path=/trunk/; revision=37104
Jörg Mayer [Thu, 12 May 2011 21:13:00 +0000 (21:13 -0000)]
Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."
svn path=/trunk/; revision=37103
Jeff Morriss [Thu, 12 May 2011 20:51:53 +0000 (20:51 -0000)]
From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT. (The
former can be built using libnettle instead of the latter.)
svn path=/trunk/; revision=37102
Jeff Morriss [Thu, 12 May 2011 20:35:13 +0000 (20:35 -0000)]
We need both gthread and gmodule.
svn path=/trunk/; revision=37101
Chris Maynard [Thu, 12 May 2011 20:32:28 +0000 (20:32 -0000)]
From Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. I
committed a variation of his patch that deleted unused variables rather than
#if 0'ing them out, and I also kept dissect_dnp3_al()'s return values, even if
it's not currently being checked, just in case the commented code is ever
uncommented and the return value ends up being checked later on. Lastly, I
also added what appeared to be some missing DNP3_AL_UNS's.
svn path=/trunk/; revision=37100
Jakub Zawadzki [Thu, 12 May 2011 19:47:49 +0000 (19:47 -0000)]
Packet editor: support for saving changed frames.
svn path=/trunk/; revision=37099
Michael Tüxen [Thu, 12 May 2011 19:25:44 +0000 (19:25 -0000)]
Add support for multiple interfaces when processing the -L option.
This is based on work of Irene Ruengeler.
svn path=/trunk/; revision=37098
Chris Maynard [Thu, 12 May 2011 19:24:55 +0000 (19:24 -0000)]
Use rcode instead of repeated uses of "flags & F_RCODE". One change submitted
from Yaniv Kaul via bug 5858; the other 2 from me.
svn path=/trunk/; revision=37097
Gerald Combs [Thu, 12 May 2011 19:09:53 +0000 (19:09 -0000)]
Remove "--version ..." to see if it fixes the builds.
svn path=/trunk/; revision=37096
Michael Tüxen [Thu, 12 May 2011 18:55:24 +0000 (18:55 -0000)]
Initialize the glib thread system on all platforms, not only on Windows.
This requires to be linked against a different library. This is only
required for dumpcap, but the configure files currently doesn't check
this in a target specific way. So use these libs for all binaries.
svn path=/trunk/; revision=37095
Michael Tüxen [Thu, 12 May 2011 18:03:04 +0000 (18:03 -0000)]
Add some more details (name of the interface and number of captured packets)
to the message showed when dumpcap is finishing.
This patch is the first one of a series which will add support for
capturing on multiple interfaces to dumpcap.
This patch is based on work of Irene Ruengeler.
svn path=/trunk/; revision=37094
Gerald Combs [Thu, 12 May 2011 18:02:00 +0000 (18:02 -0000)]
Switch to an installer package for OS X instead of a draggable app
bundle. There are still a few rough edges but it's an improvement over
what we currently have. Fixes bug 5756.
svn path=/trunk/; revision=37093
Gerald Combs [Thu, 12 May 2011 17:49:15 +0000 (17:49 -0000)]
"tshark -D" writes to stderr now.
svn path=/trunk/; revision=37092
Chris Maynard [Thu, 12 May 2011 17:46:54 +0000 (17:46 -0000)]
WANT_PACKET_EDITOR fixups for Windows.
svn path=/trunk/; revision=37091
Chris Maynard [Thu, 12 May 2011 17:26:54 +0000 (17:26 -0000)]
Add snai, mpf and efi to bf_tree, not tree. Fixes Coverity CID 1045.
svn path=/trunk/; revision=37090
Chris Maynard [Thu, 12 May 2011 17:25:43 +0000 (17:25 -0000)]
Wrap assoc_tree within #if 0 ... #endif. Fixes Coverity CID 1049.
svn path=/trunk/; revision=37089
Chris Maynard [Thu, 12 May 2011 17:23:38 +0000 (17:23 -0000)]
Add token to query_tree instead of to tree. Fixes Coverity CID 1057.
svn path=/trunk/; revision=37088
Chris Maynard [Thu, 12 May 2011 17:21:49 +0000 (17:21 -0000)]
Delete eth_addr; it was assigned a value but never used. Fixes Coverity 1070.
svn path=/trunk/; revision=37087
Chris Maynard [Thu, 12 May 2011 17:19:10 +0000 (17:19 -0000)]
Use nonce_2_item instead of incorrect nonce_1_item. Fixes Coverity CID 1071.
svn path=/trunk/; revision=37086
Chris Maynard [Thu, 12 May 2011 17:16:45 +0000 (17:16 -0000)]
Delete acm as it is assigned but never used. Fixes Coverity 1072.
svn path=/trunk/; revision=37085
Jakub Zawadzki [Thu, 12 May 2011 17:14:59 +0000 (17:14 -0000)]
Conditional support for packet-editor [default=no].
svn path=/trunk/; revision=37084
Chris Maynard [Thu, 12 May 2011 17:14:36 +0000 (17:14 -0000)]
Add text to fac_subtree instead of fac_tree. Fixes Coverity CID 1129.
svn path=/trunk/; revision=37083
Michael Tüxen [Thu, 12 May 2011 16:54:16 +0000 (16:54 -0000)]
Add support for handling multiple interfaces as command line
parameters. An array of interface specific data is handled
in addition to the current way.
This change should not have any effect right now, it will
be used by dumpcap when supporting multiple interfaces
(and tshark/wireshark... in the future).
svn path=/trunk/; revision=37082
Jakub Zawadzki [Thu, 12 May 2011 16:31:42 +0000 (16:31 -0000)]
Fix double free.
compr is also freed outside loop. So free it only when returning.
Might be related with bug #5908, but I don't have access to that bug ;-)
svn path=/trunk/; revision=37081
Anders Broman [Thu, 12 May 2011 15:48:51 +0000 (15:48 -0000)]
Remove check_col, use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37080
Anders Broman [Thu, 12 May 2011 15:40:32 +0000 (15:40 -0000)]
Copy-paste error.
svn path=/trunk/; revision=37079
Anders Broman [Thu, 12 May 2011 15:17:28 +0000 (15:17 -0000)]
Convetr more menus to GUIManager.
svn path=/trunk/; revision=37078
Jeff Morriss [Thu, 12 May 2011 13:50:44 +0000 (13:50 -0000)]
Include config.h (for WS_MSVC_NORETURN) and g_gnuc.h (for G_GNUC_NORETURN)
svn path=/trunk/; revision=37077
Michael Tüxen [Thu, 12 May 2011 12:06:19 +0000 (12:06 -0000)]
Another whitespace cleanup.
svn path=/trunk/; revision=37076
Stig Bjørlykke [Thu, 12 May 2011 11:17:22 +0000 (11:17 -0000)]
Corrected endif.
svn path=/trunk/; revision=37075
Stig Bjørlykke [Thu, 12 May 2011 11:06:42 +0000 (11:06 -0000)]
Indicate Signed Receipt in info column.
svn path=/trunk/; revision=37074
Michael Tüxen [Thu, 12 May 2011 10:58:14 +0000 (10:58 -0000)]
Clean up some indentation. A purely whitespace change.
svn path=/trunk/; revision=37073
Anders Broman [Thu, 12 May 2011 10:56:26 +0000 (10:56 -0000)]
Make the use of UIManager a configure option.
NOTE Only for Windows.
Additional moves to UIManager.
svn path=/trunk/; revision=37072
Stig Bjørlykke [Thu, 12 May 2011 10:27:30 +0000 (10:27 -0000)]
Prefix "fragments" with IPv6, as is done with IPv4.
svn path=/trunk/; revision=37071
Stig Bjørlykke [Thu, 12 May 2011 10:27:02 +0000 (10:27 -0000)]
Use IPv4 as protocol name, to align with IPv6.
svn path=/trunk/; revision=37070
Jeff Morriss [Thu, 12 May 2011 03:18:34 +0000 (03:18 -0000)]
Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :
Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.
Use this new flag in the dissectors which register taps.
Remove the (now-unused) have_tap_listeners() function.
svn path=/trunk/; revision=37069
Gerald Combs [Wed, 11 May 2011 22:36:59 +0000 (22:36 -0000)]
Check our original record length. Fixes a crash bug found by Huzaifa
Sidhpurwala of the Red Hat Security Response Team.
svn path=/trunk/; revision=37068
Chris Maynard [Wed, 11 May 2011 20:40:14 +0000 (20:40 -0000)]
When performing heuristics, use tvb_length() instead of tvb_reported_length().
svn path=/trunk/; revision=37067
Gerald Combs [Wed, 11 May 2011 20:39:11 +0000 (20:39 -0000)]
Use a comparison instead of an assignment. Fixes Coverity CID 1194.
svn path=/trunk/; revision=37066
Gerald Combs [Wed, 11 May 2011 20:35:57 +0000 (20:35 -0000)]
Remove some unused variable assignments. Fixes Coverity CID 1202.
svn path=/trunk/; revision=37065
Bill Meier [Wed, 11 May 2011 13:58:35 +0000 (13:58 -0000)]
Add Tyson Key;
Fix spacing for a few entries;
Add back missing blank line before "and by".
svn path=/trunk/; revision=37064
Bill Meier [Wed, 11 May 2011 13:36:17 +0000 (13:36 -0000)]
#include <string.h> not req'd;
Move proto_reg_handoff...() to the end of the file as per the usual convention.
svn path=/trunk/; revision=37063
Bill Meier [Wed, 11 May 2011 13:31:41 +0000 (13:31 -0000)]
Add packet-usb-at.c;
Also: put a few entries in alphabetical order.
svn path=/trunk/; revision=37062
Michael Tüxen [Wed, 11 May 2011 12:51:01 +0000 (12:51 -0000)]
Fix a wrong name in a debug print statement.
svn path=/trunk/; revision=37061
Martin Mathieson [Wed, 11 May 2011 11:10:30 +0000 (11:10 -0000)]
Support multiple Scheduling Requests in one PDU.
svn path=/trunk/; revision=37060
Tomas Kukosa [Wed, 11 May 2011 07:31:18 +0000 (07:31 -0000)]
Export wtap_fstat()
svn path=/trunk/; revision=37059
Jeff Morriss [Wed, 11 May 2011 02:06:22 +0000 (02:06 -0000)]
From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
5. A guaranteed null pointer access violation is fixed in packet-ssl-utils.c
when DTLS succeeded in dissecting its payload.
svn path=/trunk/; revision=37058
Jeff Morriss [Wed, 11 May 2011 01:39:10 +0000 (01:39 -0000)]
Use consistent casing in hf_ descriptions and expert infos.
svn path=/trunk/; revision=37057
Jeff Morriss [Wed, 11 May 2011 01:11:50 +0000 (01:11 -0000)]
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
- Put back the hf_ variables removed from the last patch
- Change the verbose protocol name to the (now) official spelling "VLAN
Trunking Protocol" instead of "Virtual Trunk Protocol"
- Made the "Info" column more informative by placing the message type and
selected key information into it, instead of just the verbose protocol name
- Corrected an error in the handling of the Advert-Request message where the
Management Domain Name field was not parsed properly, resulting in wrong
parsing of the remainder of the entire Advert-Request message
svn path=/trunk/; revision=37056
Jeff Morriss [Wed, 11 May 2011 01:06:37 +0000 (01:06 -0000)]
Eliminate redundant blurbs
svn path=/trunk/; revision=37055
Guy Harris [Tue, 10 May 2011 21:53:10 +0000 (21:53 -0000)]
file_read() can return -1; don't just blindly add it to a previous
file_read() return value. Use wtap_file_read_expected_bytes() in a
number of places.
svn path=/trunk/; revision=37054
Guy Harris [Tue, 10 May 2011 20:17:31 +0000 (20:17 -0000)]
file_read() can return -1; don't just blindly add it to a previous
file_read() return value. Use wtap_file_read_expected_bytes() in a
number of places.
svn path=/trunk/; revision=37053
Chris Maynard [Tue, 10 May 2011 18:52:37 +0000 (18:52 -0000)]
From Olivier Crete via bug 5761: Compute the FCI size correctly for RTCP RTPFB.
svn path=/trunk/; revision=37052
Bill Meier [Tue, 10 May 2011 18:43:40 +0000 (18:43 -0000)]
Add missing line of code: Fixes Coverity 1042 (UNUSED);
Remove unneeded lines of code: Coverity 1043 (UNUSED).
svn path=/trunk/; revision=37051
Bill Meier [Tue, 10 May 2011 17:44:36 +0000 (17:44 -0000)]
Remove some unneeded lines of code: Coverity 1063;
Also: remonve someunneeded #includes.
svn path=/trunk/; revision=37050
Chris Maynard [Tue, 10 May 2011 17:40:29 +0000 (17:40 -0000)]
Add support for USB CDC Ethernet. Resolves bug 4819.
svn path=/trunk/; revision=37049
Bill Meier [Tue, 10 May 2011 17:28:46 +0000 (17:28 -0000)]
Don't assign to unused variable: Coverity 1068 & 1069.
Remove some related no longer needed code and variables;
Also: Fix a typo and reword a comment.
svn path=/trunk/; revision=37048
Michael Tüxen [Tue, 10 May 2011 17:25:45 +0000 (17:25 -0000)]
Remove unused variable to avoid a warning which breaks the build.
svn path=/trunk/; revision=37047
Chris Maynard [Tue, 10 May 2011 17:06:20 +0000 (17:06 -0000)]
Add subversion Id and Wireshark copyright.
svn path=/trunk/; revision=37046
Chris Maynard [Tue, 10 May 2011 17:04:05 +0000 (17:04 -0000)]
Add USB/AT dissector, submitted by Tyson Key via bug 5868 with some
modifications by me as described/documented in the bug report.
svn path=/trunk/; revision=37045
Gerald Combs [Tue, 10 May 2011 16:05:14 +0000 (16:05 -0000)]
Make sure we set a variable.
svn path=/trunk/; revision=37044
Chris Maynard [Tue, 10 May 2011 16:02:54 +0000 (16:02 -0000)]
Fix two cases of dead code reported by Coverity as CID 376.
svn path=/trunk/; revision=37043
Chris Maynard [Tue, 10 May 2011 15:37:06 +0000 (15:37 -0000)]
Fix two cases of comparisons begin made against incorrect values following a
mask operation. Also, initialize g_rohc_info if pinfo->packet_data is !NULL.
Fixes Coverity ID's 1187, 1188 and 1190.
svn path=/trunk/; revision=37042
Anders Broman [Tue, 10 May 2011 15:20:09 +0000 (15:20 -0000)]
On behalf of Ericsson update the A11 dissector.
svn path=/trunk/; revision=37041
Jakub Zawadzki [Tue, 10 May 2011 15:13:46 +0000 (15:13 -0000)]
When closing capture file, set number of frames to 0. It fix bug #5903.
svn path=/trunk/; revision=37040
Chris Maynard [Tue, 10 May 2011 14:22:17 +0000 (14:22 -0000)]
Allow both PPP and ISO/IEC 13818-1 over USB to be dissected using heuristics.
Resolves bug 4814.
svn path=/trunk/; revision=37039
Anders Broman [Tue, 10 May 2011 07:58:33 +0000 (07:58 -0000)]
From Sijin N K:
Missing hf declaration for cn_id.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5901
svn path=/trunk/; revision=37038
Anders Broman [Tue, 10 May 2011 07:23:00 +0000 (07:23 -0000)]
Fix a typo.
svn path=/trunk/; revision=37037
Anders Broman [Tue, 10 May 2011 06:03:56 +0000 (06:03 -0000)]
Forgot to comment out UI_MANAGER
svn path=/trunk/; revision=37036
Anders Broman [Tue, 10 May 2011 05:31:45 +0000 (05:31 -0000)]
More GUIManager stuff.
svn path=/trunk/; revision=37035
Gerald Combs [Mon, 9 May 2011 19:29:40 +0000 (19:29 -0000)]
We probably shouldn't call pcap-ng "experimental" any more.
svn path=/trunk/; revision=37033
Guy Harris [Mon, 9 May 2011 17:53:45 +0000 (17:53 -0000)]
Note that compressed Windows Sniffer files might have a CRC, just not
one computed the right way (as specified by RFC 1952).
svn path=/trunk/; revision=37032
Jakub Zawadzki [Mon, 9 May 2011 12:59:57 +0000 (12:59 -0000)]
Add sl_ API to libwireshark.def
svn path=/trunk/; revision=37031
Jakub Zawadzki [Mon, 9 May 2011 12:52:55 +0000 (12:52 -0000)]
Convert SLAB_-s, to sl_-API.
svn path=/trunk/; revision=37030
Jakub Zawadzki [Mon, 9 May 2011 12:49:39 +0000 (12:49 -0000)]
Comment out dead code.
svn path=/trunk/; revision=37029
Anders Broman [Mon, 9 May 2011 09:05:35 +0000 (09:05 -0000)]
Skipp tango.xml for now...as not having it causes a warning.
svn path=/trunk/; revision=37028
Jakub Zawadzki [Mon, 9 May 2011 08:55:35 +0000 (08:55 -0000)]
Initial commit of slab allocator (sl_* API)
svn path=/trunk/; revision=37027
Guy Harris [Mon, 9 May 2011 08:12:26 +0000 (08:12 -0000)]
Get rid of the fd member of a wth structure; the FILE_T's in that
structure include a file descriptor. Add a wtap_fstat() for the file
readers that use file times to generate time stamps (we really need a
way to say "this file has no time stamps" or "this file has only
relative time stamps).
svn path=/trunk/; revision=37026
Guy Harris [Mon, 9 May 2011 05:30:59 +0000 (05:30 -0000)]
From Jakub Zawadzki: for file read progress bars, use the raw offset in
the file, rather than the offset in the uncompressed data stream. That
way we don't get the "hey, we're more than 100% into the file, better
refigure this" surprise.
svn path=/trunk/; revision=37025