metze/wireshark/wip.git
10 years agoCreate/use an extended value_string;
wmeier [Mon, 25 Nov 2013 18:55:45 +0000 (18:55 +0000)]
Create/use an extended value_string;
Use 'offset += 1' instead of 'offset++' for consistency;
Replace 32767 (as a mask) with 0x7FFF for clarity;
Remove some unneeded boilerplate comments;
Do whitespace changes.

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

10 years agoThe defragment_xudt preference is used to control reassembly of both XUDTs
morriss [Mon, 25 Nov 2013 18:29:40 +0000 (18:29 +0000)]
The defragment_xudt preference is used to control reassembly of both XUDTs
and also DT1s.  Update the preference text to reflect that.

(Don't change the actual preference name to avoid breaking backward
compatibility.)

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

10 years agoAdd command type to info column
pascal [Mon, 25 Nov 2013 18:04:07 +0000 (18:04 +0000)]
Add command type to info column

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

10 years agoSet SVN properties.
morriss [Mon, 25 Nov 2013 18:02:21 +0000 (18:02 +0000)]
Set SVN properties.

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

10 years agofix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9474
martink [Mon, 25 Nov 2013 17:04:58 +0000 (17:04 +0000)]
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9474

make mepg-sect a new-style dissector and do a length check on the
incoming tvb

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

10 years agoFrom Thomas ERSFELD (GSoC13) and me : Try to fix OSX-10.5-x86 (without pcap...) Buildbot
alagoutte [Mon, 25 Nov 2013 17:01:10 +0000 (17:01 +0000)]
From Thomas ERSFELD (GSoC13) and me : Try to fix OSX-10.5-x86 (without pcap...) Buildbot

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

10 years agomark unused parameter
martink [Mon, 25 Nov 2013 16:59:06 +0000 (16:59 +0000)]
mark unused parameter

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

10 years agoCreate/use extended value_string;
wmeier [Mon, 25 Nov 2013 16:57:43 +0000 (16:57 +0000)]
Create/use extended value_string;
Move value_string array definitions from .h to .c file
 (value_string definitions should never be in a .h file);
Add XXX comments re value_string arrays containing
 duplicate values [ptp_opcode_names & ptp_respcode_names];
Remove unneeded #includes (stdio.h, stdlib.h & string.h);
Remove some unneeded initializers;
Add editor modelines.
Do some whitespace & long-lines changes;

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

10 years agoRemove Fibre Channel specific fields from packet_info and just have the fc_hdr or...
mmann [Mon, 25 Nov 2013 16:04:57 +0000 (16:04 +0000)]
Remove Fibre Channel specific fields from packet_info and just have the fc_hdr or fc_data_t structure passed between all necessary dissectors.

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

10 years agoTry to fix OSX-10.6-x64 Buildbot
alagoutte [Mon, 25 Nov 2013 15:56:22 +0000 (15:56 +0000)]
Try to fix OSX-10.6-x64 Buildbot

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

10 years agoComment debug...
alagoutte [Mon, 25 Nov 2013 15:43:16 +0000 (15:43 +0000)]
Comment debug...

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

10 years agoFrom Thomas ERSFELD (GSoC13) : Try to fix Windows buildbot
alagoutte [Mon, 25 Nov 2013 15:43:08 +0000 (15:43 +0000)]
From Thomas ERSFELD (GSoC13) : Try to fix Windows buildbot

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

10 years agoCreate/use some extended value_strings.
wmeier [Mon, 25 Nov 2013 15:37:56 +0000 (15:37 +0000)]
Create/use some extended value_strings.
Add editor modelines.

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

10 years agoAdd svn:eol-style.
morriss [Mon, 25 Nov 2013 15:35:53 +0000 (15:35 +0000)]
Add svn:eol-style.

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

10 years agoFrom Thomas ERSFELD (GSoC13) : Add Capture interface dialog window
alagoutte [Mon, 25 Nov 2013 14:15:49 +0000 (14:15 +0000)]
From Thomas ERSFELD (GSoC13) : Add Capture interface dialog window

