metze/wireshark/wip.git
10 years agoCall mac_lte_drx_control_element_received and make it static again
martinm [Tue, 1 Oct 2013 16:19:42 +0000 (16:19 +0000)]
Call mac_lte_drx_control_element_received and make it static again

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

10 years agoFINALLY remove the check_col API so that reviewers won't have to mention that it...
mmann [Tue, 1 Oct 2013 15:30:22 +0000 (15:30 +0000)]
FINALLY remove the check_col API so that reviewers won't have to mention that it's deprecated.  Now it just won't compile if its included in a dissector.

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

10 years agoRemove check_col.
mmann [Tue, 1 Oct 2013 15:14:59 +0000 (15:14 +0000)]
Remove check_col.

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

10 years agoFrom Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9210 :
pascal [Tue, 1 Oct 2013 14:49:01 +0000 (14:49 +0000)]
From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9210 :
Add 'deflate' to SIP Content-Encoding

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

10 years agoAdd MPS extensions as found on http://compliance.usb.org/mbim/
pascal [Tue, 1 Oct 2013 14:47:03 +0000 (14:47 +0000)]
Add MPS extensions as found on compliance.usb.org/mbim/

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

10 years agoRemove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark...
mmann [Tue, 1 Oct 2013 14:45:03 +0000 (14:45 +0000)]
Remove check_col from generated DCE/RPC dissectors.  Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).

I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.

I will be sending the "PIDL source" (non dissector files) to the samba team.

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

10 years agoAdd cast.
eapache [Tue, 1 Oct 2013 13:09:51 +0000 (13:09 +0000)]
Add cast.

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

10 years agoAdd some additional checks around the radiotap iterator initialization, to fix
eapache [Tue, 1 Oct 2013 13:07:25 +0000 (13:07 +0000)]
Add some additional checks around the radiotap iterator initialization, to fix
the invalid access errors in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212

(also add modelines)

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

10 years agoRemove check_col for all non-generated DCE/RPC dissectors.
mmann [Tue, 1 Oct 2013 13:02:12 +0000 (13:02 +0000)]
Remove check_col for all non-generated DCE/RPC dissectors.

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

10 years agoSort alphabetically the list
pascal [Tue, 1 Oct 2013 07:41:30 +0000 (07:41 +0000)]
Sort alphabetically the list

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

10 years agoPlug MBIM dissector to USB one
pascal [Mon, 30 Sep 2013 20:38:23 +0000 (20:38 +0000)]
Plug MBIM dissector to USB one
With this change and the use of USBPcap, it becomes possible to dissect MBIM messages on Windows 8.1

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

10 years agoFix compilation warnings
pascal [Mon, 30 Sep 2013 20:36:38 +0000 (20:36 +0000)]
Fix compilation warnings

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

10 years agoAdd basic request / response tracking
pascal [Mon, 30 Sep 2013 20:16:58 +0000 (20:16 +0000)]
Add basic request / response tracking

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

10 years agoAdd identification of Windows 8.1 / Windows Server 2012 R2
pascal [Mon, 30 Sep 2013 20:14:42 +0000 (20:14 +0000)]
Add identification of Windows 8.1 / Windows Server 2012 R2

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

10 years agoAdd some expert info. The main reason for doing this was there were a bunch of proto...
mmann [Mon, 30 Sep 2013 18:02:32 +0000 (18:02 +0000)]
Add some expert info.  The main reason for doing this was there were a bunch of proto_tree_add_bytes_format calls that were passing hf_ variables that weren't of type FT_BYTES, and I assume that should lead to a dissector assert/fuzzbot failure.

For consistency all places that "didn't have enough bytes", got an expert message, regardless of whether the upcoming field itself was a FT_BYTES type.

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

10 years agoThe Qt executables shouldn't need any wrappers. Just copy them over
gerald [Mon, 30 Sep 2013 17:33:59 +0000 (17:33 +0000)]
The Qt executables shouldn't need any wrappers. Just copy them over
as-is.

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

