obnox/wireshark/wip.git
8 years agoAs suggested by Anders: back out 37112.
morriss [Fri, 13 May 2011 14:21:58 +0000 (14:21 +0000)]
As suggested by Anders: back out 37112.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37123 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a copy/paste error.
tuexen [Fri, 13 May 2011 13:04:13 +0000 (13:04 +0000)]
Fix a copy/paste error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37122 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSimplified string handling in packets_bar_update to use GString.
stig [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37121 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGet -L and -d working with multiple interface. Internally get some functions
tuexen [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37120 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdded COPYING.txt to svn:ignore.
stig [Fri, 13 May 2011 08:17:15 +0000 (08:17 +0000)]
Added COPYING.txt to svn:ignore.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37119 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRegenerate ASN.1 dissectors to update the #line directive.
stig [Fri, 13 May 2011 08:12:27 +0000 (08:12 +0000)]
Regenerate ASN.1 dissectors to update the #line directive.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37118 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBuild with S1AP-SonTransfer-IEs.asn
stig [Fri, 13 May 2011 07:51:27 +0000 (07:51 +0000)]
Build with S1AP-SonTransfer-IEs.asn

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37117 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThat's *application*/vnd.tcpdump.pcap to you.
guy [Fri, 13 May 2011 06:55:11 +0000 (06:55 +0000)]
That's *application*/vnd.tcpdump.pcap to you.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37116 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPcap files now have an official MIME type.
guy [Fri, 13 May 2011 06:23:58 +0000 (06:23 +0000)]
Pcap files now have an official MIME type.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37115 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPcap files now have an official MIME type.
guy [Fri, 13 May 2011 06:11:19 +0000 (06:11 +0000)]
Pcap files now have an official MIME type.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37114 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the same default value for the snaplen in the new array as in the
tuexen [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37113 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWe should get rid of g_mem_chunk_alloc() as it leaks memory
etxrab [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37112 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a comment what needs to be changed when adopting wireshark and tshark.
tuexen [Fri, 13 May 2011 05:14:00 +0000 (05:14 +0000)]
Add a comment what needs to be changed when adopting wireshark and tshark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37111 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37110 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAllocate wslua_plugin_list even if we do not HAVE_PLUGINS
morriss [Fri, 13 May 2011 00:34:31 +0000 (00:34 +0000)]
Allocate wslua_plugin_list even if we do not HAVE_PLUGINS

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37109 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTry to fix distcheck.
gerald [Fri, 13 May 2011 00:29:10 +0000 (00:29 +0000)]
Try to fix distcheck.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37108 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore OS X installer fixes and tweaks.
gerald [Thu, 12 May 2011 23:46:31 +0000 (23:46 +0000)]
More OS X installer fixes and tweaks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37107 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAnother attempt to fix the OS X .dmg builds.
gerald [Thu, 12 May 2011 22:51:10 +0000 (22:51 +0000)]
Another attempt to fix the OS X .dmg builds.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37106 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix the OS X packaging build.
gerald [Thu, 12 May 2011 21:42:55 +0000 (21:42 +0000)]
Fix the OS X packaging build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37105 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37104 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPlay catch up with recent configure.in changes:
jmayer [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 ..."

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37103 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
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.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37102 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWe need both gthread and gmodule.
morriss [Thu, 12 May 2011 20:35:13 +0000 (20:35 +0000)]
We need both gthread and gmodule.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37101 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. I
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37100 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPacket editor: support for saving changed frames.
darkjames [Thu, 12 May 2011 19:47:49 +0000 (19:47 +0000)]
Packet editor: support for saving changed frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37099 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd support for multiple interfaces when processing the -L option.
tuexen [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37098 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse rcode instead of repeated uses of "flags & F_RCODE". One change submitted
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37097 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove "--version ..." to see if it fixes the builds.
gerald [Thu, 12 May 2011 19:09:53 +0000 (19:09 +0000)]
Remove "--version ..." to see if it fixes the builds.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37096 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoInitialize the glib thread system on all platforms, not only on Windows.
tuexen [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37095 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd some more details (name of the interface and number of captured packets)
tuexen [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37094 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSwitch to an installer package for OS X instead of a draggable app
gerald [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37093 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago"tshark -D" writes to stderr now.
gerald [Thu, 12 May 2011 17:49:15 +0000 (17:49 +0000)]
"tshark -D" writes to stderr now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37092 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWANT_PACKET_EDITOR fixups for Windows.
cmaynard [Thu, 12 May 2011 17:46:54 +0000 (17:46 +0000)]
WANT_PACKET_EDITOR fixups for Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37091 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd snai, mpf and efi to bf_tree, not tree. Fixes Coverity CID 1045.
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37090 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWrap assoc_tree within #if 0 ... #endif. Fixes Coverity CID 1049.
cmaynard [Thu, 12 May 2011 17:25:43 +0000 (17:25 +0000)]
Wrap assoc_tree within #if 0 ... #endif.  Fixes Coverity CID 1049.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37089 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd token to query_tree instead of to tree. Fixes Coverity CID 1057.
cmaynard [Thu, 12 May 2011 17:23:38 +0000 (17:23 +0000)]
Add token to query_tree instead of to tree.  Fixes Coverity CID 1057.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37088 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDelete eth_addr; it was assigned a value but never used. Fixes Coverity 1070.
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37087 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse nonce_2_item instead of incorrect nonce_1_item. Fixes Coverity CID 1071.
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37086 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDelete acm as it is assigned but never used. Fixes Coverity 1072.
cmaynard [Thu, 12 May 2011 17:16:45 +0000 (17:16 +0000)]
Delete acm as it is assigned but never used.  Fixes Coverity 1072.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37085 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoConditional support for packet-editor [default=no].
darkjames [Thu, 12 May 2011 17:14:59 +0000 (17:14 +0000)]
Conditional support for packet-editor [default=no].

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37084 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd text to fac_subtree instead of fac_tree. Fixes Coverity CID 1129.
cmaynard [Thu, 12 May 2011 17:14:36 +0000 (17:14 +0000)]
Add text to fac_subtree instead of fac_tree.  Fixes Coverity CID 1129.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37083 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd support for handling multiple interfaces as command line
tuexen [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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37082 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix double free.
darkjames [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 ;-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37081 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove check_col, use ENC_BIG_ENDIAN.
etxrab [Thu, 12 May 2011 15:48:51 +0000 (15:48 +0000)]
Remove check_col, use ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37080 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCopy-paste error.
etxrab [Thu, 12 May 2011 15:40:32 +0000 (15:40 +0000)]
Copy-paste error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37079 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoConvetr more menus to GUIManager.
etxrab [Thu, 12 May 2011 15:17:28 +0000 (15:17 +0000)]
Convetr more menus to GUIManager.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37078 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoInclude config.h (for WS_MSVC_NORETURN) and g_gnuc.h (for G_GNUC_NORETURN)
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)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37077 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAnother whitespace cleanup.
tuexen [Thu, 12 May 2011 12:06:19 +0000 (12:06 +0000)]
Another whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37076 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCorrected endif.
stig [Thu, 12 May 2011 11:17:22 +0000 (11:17 +0000)]
Corrected endif.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37075 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIndicate Signed Receipt in info column.
stig [Thu, 12 May 2011 11:06:42 +0000 (11:06 +0000)]
Indicate Signed Receipt in info column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37074 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoClean up some indentation. A purely whitespace change.
tuexen [Thu, 12 May 2011 10:58:14 +0000 (10:58 +0000)]
Clean up some indentation. A purely whitespace change.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37073 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake the use of UIManager a configure option.
etxrab [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37072 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPrefix "fragments" with IPv6, as is done with IPv4.
stig [Thu, 12 May 2011 10:27:30 +0000 (10:27 +0000)]
Prefix "fragments" with IPv6, as is done with IPv4.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37071 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse IPv4 as protocol name, to align with IPv6.
stig [Thu, 12 May 2011 10:27:02 +0000 (10:27 +0000)]
Use IPv4 as protocol name, to align with IPv6.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37070 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org...
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37069 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCheck our original record length. Fixes a crash bug found by Huzaifa
gerald [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37068 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWhen performing heuristics, use tvb_length() instead of tvb_reported_length().
cmaynard [Wed, 11 May 2011 20:40:14 +0000 (20:40 +0000)]
When performing heuristics, use tvb_length() instead of tvb_reported_length().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37067 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse a comparison instead of an assignment. Fixes Coverity CID 1194.
gerald [Wed, 11 May 2011 20:39:11 +0000 (20:39 +0000)]
Use a comparison instead of an assignment. Fixes Coverity CID 1194.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37066 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove some unused variable assignments. Fixes Coverity CID 1202.
gerald [Wed, 11 May 2011 20:35:57 +0000 (20:35 +0000)]
Remove some unused variable assignments. Fixes Coverity CID 1202.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37065 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd Tyson Key;
wmeier [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".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37064 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago#include <string.h> not req'd;
wmeier [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37063 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd packet-usb-at.c;
wmeier [Wed, 11 May 2011 13:31:41 +0000 (13:31 +0000)]
Add packet-usb-at.c;
Also: put a few entries in alphabetical order.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37062 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a wrong name in a debug print statement.
tuexen [Wed, 11 May 2011 12:51:01 +0000 (12:51 +0000)]
Fix a wrong name in a debug print statement.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37061 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSupport multiple Scheduling Requests in one PDU.
martinm [Wed, 11 May 2011 11:10:30 +0000 (11:10 +0000)]
Support multiple Scheduling Requests in one PDU.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37060 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoExport wtap_fstat()
kukosa [Wed, 11 May 2011 07:31:18 +0000 (07:31 +0000)]
Export wtap_fstat()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37059 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37058 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse consistent casing in hf_ descriptions and expert infos.
morriss [Wed, 11 May 2011 01:39:10 +0000 (01:39 +0000)]
Use consistent casing in hf_ descriptions and expert infos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37057 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37056 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEliminate redundant blurbs
morriss [Wed, 11 May 2011 01:06:37 +0000 (01:06 +0000)]
Eliminate redundant blurbs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37055 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agofile_read() can return -1; don't just blindly add it to a previous
guy [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37054 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agofile_read() can return -1; don't just blindly add it to a previous
guy [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37053 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Olivier Crete via bug 5761: Compute the FCI size correctly for RTCP RTPFB.
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37052 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd missing line of code: Fixes Coverity 1042 (UNUSED);
wmeier [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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37051 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove some unneeded lines of code: Coverity 1063;
wmeier [Tue, 10 May 2011 17:44:36 +0000 (17:44 +0000)]
Remove some unneeded lines of code: Coverity 1063;
Also: remonve someunneeded #includes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37050 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd support for USB CDC Ethernet. Resolves bug 4819.
cmaynard [Tue, 10 May 2011 17:40:29 +0000 (17:40 +0000)]
Add support for USB CDC Ethernet.  Resolves bug 4819.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37049 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to unused variable: Coverity 1068 & 1069.
wmeier [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37048 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove unused variable to avoid a warning which breaks the build.
tuexen [Tue, 10 May 2011 17:25:45 +0000 (17:25 +0000)]
Remove unused variable to avoid a warning which breaks the build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37047 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd subversion Id and Wireshark copyright.
cmaynard [Tue, 10 May 2011 17:06:20 +0000 (17:06 +0000)]
Add subversion Id and Wireshark copyright.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37046 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd USB/AT dissector, submitted by Tyson Key via bug 5868 with some
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37045 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake sure we set a variable.
gerald [Tue, 10 May 2011 16:05:14 +0000 (16:05 +0000)]
Make sure we set a variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37044 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix two cases of dead code reported by Coverity as CID 376.
cmaynard [Tue, 10 May 2011 16:02:54 +0000 (16:02 +0000)]
Fix two cases of dead code reported by Coverity as CID 376.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37043 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix two cases of comparisons begin made against incorrect values following a
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37042 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoOn behalf of Ericsson update the A11 dissector.
etxrab [Tue, 10 May 2011 15:20:09 +0000 (15:20 +0000)]
On behalf of Ericsson update the A11 dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37041 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWhen closing capture file, set number of frames to 0. It fix bug #5903.
darkjames [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37040 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAllow both PPP and ISO/IEC 13818-1 over USB to be dissected using heuristics.
cmaynard [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37039 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Sijin N K:
etxrab [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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37038 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a typo.
etxrab [Tue, 10 May 2011 07:23:00 +0000 (07:23 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37037 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoForgot to comment out UI_MANAGER
etxrab [Tue, 10 May 2011 06:03:56 +0000 (06:03 +0000)]
Forgot to comment out UI_MANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37036 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore GUIManager stuff.
etxrab [Tue, 10 May 2011 05:31:45 +0000 (05:31 +0000)]
More GUIManager stuff.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37035 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWe probably shouldn't call pcap-ng "experimental" any more.
gerald [Mon, 9 May 2011 19:29:40 +0000 (19:29 +0000)]
We probably shouldn't call pcap-ng "experimental" any more.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37033 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoNote that compressed Windows Sniffer files might have a CRC, just not
guy [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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37032 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd sl_ API to libwireshark.def
darkjames [Mon, 9 May 2011 12:59:57 +0000 (12:59 +0000)]
Add sl_ API to libwireshark.def

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37031 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoConvert SLAB_-s, to sl_-API.
darkjames [Mon, 9 May 2011 12:52:55 +0000 (12:52 +0000)]
Convert SLAB_-s, to sl_-API.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37030 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoComment out dead code.
darkjames [Mon, 9 May 2011 12:49:39 +0000 (12:49 +0000)]
Comment out dead code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37029 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSkipp tango.xml for now...as not having it causes a warning.
etxrab [Mon, 9 May 2011 09:05:35 +0000 (09:05 +0000)]
Skipp tango.xml for now...as not having it causes a warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37028 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoInitial commit of slab allocator (sl_* API)
darkjames [Mon, 9 May 2011 08:55:35 +0000 (08:55 +0000)]
Initial commit of slab allocator (sl_* API)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37027 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGet rid of the fd member of a wth structure; the FILE_T's in that
guy [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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37026 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki: for file read progress bars, use the raw offset in
guy [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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37025 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf a gzipped file's name ends in .caz, don't check the CRC - it's
guy [Mon, 9 May 2011 03:48:41 +0000 (03:48 +0000)]
If a gzipped file's name ends in .caz, don't check the CRC - it's
probably a compressed file from the Windows Sniffer, and they don't
bother setting the CRC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37024 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSupport SMB_FIND_FILE_UNIX_INFO2.
guy [Mon, 9 May 2011 02:55:31 +0000 (02:55 +0000)]
Support SMB_FIND_FILE_UNIX_INFO2.

Don't use "link destination" for file names in SMB_FIND_FILE_UNIX.

Link to the page for Microsoft's public protocol specifications and to
the Samba Wiki page for the UNIX extensions.

Fix a typo in a variable name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37023 f5534014-38df-0310-8fa8-9805f1628bb7