* Reuse sparkline from welcome
* Split settings in tab (!= GTK)
* No all feature work (Work In Progress...)
* ...

Comments (and review) are welcome !

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

10 years agoFix a shadowed declaration error when compiling with gcc 4.3.2
pascal [Mon, 25 Nov 2013 11:23:11 +0000 (11:23 +0000)]
Fix a shadowed declaration error when compiling with gcc 4.3.2

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

10 years agoPrettify LTE Positioning Protocol dissection
pascal [Mon, 25 Nov 2013 11:16:24 +0000 (11:16 +0000)]
Prettify LTE Positioning Protocol dissection

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

10 years agoAdd a temporary workaround for the duplicated filter name problem.
etxrab [Mon, 25 Nov 2013 07:22:17 +0000 (07:22 +0000)]
Add a temporary workaround for the duplicated filter name problem.

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

10 years agoMove DCERPC data in packet_info needed for Decode As into packet scoped proto data.
mmann [Mon, 25 Nov 2013 00:14:50 +0000 (00:14 +0000)]
Move DCERPC data in packet_info needed for Decode As into packet scoped proto data.

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

10 years agoCreate/use a fair number of extended value_strings;
wmeier [Sun, 24 Nov 2013 23:55:26 +0000 (23:55 +0000)]
Create/use a fair number of extended value_strings;
Add an XXX comment noting that the 'ndps_error_types' array has a
 number of duplicate values; Also note the commenting out of those
 dups which would not have been found via a linear search in the
 original unsorted array.

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

10 years agoDissect UE Rx - Tx time difference field
pascal [Sun, 24 Nov 2013 23:09:48 +0000 (23:09 +0000)]
Dissect UE Rx - Tx time difference field

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

10 years agoAccording to
guy [Sun, 24 Nov 2013 22:51:44 +0000 (22:51 +0000)]
According to

    http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options

-ftrapv "generates traps for signed overflow on addition, subtraction,
multiplication operations." and -fwrapv "instructs the compiler to
assume that signed arithmetic overflow of addition, subtraction and
multiplication wraps around using twos-complement representation."

Those seem mutually-exclusive to me, and we probably want wrapping, not
traps, as there's probably a fair bit of code out there that explicitly
or implicitly assumes wrapping.  (Actually, we really want to avoid
signed arithmetic for the cases that most matter, such as offsets and
lengths, but, unfortunately, we currently have API conventions that
allow negative values for lengths, either with -1 meaning "to the end"
or with negative values meaning "relative to the end".)  In addition,
there seem to be some bugs complaining that -ftrapv doesn't always cause
traps on signed integer overflow.

We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent
to adding -ftrapv; I don't know whether that's an overflow being
detected, a bug in the compiler, or something unrelated, especially
given that we're using Sun C, not GCC, on the Solaris buildbot.
However, we'll try removing -ftrapv, to see if it fixes the problem; the
MIT CSAIL paper in question wasn't really recommending all the GCC
options it mentioned (which, as noted, wouldn't make sense, as -ftrapv
and -fwrapv appear to be mutually-exclusive).

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

10 years agoNote that I've filed a Samba bug for one of the problems.
guy [Sun, 24 Nov 2013 22:13:28 +0000 (22:13 +0000)]
Note that I've filed a Samba bug for one of the problems.

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

10 years agopidl would tag all pinfo arguments as unused, as it doesn't take the
guy [Sun, 24 Nov 2013 21:21:42 +0000 (21:21 +0000)]
pidl would tag all pinfo arguments as unused, as it doesn't take the
effort to figure out whether they *are* used (and there's no point in it
doing so - might as well just flag them preemptively).

pidl can't handle this, at least not on OS X, as it's not handling the
C++/C99-style dissectors in the IDL for NSPI, so we manually put the
_U_s back.

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