10 years agoMake sure we copy Wireshark's libraries to Frameworks. Use top_builddir
gerald [Mon, 30 Sep 2013 17:19:48 +0000 (17:19 +0000)]
Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

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

10 years agoConvert proto_tree_add_int_format calls to proto_tree_add_int_format_value where...
mmann [Mon, 30 Sep 2013 16:10:40 +0000 (16:10 +0000)]
Convert proto_tree_add_int_format calls to proto_tree_add_int_format_value where appropriate.

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

10 years agoConvert proto_tree_add_int64_format calls to proto_tree_add_int64_format_value where...
mmann [Mon, 30 Sep 2013 15:59:27 +0000 (15:59 +0000)]
Convert proto_tree_add_int64_format calls to proto_tree_add_int64_format_value where appropriate.

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

10 years agoConvert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value...
mmann [Mon, 30 Sep 2013 15:52:24 +0000 (15:52 +0000)]
Convert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value where appropriate.

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

10 years agoConvert proto_tree_add_double_format calls to proto_tree_add_double_format_value...
mmann [Mon, 30 Sep 2013 15:42:18 +0000 (15:42 +0000)]
Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate.

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

10 years agoBe a little more verbose.
gerald [Mon, 30 Sep 2013 15:37:11 +0000 (15:37 +0000)]
Be a little more verbose.

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

10 years agoConvert some proto_tree_add_string_format calls to something more appropriate.
mmann [Mon, 30 Sep 2013 15:21:09 +0000 (15:21 +0000)]
Convert some proto_tree_add_string_format calls to something more appropriate.

There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)".  They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of  proto_tree_add_text.

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

10 years agoUse macdeployqt to add the Qt bits to our bundle. Put our libraries in
gerald [Mon, 30 Sep 2013 13:12:28 +0000 (13:12 +0000)]
Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.

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

10 years agoFrom Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160
eapache [Mon, 30 Sep 2013 11:57:14 +0000 (11:57 +0000)]
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160

Extend the BPDU dissector in packet-bpdu.c so that it recognizes and displays
the PVID TLV in Cisco's PVST+/RPVST+ BPDUs.

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

10 years agoMore Qt app bundle migration. Still doesn't work quite right.
gerald [Mon, 30 Sep 2013 11:29:58 +0000 (11:29 +0000)]
More Qt app bundle migration. Still doesn't work quite right.

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

10 years agoStart migrating the OS X app bundle to Qt. This will likely break the
gerald [Mon, 30 Sep 2013 10:20:43 +0000 (10:20 +0000)]
Start migrating the OS X app bundle to Qt. This will likely break the
installers.

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