10 years agoSquelch a Coverity warning (not necessary, but it still complains).
guy [Sun, 24 Nov 2013 21:15:22 +0000 (21:15 +0000)]
Squelch a Coverity warning (not necessary, but it still complains).

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

10 years agoMove dceprc_procedure_name from packet_info to dcerpc_info. Doesn't appear to be...
mmann [Sun, 24 Nov 2013 20:55:55 +0000 (20:55 +0000)]
Move dceprc_procedure_name from packet_info to dcerpc_info.  Doesn't appear to be "used" by dissectors, just stored (for help in debugging?).

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

10 years agoUse GCC flags to avoid optimization problems due to undefined behaviour
rbalint [Sun, 24 Nov 2013 20:28:25 +0000 (20:28 +0000)]
Use GCC flags to avoid optimization problems due to undefined behaviour

Adding flags suggested by article at:
http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf

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

10 years agoEnsure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the regex...
grahamb [Sun, 24 Nov 2013 19:12:07 +0000 (19:12 +0000)]
Ensure the WIRESHARK_BASE_DIR env var is in cmake format.  Required for the regex in FindGTK3.cmake.

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

10 years agoCreate/use some extended value_strings;
wmeier [Sun, 24 Nov 2013 15:55:10 +0000 (15:55 +0000)]
Create/use some extended value_strings;
Do a few trivial whitespace tweaks.

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

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-11-24]
gerald [Sun, 24 Nov 2013 15:03:43 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-11-24]

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

10 years agoFix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.
morriss [Sun, 24 Nov 2013 14:27:52 +0000 (14:27 +0000)]
Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.

Also, as per Peter Harris' request, update copyright date.

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

10 years agoRmove packet_info argument from packet_list_append(), never used.
darkjames [Sun, 24 Nov 2013 12:49:50 +0000 (12:49 +0000)]
Rmove packet_info argument from packet_list_append(), never used.

Part of attachment 12060, from Didier Gautheron (bug #9419).

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

10 years agoActually, the "1632" types do exist, and are 16-bit for NDR and 32-bit
guy [Sun, 24 Nov 2013 04:39:27 +0000 (04:39 +0000)]
Actually, the "1632" types do exist, and are 16-bit for NDR and 32-bit
for NDR64, and we handle them.  The real problems are elsewhere.

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

10 years agoThese are two of the problems that pidl has with dfs.idl.
guy [Sun, 24 Nov 2013 04:15:25 +0000 (04:15 +0000)]
These are two of the problems that pidl has with dfs.idl.

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

10 years agoGet rid of trailing spaces, fix some proto_tree_add_item() calls as per
guy [Sun, 24 Nov 2013 04:14:00 +0000 (04:14 +0000)]
Get rid of trailing spaces, fix some proto_tree_add_item() calls as per
the result of pidl on dce.idl.

(We can't just regenerate it, as there are some pidl bugs that cause bad
code to be generated.)

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

10 years agoThe issue with misc.idl was a .cnf file that needed to be updated.
guy [Sun, 24 Nov 2013 03:33:17 +0000 (03:33 +0000)]
The issue with misc.idl was a .cnf file that needed to be updated.

Give details of the problems with the other files.

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

10 years agoRegenerate - new API changes, get rid of trailing whitespace.
guy [Sun, 24 Nov 2013 03:21:50 +0000 (03:21 +0000)]
Regenerate - new API changes, get rid of trailing whitespace.

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

10 years agoFix to match API changes.
guy [Sun, 24 Nov 2013 03:20:25 +0000 (03:20 +0000)]
Fix to match API changes.

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

10 years agoFix line endings, set svn:eol-style to native.
guy [Sun, 24 Nov 2013 03:18:22 +0000 (03:18 +0000)]
Fix line endings, set svn:eol-style to native.

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

10 years agoUpdate a date, explain what the problems are with a bunch of IDL files,
guy [Sun, 24 Nov 2013 02:58:26 +0000 (02:58 +0000)]
Update a date, explain what the problems are with a bunch of IDL files,
add another file that *might* be generating incorrect code.

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

10 years agoRegenerate - for whatever reason, the fields come out in a different
guy [Sun, 24 Nov 2013 02:57:24 +0000 (02:57 +0000)]
Regenerate - for whatever reason, the fields come out in a different
random order, but nothing else changes.

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

10 years agoRegenerated with the current version of pidl; mainly removes trailing
guy [Sun, 24 Nov 2013 02:51:36 +0000 (02:51 +0000)]
Regenerated with the current version of pidl; mainly removes trailing
white space, but also gets rid of an apparently-unnecessary _U_ for one
argument.

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

10 years agoUpdates to:
guy [Sun, 24 Nov 2013 02:45:38 +0000 (02:45 +0000)]
Updates to:

suggest using our version of pidl, given that its Wireshark
parser generator has changes to support the current internal
Wireshark APIs for dissectors;

suggest using "--includedir ." to make IDL files in
subdirectories of epan/dissectors/pidl work;

update the list of IDL files with issues;

reformat to 80x66 (if it's good enough for Herman Hollerith,
it's good enough for me!).

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

10 years agoSome patches from Peter Harris to make it possible to build the X11 dissector
morriss [Sun, 24 Nov 2013 01:32:55 +0000 (01:32 +0000)]
Some patches from Peter Harris to make it possible to build the X11 dissector
again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.

Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

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

10 years agoSome patches from Peter Harris to make it possible to build the X11 dissector
morriss [Sun, 24 Nov 2013 01:32:20 +0000 (01:32 +0000)]
Some patches from Peter Harris to make it possible to build the X11 dissector
again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.

Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

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

10 years agoConvert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
eapache [Sat, 23 Nov 2013 22:37:33 +0000 (22:37 +0000)]
Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
of ansi_tcap code while in the neighbourhood.

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

10 years agoUse 32bit key in p_add_proto_data() and friends. Bug 9453 (https://bugs.wireshark...
mmann [Sat, 23 Nov 2013 22:29:31 +0000 (22:29 +0000)]
Use 32bit key in p_add_proto_data() and friends.  Bug 9453 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9453)

From Dirk

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

10 years agoImplement address_to_str which is like ep_address_to_str and se_address_to_str
eapache [Sat, 23 Nov 2013 22:17:27 +0000 (22:17 +0000)]
Implement address_to_str which is like ep_address_to_str and se_address_to_str
except it takes a wmem scope instead. Add the two emem equivalents to checkAPI
as (weakly) deprecated.

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

10 years agoRemove old (2009) and no-longer-necessary compatibility macro.
eapache [Sat, 23 Nov 2013 22:03:48 +0000 (22:03 +0000)]
Remove old (2009) and no-longer-necessary compatibility macro.

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

10 years agoIgnore the generated tap-register file.
eapache [Sat, 23 Nov 2013 21:57:26 +0000 (21:57 +0000)]
Ignore the generated tap-register file.

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

10 years agoBluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi...
mmann [Sat, 23 Nov 2013 21:41:08 +0000 (21:41 +0000)]
Bluetooth improvements.  Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)

From Michal Labedzki

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

10 years agoSet a field to squelch a Coverity warning.
guy [Sat, 23 Nov 2013 20:10:02 +0000 (20:10 +0000)]
Set a field to squelch a Coverity warning.

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

10 years agoAlways check cf->edt before dereferencing it, so that Coverity doesn't
guy [Sat, 23 Nov 2013 19:51:02 +0000 (19:51 +0000)]
Always check cf->edt before dereferencing it, so that Coverity doesn't
say "you checked it here, but you dereferenced it later even if it was
null when you checked it".

This obviates the need for some checks of frame_selected, as cf->edt
will be non-null iff cf->current_frame is non-null.

Always check *cf, not cfile, in set_menus_for_selected_packet().
Currently, cf always == &cfile, but we aren't guaranteeing that will be
true forever.

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

10 years agoRemove ip_ttl from packet_info structure.
mmann [Sat, 23 Nov 2013 19:16:05 +0000 (19:16 +0000)]
Remove ip_ttl from packet_info structure.

Part of the fix includes having the IPv6 dissector populate as much of a ws_ip structure as possible to pass to subdissectors of the "ip.proto" table, so the ttl value can be picked up.

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

10 years agoCheck the packet length when using the "Force decoding of unknown USB control data...
pascal [Sat, 23 Nov 2013 12:30:19 +0000 (12:30 +0000)]
Check the packet length when using the "Force decoding of unknown USB control data as MBIM" option to reduce false positives.
Align text in info column.

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

10 years agoCreate the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wiresh...
mmann [Sat, 23 Nov 2013 02:20:13 +0000 (02:20 +0000)]
Create the ability to have packet scoped "proto" data.  Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)