10 years agoDeep copy needed (clang warning flagged by Alexis!)
martinm [Mon, 30 Sep 2013 10:15:50 +0000 (10:15 +0000)]
Deep copy needed (clang warning flagged by Alexis!)

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 30 Sep 2013 09:03:41 +0000 (09:03 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 30 Sep 2013 09:03:28 +0000 (09:03 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 30 Sep 2013 09:03:16 +0000 (09:03 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 30 Sep 2013 09:03:06 +0000 (09:03 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoFix indent (use 4 spaces)
alagoutte [Mon, 30 Sep 2013 09:02:56 +0000 (09:02 +0000)]
Fix indent (use 4 spaces)

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 30 Sep 2013 09:02:44 +0000 (09:02 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoFix compile when use gzip from make dist-gzip (Missing some images)
alagoutte [Mon, 30 Sep 2013 08:38:00 +0000 (08:38 +0000)]
Fix compile when use gzip from make dist-gzip (Missing some images)

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

10 years agoDon't link qtshark against portaudio
jmayer [Mon, 30 Sep 2013 08:12:46 +0000 (08:12 +0000)]
Don't link qtshark against portaudio

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

10 years agoStrip out references to PortAudio. Qt has its own audio module (Phonon).
gerald [Mon, 30 Sep 2013 07:55:11 +0000 (07:55 +0000)]
Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

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

10 years agoUse array_length macro in two places. Add modelines. Remove trailing whitespace.
eapache [Mon, 30 Sep 2013 00:05:43 +0000 (00:05 +0000)]
Use array_length macro in two places. Add modelines. Remove trailing whitespace.

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

10 years agoFor an EPB, write out an "end of options" option if we write out any
guy [Sun, 29 Sep 2013 22:54:13 +0000 (22:54 +0000)]
For an EPB, write out an "end of options" option if we write out any
other options.

Eliminate duplicate comment.

Fix indentation.

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

10 years agoAdd a MBIM (Mobile Broadband Interface Model) dissector
pascal [Sun, 29 Sep 2013 22:50:27 +0000 (22:50 +0000)]
Add a MBIM (Mobile Broadband Interface Model) dissector
Still to be done:
- fragmentation support
- plug the MBIM dissector on USB dissector

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

10 years agoAs pointed out in bug 9127, tcpdump dissects Juniper Attributes
jmayer [Sun, 29 Sep 2013 22:40:25 +0000 (22:40 +0000)]
As pointed out in bug 9127, tcpdump dissects Juniper Attributes
quite well - reimplement that in Wireshark.

There is room for improvement in this patch, e.g. use subtrees for
the subattributes.

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

10 years agoAdd a routine to return the length of a string option, given the string;
guy [Sun, 29 Sep 2013 22:20:32 +0000 (22:20 +0000)]
Add a routine to return the length of a string option, given the string;
0 means "this option won't be written", and use it when writing pcap-ng
blocks.

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

10 years agoRemove unused variable.
eapache [Sun, 29 Sep 2013 21:06:44 +0000 (21:06 +0000)]
Remove unused variable.

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

10 years agoRename routines that write pcap-ng files to "pcapng_xxx" rather than
guy [Sun, 29 Sep 2013 20:53:13 +0000 (20:53 +0000)]
Rename routines that write pcap-ng files to "pcapng_xxx" rather than
"libpcap_xxx".

Rename the low-level write routine in pcapio.c to write_to_file(), as
it's used for both pcap and pcap-ng files.

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

10 years agoWe always write to a FILE *, so:
guy [Sun, 29 Sep 2013 20:26:25 +0000 (20:26 +0000)]
We always write to a FILE *, so:

make libpcap_write_to_file() static;

don't pass it as an argument to write routines, just have them
call it directly;

make the handle argument a FILE *.

Make the data length argument to libpcap_write_to_file() a size_t, as
that's what, for example, fwrite() takes as a size argument.

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

10 years agoUse a common routine to write out string options.
guy [Sun, 29 Sep 2013 19:11:37 +0000 (19:11 +0000)]
Use a common routine to write out string options.

This fixes a problem noted in bug 9202, where the calculation of the
padding for the SHB_HARDWARE option was wrong.

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

10 years agoConvert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.
mmann [Sun, 29 Sep 2013 18:19:29 +0000 (18:19 +0000)]
Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.

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

10 years agoRemoving the assignments to "str" was an error, as its value is returned
guy [Sun, 29 Sep 2013 18:07:33 +0000 (18:07 +0000)]
Removing the assignments to "str" was an error, as its value is returned
from the functions.

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

10 years agoCleanup some proto_tree_add_ipv4_format calls that shouldn't be.
mmann [Sun, 29 Sep 2013 17:18:56 +0000 (17:18 +0000)]
Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.

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

10 years agoConvert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_ti...
mmann [Sun, 29 Sep 2013 16:40:01 +0000 (16:40 +0000)]
Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.

Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters.

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

10 years agoConvert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. Now...
mmann [Sun, 29 Sep 2013 15:49:04 +0000 (15:49 +0000)]
Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value.  Now proto_tree_add_ipxnet_format is currently unused.

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

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-09-29]
gerald [Sun, 29 Sep 2013 14:03:41 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-09-29]

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

10 years agoReplace some val_to_str calls with the equivalent val_to_str_const calls (and
eapache [Sun, 29 Sep 2013 12:44:50 +0000 (12:44 +0000)]
Replace some val_to_str calls with the equivalent val_to_str_const calls (and
implement rval_to_str_const to do this). The format-strings didn't have any
parameter specifiers in them, so they were clearly never used (or they would
have blown up) but still a bug.

This is one of the first steps towards converting val_to_str and friends to
wmem. I'm honestly not sure what the best approach is for the API in this case:
the vast majority of usage is within dissectors, so just hard-coding packet
scope (the way they currently hard-code ep_ scope) doesn't look terrible, but
there are *some* uses in taps and other places that will need to be converted to
something else if we go that route. Adding a wmem_pool parameter just for the
uncommon case seems a bit like overkill, though perhaps it is the right thing to
do.

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

10 years agoGet rid of a redundant check - pcapng_read_packet_block() already checks
guy [Sun, 29 Sep 2013 00:37:04 +0000 (00:37 +0000)]
Get rid of a redundant check - pcapng_read_packet_block() already checks
whether the (zero-based) interface ID is < the number of interface IDs,
so we don't need to do so in pcapng_read().

Unions are tricky - if the compiler doesn't ensure that the right
component of the union is being used at any given time, various problems
can happen.

Remove some members from the "data" union in the wtapng_block_t
structure, and use a local variable of the specified type.

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

10 years agoDon't assert that the key to a wmem tree operation is short. If XMPP wants to
eapache [Sat, 28 Sep 2013 23:45:18 +0000 (23:45 +0000)]
Don't assert that the key to a wmem tree operation is short. If XMPP wants to
use a 1500-byte string as a key, so be it. It will be slow, but at least it will
work.

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

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

10 years agoFrom Peter Van Eynde via
eapache [Sat, 28 Sep 2013 23:26:23 +0000 (23:26 +0000)]
From Peter Van Eynde via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9187

Fix some minor length calculation mistakes in the WCCP decoder.

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

10 years agoMake the sample "The following bugs have been fixed:" entry match the
guy [Sat, 28 Sep 2013 21:29:11 +0000 (21:29 +0000)]
Make the sample "The following bugs have been fixed:" entry match the
syntax used in actual release notes we've shipped (putting the buglist
link in parentheses).

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

10 years agoMention bug 9200 being fixed.
guy [Sat, 28 Sep 2013 21:25:44 +0000 (21:25 +0000)]
Mention bug 9200 being fixed.

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

10 years agoThe pcap-ng spec says the captured length is the minimum of the
guy [Sat, 28 Sep 2013 21:06:17 +0000 (21:06 +0000)]
The pcap-ng spec says the captured length is the minimum of the
interface snapshot length and the packet length; make it so.

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

10 years agoActually, the captured length must be the minimum of:
guy [Sat, 28 Sep 2013 20:08:39 +0000 (20:08 +0000)]
Actually, the captured length must be the minimum of:

the number of bytes available for packet data in the block;

the packet length;

*and* the snapshot length for the interface.

One more fix for bug 9200, so it should *now* be fixed.

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

10 years agoFix cut-and-pasteo.
guy [Sat, 28 Sep 2013 19:26:23 +0000 (19:26 +0000)]
Fix cut-and-pasteo.

Finishes the fix for bug 9200.

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

10 years agoCorrectly calculate the captured length in a Simple Packet Block -
guy [Sat, 28 Sep 2013 18:25:07 +0000 (18:25 +0000)]
Correctly calculate the captured length in a Simple Packet Block -
subtract out the minimum SPB size, which includes the length of
*everything* except for the packet data.

Fixes one problem found by the file in bug 9200.

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

10 years agoIn a Simple Packet Block, the captured length isn't the block length
guy [Sat, 28 Sep 2013 18:03:20 +0000 (18:03 +0000)]
In a Simple Packet Block, the captured length isn't the block length
minus the lengths of the two length fields and the packet length field,
it's the minimum of that and the packet length, as there might be
padding.

Fixes one problem found by the file in bug 9200.

While we're at it, pcapng_read_packet_block() and
pcapng_read_simple_packet_block() return an integer, not a Boolean;
return 0, not FALSE (they have the same value, but returning 0 makes it
clearer that the return value isn't restricted to TRUE or FALSE).

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

10 years agoThere's no interface ID in a Simple Packet Block.
guy [Sat, 28 Sep 2013 17:44:50 +0000 (17:44 +0000)]
There's no interface ID in a Simple Packet Block.

Fixes one problem found by the file in bug 9200.

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

10 years agoStart dissect multipart messages.
etxrab [Sat, 28 Sep 2013 08:58:06 +0000 (08:58 +0000)]
Start dissect multipart messages.

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

10 years agoFix various warnings in (hopefully) the right ways.
eapache [Sat, 28 Sep 2013 02:41:49 +0000 (02:41 +0000)]
Fix various warnings in (hopefully) the right ways.

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

10 years ago1. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well as some...
mmann [Sat, 28 Sep 2013 00:45:44 +0000 (00:45 +0000)]
1. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well as some other minor cleanup) and adjust the calling functions accordingly.

2. Converted several add_protocol_subtree calls to add_tlv_subtree to get true filterability.  Many of the add_protocol_subtree are effectively being (ab)used as proto_tree_add_text with different highlighting.

3. Convert tvb_new_subset into tvb_new_subset_length.

Still looks like some of the remaining "protocols" need more specific filters, and should just be regular FT_BYTES fields.

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

10 years agoFix a typo (a missed replace)
jmayer [Fri, 27 Sep 2013 22:30:34 +0000 (22:30 +0000)]
Fix a typo (a missed replace)

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

10 years agoHack for
jmayer [Fri, 27 Sep 2013 20:33:29 +0000 (20:33 +0000)]
Hack for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9127

With 6 unknown bytes leading to the two known values for the
last two bytes this cannot yet be properly dissected. Dissect
the one known case. More traces with additional properties
required to get more sense into the first 6 bytes.

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

10 years agoAnd also where it is declared. Doesn't VSC++ warn about anything?
martinm [Fri, 27 Sep 2013 16:40:50 +0000 (16:40 +0000)]
And also where it is declared. Doesn't VSC++ warn about anything?

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

10 years agoTemporarily make an uncalled function non-static, until it gets called
martinm [Fri, 27 Sep 2013 16:38:45 +0000 (16:38 +0000)]
Temporarily make an uncalled function non-static, until it gets called

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

10 years agoRemove unused parameter
martinm [Fri, 27 Sep 2013 16:29:05 +0000 (16:29 +0000)]
Remove unused parameter

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

10 years agoAnother step towards DRX support in LTE MAC
martinm [Fri, 27 Sep 2013 16:18:09 +0000 (16:18 +0000)]
Another step towards DRX support in LTE MAC

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

10 years agoFix:
jmayer [Fri, 27 Sep 2013 08:06:44 +0000 (08:06 +0000)]
Fix:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c: In function ‘dissect_openflow_v_1_3’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c:1125:18: error: variable ‘version’ set but not used [-Werror=unused-but-set-variable]
     guint8 type, version;

Remove some trailing whitespace.

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

10 years agoHave ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.
gerald [Fri, 27 Sep 2013 03:33:26 +0000 (03:33 +0000)]
Have ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.

The welcome screen in the Qt port runs "dumpcap -S" to draw sparklines.
On OS X this means that it holds open a BPF device for each interface.
Trying to capture using another instance of Wireshark (or tcpdump, or
tshark, or...) will trigger the creation of an additional BPF device but
we won't have permission to use it. Forcing device creation at startup
works around this.

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

10 years agoFix:
etxrab [Thu, 26 Sep 2013 21:21:54 +0000 (21:21 +0000)]
Fix:
packet-openflow.c:577:31: error: "/*" within comment
packet-openflow.c:655:24: error: "/*" within comment
cc1: warnings being treated as errors
packet-openflow.c: In function 'dissect_openflow_features_reply_v1_3':
packet-openflow.c:671: warning: unused parameter 'pinfo'
packet-openflow.c:671: warning: unused parameter 'length'
packet-openflow.c: In function 'dissect_openflow_multipart_request_v1_3':
packet-openflow.c:809: warning: unused parameter 'pinfo'
packet-openflow.c:809: warning: unused parameter 'length'
packet-openflow.c: At top level:
packet-openflow.c:1033: warning: return type defaults to 'int'
packet-openflow.c:1119: warning: return type defaults to 'int'

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

10 years agoFrom beroset@mindspring.com:
etxrab [Thu, 26 Sep 2013 21:15:44 +0000 (21:15 +0000)]
From beroset@mindspring.com:

c1222 dissector has wrong tag value for BER-encoding of calling_AE_qualifier

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

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

10 years agoFrom beroset@mindspring.com:
etxrab [Thu, 26 Sep 2013 21:08:49 +0000 (21:08 +0000)]
From beroset@mindspring.com:
removed obsolete references to se_alloc

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

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

10 years agoStart refactoring to dissect each version separatly.
etxrab [Thu, 26 Sep 2013 21:05:04 +0000 (21:05 +0000)]
Start refactoring to dissect each version separatly.

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

10 years agoAdd a few AVP:s
etxrab [Thu, 26 Sep 2013 21:04:10 +0000 (21:04 +0000)]
Add a few AVP:s

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

10 years agoWhen a line of text wraps to the next line, the character that caused the line to...
cmaynard [Thu, 26 Sep 2013 17:27:53 +0000 (17:27 +0000)]
When a line of text wraps to the next line, the character that caused the line to wrap was not being printed.

#BACKPORT(1.10,1.8)

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

10 years agoDo all checks against the reported length; a packet that wasn't captured
guy [Wed, 25 Sep 2013 22:53:53 +0000 (22:53 +0000)]
Do all checks against the reported length; a packet that wasn't captured
in its entirety due to a snapshot length being specified is not
malformed.

Instead of checking for the the sum of the offset and the value length
being less than the offset, check whether the TLV length is <= 4 and, if
so, just quit at that point (that also handles the "value is zero
length" case).  That makes sure that valuelength isn't negative; given
that length is < 65536, valuelength < 65532, so that won't cause offset
to overflow, so that means offset won't go backwards.

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

10 years agoFrom beroset@mindspring.com:
etxrab [Wed, 25 Sep 2013 21:15:25 +0000 (21:15 +0000)]
From beroset@mindspring.com:

oid_subid2encoded generates faulty encodings for 3-, 4- and 5-byte subid values

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

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

10 years agoFrom Masayuki Takemura:
etxrab [Wed, 25 Sep 2013 21:11:25 +0000 (21:11 +0000)]
From Masayuki Takemura:
According to 3GPP R8/R9/R10/R11, the mobility option "3GPP Specific PMIPv6 error
code" is 1 octet length.

However, in the source file packet-mip6.c, the length of the option is set to 4 octets (around line 1744):

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

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

10 years agoDissect bssmap_reroute_cmd and bssmap_reroute_complete and
etxrab [Wed, 25 Sep 2013 21:06:05 +0000 (21:06 +0000)]
Dissect bssmap_reroute_cmd and bssmap_reroute_complete and
add new IE dissection to bssmap_cl3_info.

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

10 years agoAdd the abillity to let vendor AVP subdisectors add Message type to the info column.
etxrab [Wed, 25 Sep 2013 20:58:37 +0000 (20:58 +0000)]
Add the abillity to let vendor AVP subdisectors add Message type to the info column.

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

10 years agoMinor correction to dissection of DLR frames in Ethernet/IP dissector. Bug 9186...
mmann [Wed, 25 Sep 2013 19:13:10 +0000 (19:13 +0000)]
Minor correction to dissection of DLR frames in Ethernet/IP dissector.  Bug 9186 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9186)

From Joakim Wiberg

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

10 years agoPrevent offset overflow in DTP dissector. Fixes
eapache [Wed, 25 Sep 2013 16:57:21 +0000 (16:57 +0000)]
Prevent offset overflow in DTP dissector. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9184

Also add modelines.

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

10 years agoRequire the NTLMSSP response contents to be long enough before we try to memcpy
eapache [Wed, 25 Sep 2013 16:41:09 +0000 (16:41 +0000)]
Require the NTLMSSP response contents to be long enough before we try to memcpy
it. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9182

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

10 years agoBeginning to work on bug 9127 (Juniper proprietary TLV in RSVP):
jmayer [Wed, 25 Sep 2013 10:11:07 +0000 (10:11 +0000)]
Beginning to work on bug 9127 (Juniper proprietary TLV in RSVP):
- Print hexdump of unknown or vendor specific toplevel TLVs
- Try to print the name of type 204 (something still missing)

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

10 years agoDelete extra_split if we're not using it. This keeps its handle from
gerald [Wed, 25 Sep 2013 00:26:36 +0000 (00:26 +0000)]
Delete extra_split if we're not using it. This keeps its handle from
showing up in the main window. Make it local to layoutPanes().

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

10 years agoFrom Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9180
eapache [Tue, 24 Sep 2013 22:42:27 +0000 (22:42 +0000)]
From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9180

A few enhancements to the SEL Fast Message (selfm) Dissector:
- Final piece of dissection for standard Fast Meter messages to display pad byte
  (if present) and single-byte checksum footer.
- Enhancement to digital word display to show 1-byte bit patterns on proto_item
  without requiring user to expand tree.

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

10 years agoPrevent crashing as a result of tree removal in r52208. Tree removal + this patch...
mmann [Tue, 24 Sep 2013 21:06:05 +0000 (21:06 +0000)]
Prevent crashing as a result of tree removal in r52208.  Tree removal + this patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349).  I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking).

I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349.  Cleanup shouldn't need to be backported.

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

10 years agoYou are in a twisty little maze of code paths, all different. Get rid
guy [Tue, 24 Sep 2013 20:32:19 +0000 (20:32 +0000)]
You are in a twisty little maze of code paths, all different.  Get rid
of the if (tree) tests in dissect_mac_header_generic_decoder(), as some
of the stuff done inside there should be done even if we're not building
a protocol tree, e.g. CRC stuff and calling subdissectors.

Get rid of a gratuitous pair of curly braces, and fix the indentation of
one line, while we're at it.

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

10 years agoStuff used when checking the CRC needs to be done regardless of whether
guy [Tue, 24 Sep 2013 19:57:41 +0000 (19:57 +0000)]
Stuff used when checking the CRC needs to be done regardless of whether
we're building a protocol tree or not.

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

10 years agoGet rid of unused variable.
guy [Tue, 24 Sep 2013 19:56:56 +0000 (19:56 +0000)]
Get rid of unused variable.

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

10 years agoFix copy-and-pasteo(?).
guy [Tue, 24 Sep 2013 19:09:10 +0000 (19:09 +0000)]
Fix copy-and-pasteo(?).

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

10 years agoOne advantage of making as many things as possible static is that, if
guy [Tue, 24 Sep 2013 19:07:22 +0000 (19:07 +0000)]
One advantage of making as many things as possible static is that, if
they're not being used, the compiler can be made to warn about that.

In this case, Broadcast_Control_Pointer_IE() was used because of a
missing case in a switch statement; put that case in.

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

10 years agoWimax dissector improvements:
mmann [Tue, 24 Sep 2013 18:45:39 +0000 (18:45 +0000)]
Wimax dissector improvements:

1. Remove message type field from all MAC Management "sub"dissectors and place it in Mac Management subdissector itself.  This may cause backwards-compatibility issues (malformed packets) with third-party subdissectors of the MAC Management dissector, but it didn't make sense to have so many filters for a single enumerated value, especially when the various "protocol" filters covers many of them.

2. Removed some if(tree) checks as column info and calling other dissectors are sometimes executed underneath.  Some of this is in preparation for addressing bug 5349.

3. Make all dissector functions (and a few others) static, and use register_dissector() when necessary.

4. Convert generic decoder CRC errors into expert info, rather than have it be a "protocol" filter (it just looks funny that way)

In general, these dissectors seem "over-protocolized". I understand the need for all of the dissectors, but I don't know if they all need "protocol" status.

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

10 years agoUpgrade RRC dissector to v11.7.0
pascal [Tue, 24 Sep 2013 17:56:17 +0000 (17:56 +0000)]
Upgrade RRC dissector to v11.7.0

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