I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

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

10 years agoReplace similar code with a common routine.
gerald [Sat, 23 Nov 2013 01:06:30 +0000 (01:06 +0000)]
Replace similar code with a common routine.

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

10 years agoAdd exception for cmake/TestWindowsFSeek.c it is copied from upstream under a
eapache [Fri, 22 Nov 2013 23:46:00 +0000 (23:46 +0000)]
Add exception for cmake/TestWindowsFSeek.c it is copied from upstream under a
valid license, but has no recognizable header and there's no reason to carry the
delta.

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

10 years agoSlap a BSD checksum onto in_cksum.h.
guy [Fri, 22 Nov 2013 20:54:30 +0000 (20:54 +0000)]
Slap a BSD checksum onto in_cksum.h.

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

10 years agoFix packet list selection signaling.
gerald [Fri, 22 Nov 2013 17:59:15 +0000 (17:59 +0000)]
Fix packet list selection signaling.

It looks like resetting the packet list model during freezing and
thawing disconnects the selection changed signal between the model and
the main window. Rename the packet list's setMenusFollowStream signal to
packetSelectionChanged and use it to trigger menu updates in the main
window.

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

10 years agoMake the "decode as" dialog modal (for now, at least).
gerald [Fri, 22 Nov 2013 17:53:25 +0000 (17:53 +0000)]
Make the "decode as" dialog modal (for now, at least).

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

10 years agoTweak filter names for expert items, mostly to consistently use - rather than _
martinm [Fri, 22 Nov 2013 17:18:11 +0000 (17:18 +0000)]
Tweak filter names for expert items, mostly to consistently use - rather than _

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

10 years agoTidy up some TODOs
martinm [Fri, 22 Nov 2013 16:52:28 +0000 (16:52 +0000)]
Tidy up some TODOs

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

10 years agoFix unused-const-variable error when build with clang 3.4
alagoutte [Fri, 22 Nov 2013 14:52:25 +0000 (14:52 +0000)]
Fix unused-const-variable error when build with clang 3.4

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

10 years agoFix unused-const-variable error when build with clang 3.4
alagoutte [Fri, 22 Nov 2013 14:52:15 +0000 (14:52 +0000)]
Fix unused-const-variable error when build with clang 3.4

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

10 years agoFix unused-const-variable error when build with clang 3.4
alagoutte [Fri, 22 Nov 2013 14:52:04 +0000 (14:52 +0000)]
Fix unused-const-variable error when build with clang 3.4

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

10 years agoFix unused-const-variable error when build with clang 3.4
alagoutte [Fri, 22 Nov 2013 14:51:52 +0000 (14:51 +0000)]
Fix unused-const-variable error when build with clang 3.4

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

10 years agoFix unused-const-variable error when build with clang 3.4 (with ugly hack... Maybe...
alagoutte [Fri, 22 Nov 2013 14:51:43 +0000 (14:51 +0000)]
Fix unused-const-variable error when build with clang 3.4 (with ugly hack... Maybe remove all ugly INIT_FIELD/ ADD_FIELD macro)

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

10 years agoAdd -Wheader-guard to Autotools and CMake
alagoutte [Fri, 22 Nov 2013 14:51:31 +0000 (14:51 +0000)]
Add -Wheader-guard to Autotools and CMake

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

10 years agoMake use of ctrl_ack_vals value_string array
pascal [Fri, 22 Nov 2013 11:22:46 +0000 (11:22 +0000)]
Make use of ctrl_ack_vals value_string array

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

10 years agoFix typo in top filename
alagoutte [Fri, 22 Nov 2013 08:53:05 +0000 (08:53 +0000)]
Fix typo in top filename

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

10 years agoCreate multiple dissection functions if packet_info->ipproto is used to distinguish...
mmann [Fri, 22 Nov 2013 02:52:41 +0000 (02:52 +0000)]
Create multiple dissection functions if packet_info->ipproto is used to distinguish behavior.

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

10 years agoReplace packet_info->ipproto with packet_info->layers loop to determine TCP/UDP.
mmann [Fri, 22 Nov 2013 02:49:00 +0000 (02:49 +0000)]
Replace packet_info->ipproto with packet_info->layers loop to determine TCP/UDP.

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

10 years agoFix qmake builds on Unix.
gerald [Fri, 22 Nov 2013 02:11:40 +0000 (02:11 +0000)]
Fix qmake builds on Unix.

tap_register.variable_out adds wireshark-tap-register.c to SOURCES. We
don't have to add it again ourselves.

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

10 years agoMark a parameter unused.
gerald [Fri, 22 Nov 2013 01:25:17 +0000 (01:25 +0000)]
Mark a parameter unused.

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

10 years agoRemove a commented-out duplicate dissector_table definition.
gerald [Fri, 22 Nov 2013 01:11:49 +0000 (01:11 +0000)]
Remove a commented-out duplicate dissector_table definition.

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

10 years agoAdd an initial "Decode As" dialog. Currently read-only.
gerald [Fri, 22 Nov 2013 01:07:36 +0000 (01:07 +0000)]
Add an initial "Decode As" dialog. Currently read-only.

Fixup some of the Statistics menu items.

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

10 years agoMove common "decode as" preference code to epan.
gerald [Fri, 22 Nov 2013 00:20:23 +0000 (00:20 +0000)]
Move common "decode as" preference code to epan.

We presumably want "decode as" behavior to be consistent across UIs so
call load_decode_as_entries() from read_prefs().

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

10 years agoComment out *many* unused vars found by CLANG;
wmeier [Thu, 21 Nov 2013 23:21:49 +0000 (23:21 +0000)]
Comment out *many* unused vars found by CLANG;
Fix 2 minor bugs wherein an incorrect (NULL) tree was always used;
Remove some unneeded initializers;
Localize some variables;
Use consistent indentation & whitespace formatting
Add editor modelines.

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

10 years ago#if 0 some unused vars found by CLANG
wmeier [Thu, 21 Nov 2013 23:17:59 +0000 (23:17 +0000)]
#if 0 some unused vars found by CLANG

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

10 years agoFrom Abhik Sarkar
martink [Thu, 21 Nov 2013 22:30:55 +0000 (22:30 +0000)]
From Abhik Sarkar
improve relative offset calculations for Kyoto-Tycoon protocol

from me:
use col_append_sep_str()
set the correct length in dissect_kt()

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

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

10 years agonext unprocessed descriptor 0xFF means that
martink [Thu, 21 Nov 2013 21:54:31 +0000 (21:54 +0000)]
next unprocessed descriptor 0xFF means that
all descriptors were processed

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

10 years agoWiden the Ethertype to a guint, to avoid compiler warnings.
guy [Thu, 21 Nov 2013 20:50:13 +0000 (20:50 +0000)]
Widen the Ethertype to a guint, to avoid compiler warnings.

Fix indentation while we're at it.

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

10 years agoGet rid of unused variable.
guy [Thu, 21 Nov 2013 20:33:28 +0000 (20:33 +0000)]
Get rid of unused variable.

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

10 years agoTap listeners have to be registered before we read our prefs.
gerald [Thu, 21 Nov 2013 20:24:01 +0000 (20:24 +0000)]
Tap listeners have to be registered before we read our prefs.

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

10 years agoAttempt to fix Qt dependencies for SUSE.
morriss [Thu, 21 Nov 2013 20:20:29 +0000 (20:20 +0000)]
Attempt to fix Qt dependencies for SUSE.

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

10 years agoRemove ethertype, mpls_label and ppids from packet_info structure.
mmann [Thu, 21 Nov 2013 20:08:20 +0000 (20:08 +0000)]
Remove ethertype, mpls_label and ppids from packet_info structure.

The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".

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

10 years agoCreate new dissectors when a protocol goes across ethernet and "something else" inste...
mmann [Thu, 21 Nov 2013 19:51:17 +0000 (19:51 +0000)]
Create new dissectors when a protocol goes across ethernet and "something else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case.

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

10 years agoAdd some "helper" macros to:
wmeier [Thu, 21 Nov 2013 19:11:47 +0000 (19:11 +0000)]
Add some "helper" macros to:
     Provide the capability to define a list of value_strings once and
     then to expand the list as an enum and/or as a value_string array.

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

10 years agoGet rid of C++ comments.
guy [Thu, 21 Nov 2013 18:50:44 +0000 (18:50 +0000)]
Get rid of C++ comments.

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

10 years ago#if 0 out some currently-unused variables and the code that sets them,
guy [Thu, 21 Nov 2013 18:48:36 +0000 (18:48 +0000)]
#if 0 out some currently-unused variables and the code that sets them,
to squelch compiler warnings.

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

10 years agoDo some constification;
wmeier [Thu, 21 Nov 2013 18:46:40 +0000 (18:46 +0000)]
Do some constification;
Create/use value_string_ext_free();
Display certain numbers also as hex in the
   "forced to fall back to linear search: ..." value-string warning msg
Add editor-modelines to some files;
Do some whitespace changes.

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

10 years ago(Trivial) Formatting & whitespace changes ....
wmeier [Thu, 21 Nov 2013 18:37:26 +0000 (18:37 +0000)]
(Trivial) Formatting & whitespace changes ....

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

10 years agoConstify two vars;
wmeier [Thu, 21 Nov 2013 18:03:10 +0000 (18:03 +0000)]
Constify two vars;
Add editor modelines;
Rework some whitespace.

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

10 years agoAdd a note about UTF-8.
gerald [Thu, 21 Nov 2013 17:44:12 +0000 (17:44 +0000)]
Add a note about UTF-8.

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

10 years agoConstify a character array;
wmeier [Thu, 21 Nov 2013 17:41:17 +0000 (17:41 +0000)]
Constify a character array;
Fix a typo;
Add editor modelines.

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

10 years agoRemove an unused function.
gerald [Thu, 21 Nov 2013 17:39:32 +0000 (17:39 +0000)]
Remove an unused function.

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

10 years agoCreate separate dissector function for TCP functionality so packet_info->ethertype...
mmann [Thu, 21 Nov 2013 17:18:11 +0000 (17:18 +0000)]
Create separate dissector function for TCP functionality so packet_info->ethertype doesn't need to be used.

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

10 years agoCreate/use a number of extended value-strings;
wmeier [Thu, 21 Nov 2013 17:12:05 +0000 (17:12 +0000)]
Create/use a number of extended value-strings;
Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array;
Add editor modelines;
Do some whitespace & formatting changes.

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

10 years agoRemove packet_info->ipproto and packet_info->ethertype uses in the GUI. Convert...
mmann [Thu, 21 Nov 2013 16:42:10 +0000 (16:42 +0000)]
Remove packet_info->ipproto and packet_info->ethertype uses in the GUI.  Convert to walking packet protocol list looking for desired protocols.

I may eventually switch this to use proto_* values instead of strings, but just the addition of the loop is more jarring as compared to the simple comparing of ip or ethernet values.  But it should lead to a smaller (less protocol specific) packet_info structure.

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