obnox/wireshark/wip.git
13 years agoUse {'0', ...} type initializer for fixed length character arrays.
wmeier [Mon, 31 Jan 2011 21:45:16 +0000 (21:45 +0000)]
Use {'0', ...} type initializer for fixed length character arrays.

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

13 years agoUse tvb_bytes_to_str() iso home-grown hex output fcn.
wmeier [Mon, 31 Jan 2011 21:35:48 +0000 (21:35 +0000)]
Use tvb_bytes_to_str() iso home-grown hex output fcn.

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

13 years agoClean up dissector code. Pass data block to data dissector.
jake [Mon, 31 Jan 2011 21:23:49 +0000 (21:23 +0000)]
Clean up dissector code. Pass data block to data dissector.

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

13 years agoFix minor bug lookups of certain "peer ids" would fail.
wmeier [Mon, 31 Jan 2011 21:23:35 +0000 (21:23 +0000)]
Fix minor bug lookups of certain "peer ids" would fail.

The  issue (in essence)
 For:
  char foo[][4] = {"abc", "defg", "hij"};

strlen(foo[1]) will be 7 and not 4 as expected;

Detected via msvc level 4 warning: "array is too small to include a terminating null character"

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

13 years agoClean up the whitespace in script.
jake [Mon, 31 Jan 2011 21:16:20 +0000 (21:16 +0000)]
Clean up the whitespace in script.

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

13 years agoJack up the Lua reference entries one level to make it segmented.
jake [Mon, 31 Jan 2011 21:15:27 +0000 (21:15 +0000)]
Jack up the Lua reference entries one level to make it segmented.

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

13 years agoAdd a Manual entry to the Lua menu.
jake [Mon, 31 Jan 2011 21:13:20 +0000 (21:13 +0000)]
Add a Manual entry to the Lua menu.

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

13 years agoReplace some blurbs with NULL
morriss [Mon, 31 Jan 2011 21:09:28 +0000 (21:09 +0000)]
Replace some blurbs with NULL

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

13 years agoChange a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based...
etxrab [Mon, 31 Jan 2011 20:37:17 +0000 (20:37 +0000)]
Change a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based on Alexis La Gouttes patch.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

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

13 years agoFix two cases of 'if (x = y)' which should be 'if (x == y)'.
wmeier [Mon, 31 Jan 2011 18:58:38 +0000 (18:58 +0000)]
Fix two cases of 'if (x = y)'  which should be 'if (x == y)'.

Found by reviewing msvc level 4 warnings "assignment within conditional expression".

(Unfortunately most of the warnings are false positives so this warning can't be enabled)

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

13 years ago#include <stdio.h>, #include <stdlib.h> not req'd;
wmeier [Mon, 31 Jan 2011 17:09:58 +0000 (17:09 +0000)]
#include <stdio.h>, #include <stdlib.h> not req'd;
Make a global variable static (since it's apparently not used elsewhere);
Whitespace changes (indentation, trailing, etc).

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

13 years agoReturn a string (even though abort is called first) to pacify gcc.
martinm [Mon, 31 Jan 2011 16:38:40 +0000 (16:38 +0000)]
Return a string (even though abort is called first) to pacify gcc.

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

13 years agoAdd dissection of Evolved Allocation/Retention Priority I IE.
etxrab [Mon, 31 Jan 2011 16:25:26 +0000 (16:25 +0000)]
Add dissection of Evolved Allocation/Retention Priority I IE.

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

13 years agoFrom Roberto Morro: Fix for Bug #5628
wmeier [Mon, 31 Jan 2011 15:27:26 +0000 (15:27 +0000)]
From Roberto Morro: Fix for Bug #5628

This patch (against revision 35716) resolves the following bug:
[introduced in patch attached to Bug #5518]
"Dissector bug, protocol RSVP, in packet 78:
More than 1000000 items in the tree -- possible infinite loop"

Actually the bug is resolved by the "return" statement that was erased by
mistake. The patch fixes another issue: the code didn't take care of the fact
that TLVs must be padded to a length multiple of 4.

See:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5518
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5628

From me:
 Change two bytestring_to_str(tvb_get_ptr(...),...) to tvb_bytes_to_str(tvb,...)

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

13 years agoDissect more IE's in PERFORM-LOCATION-REQUEST.
etxrab [Mon, 31 Jan 2011 15:16:45 +0000 (15:16 +0000)]
Dissect more IE's in PERFORM-LOCATION-REQUEST.

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

13 years agoOnly define view_menu_auto_scroll_live_cb if HAVE_LIBPCAP
etxrab [Mon, 31 Jan 2011 13:58:36 +0000 (13:58 +0000)]
Only define view_menu_auto_scroll_live_cb if HAVE_LIBPCAP

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

13 years agoTry to fix previous commit.
etxrab [Mon, 31 Jan 2011 13:52:32 +0000 (13:52 +0000)]
Try to fix previous commit.
- menu.h commited by mistake
- new_packet_list.c missing

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

13 years agoFrom Cal Turney:
etxrab [Mon, 31 Jan 2011 12:19:15 +0000 (12:19 +0000)]
From Cal Turney:
Bug 5621 - With String in Packet details searches, highlight row in tree
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5621

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

13 years agoAdded filter autocomplete to "Edit Column Details".
stig [Mon, 31 Jan 2011 07:42:13 +0000 (07:42 +0000)]
Added filter autocomplete to "Edit Column Details".

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

13 years agoPut back a 'return' statement so GCC doesn't generate a warning...
wmeier [Mon, 31 Jan 2011 04:23:46 +0000 (04:23 +0000)]
Put back a 'return' statement so GCC doesn't generate a warning...

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

13 years agoDescribe in more detail some of the fields that may be filled in for an LTE MAC frame.
martinm [Mon, 31 Jan 2011 00:28:22 +0000 (00:28 +0000)]
Describe in more detail some of the fields that may be filled in for an LTE MAC frame.

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

13 years agoClean up white space.
guy [Mon, 31 Jan 2011 00:12:21 +0000 (00:12 +0000)]
Clean up white space.

Use the bssgp_perform_loc_request() routine for PERFORM-LOCATION-REQUEST
(fixes a "defined, but not used" warning).

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

13 years agoFix various instances of "unreachable code".
wmeier [Sun, 30 Jan 2011 23:27:57 +0000 (23:27 +0000)]
Fix various instances of "unreachable code".

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

13 years agoDon't compile non-used (unreachable) code on Windows.
wmeier [Sun, 30 Jan 2011 23:24:23 +0000 (23:24 +0000)]
Don't compile non-used (unreachable) code on Windows.

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

13 years agoWhitespace cleanup (remove trailing blanks from lines).
wmeier [Sun, 30 Jan 2011 22:57:00 +0000 (22:57 +0000)]
Whitespace cleanup (remove trailing blanks from lines).

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

13 years agoAdd a comment about some "unreachable code" indicating possible incorrect code someplace.
wmeier [Sun, 30 Jan 2011 22:42:06 +0000 (22:42 +0000)]
Add a comment about some "unreachable code" indicating possible incorrect code someplace.
Fix some spelling..

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

13 years agoFix a number of msvc level 4 "Unreachable code" warnings by removing unneeded
wmeier [Sun, 30 Jan 2011 22:32:25 +0000 (22:32 +0000)]
Fix a number of msvc level 4 "Unreachable code" warnings by removing unneeded
return statements.

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

13 years agoDon't compile unused non-Windows code when on Windows.
wmeier [Sun, 30 Jan 2011 22:23:45 +0000 (22:23 +0000)]
Don't compile unused non-Windows code when on Windows.
(Found by msvc level 4 warning "unreachable code").

Also:
- suppress an invalid msvc level 4 warning by initializing a variable.
- Use #ifdef _WIN32 iso #if _WIN32

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

13 years agoAdd more MSG dissection.
etxrab [Sun, 30 Jan 2011 22:08:22 +0000 (22:08 +0000)]
Add more MSG dissection.

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

13 years agoWhen searching a list, validate pointer before (not after) trying to use it.
wmeier [Sun, 30 Jan 2011 21:56:05 +0000 (21:56 +0000)]
When searching a list, validate pointer before (not after) trying to use it.

In this particular case, the code logic may ensure that
 the search thru the list never hits the end of the list so that a
 crash because of an attempt to deref a NULL pointer never happens.

Issue found via msvc level 4 warning "code not reachable".

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

13 years agoIntroduce "Fragment count" filter element for all protocols doing reassembly.
stig [Sun, 30 Jan 2011 21:01:07 +0000 (21:01 +0000)]
Introduce "Fragment count" filter element for all protocols doing reassembly.

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

13 years agoMoved packet-t38.c to the ASN.1 section.
stig [Sun, 30 Jan 2011 20:59:39 +0000 (20:59 +0000)]
Moved packet-t38.c to the ASN.1 section.

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

13 years agoFrom Alexis La Goutte:
etxrab [Sun, 30 Jan 2011 18:44:53 +0000 (18:44 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Make checkhf Happy
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636
Pach #1,#2;#3

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-01-30]
gerald [Sun, 30 Jan 2011 16:05:20 +0000 (16:05 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-01-30]

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

13 years agoFrom Grzegorz Szczytowski:
etxrab [Sun, 30 Jan 2011 11:32:42 +0000 (11:32 +0000)]
From Grzegorz Szczytowski:
Add Bearer Control Mode selection support in gtpv1 dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5634
Sligtly reworked by me:
- prefix names with gtp
- Use proto_tree_add_item()
- remove ref to specific protocol version, as it's probably a mix.
- Changed the update to the AUTHORS file.

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

13 years agoFrom Alexis La Goutte:
etxrab [Sat, 29 Jan 2011 23:51:06 +0000 (23:51 +0000)]
From Alexis La Goutte:
 Cleanup 802.11 Dissector : Rework Prism Header
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5631

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

13 years agoImprove r35695/35696 by repeating the whole function call in each
sfisher [Sat, 29 Jan 2011 07:47:03 +0000 (07:47 +0000)]
Improve r35695/35696 by repeating the whole function call in each
block of the #if / #else / #endif for clarity.

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

13 years agoFix Windows compile error(s);
wmeier [Sat, 29 Jan 2011 04:41:03 +0000 (04:41 +0000)]
Fix Windows compile error(s);
{Compiles OK on Windows but not tested).

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

13 years agoIf we're compiling with GTK+ 2.14 or higher, use accessor function
sfisher [Sat, 29 Jan 2011 00:30:42 +0000 (00:30 +0000)]
If we're compiling with GTK+ 2.14 or higher, use accessor function
gtk_color_selection_dialog_get_color_selection() instead of accessing
the struct member directly.

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

13 years agoI believe 0 was meant instead of sizeof(0)....
wmeier [Fri, 28 Jan 2011 21:02:40 +0000 (21:02 +0000)]
I believe 0 was meant instead of sizeof(0)....

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

13 years agoMove protocol details from above the copyright notice to below.
sfisher [Fri, 28 Jan 2011 20:37:28 +0000 (20:37 +0000)]
Move protocol details from above the copyright notice to below.

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

13 years agoRemove the remaining tvb_fake_unicode() calls in the dissector source.
sfisher [Fri, 28 Jan 2011 20:15:41 +0000 (20:15 +0000)]
Remove the remaining tvb_fake_unicode() calls in the dissector source.

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

13 years agoFix r35690: tvb_get_unicode_string() takes length in 8-bit bytes, not
sfisher [Fri, 28 Jan 2011 20:12:12 +0000 (20:12 +0000)]
Fix r35690: tvb_get_unicode_string() takes length in 8-bit bytes, not
16-bit UTF-16 characters as tvb_fake_unicode() did.

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

13 years agoChange tvb_fake_unicode() to tvb_get_unicode_string() in the DCERPC
sfisher [Fri, 28 Jan 2011 20:07:18 +0000 (20:07 +0000)]
Change tvb_fake_unicode() to tvb_get_unicode_string() in the DCERPC
DRSUAPI dissector.  Updated the packet-dcerpc-drsuapi.c file manually
because it used to be auto-generated, but appears to have had changes
since then.

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

13 years agoMention that the fake tvb unicode functions have been superceded
sfisher [Fri, 28 Jan 2011 20:01:01 +0000 (20:01 +0000)]
Mention that the fake tvb unicode functions have been superceded

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

13 years agoAdd an option to enable Code Analysis for C/C++ (MSVC's static analyzer).
gerald [Fri, 28 Jan 2011 18:42:49 +0000 (18:42 +0000)]
Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer).

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

13 years agoUse the correct processor architecture in our manifest. This lets us
gerald [Fri, 28 Jan 2011 00:21:05 +0000 (00:21 +0000)]
Use the correct processor architecture in our manifest. This lets us
create a usable wireshark.exe for x64 using Visual C++ 10.  Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.

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

13 years agoFix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly
sfisher [Fri, 28 Jan 2011 00:20:37 +0000 (00:20 +0000)]
Fix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly

Add 30 years of seconds, not 20 years, since the DHCP_LLT time is seconds
since Jan 1 2000 and epoch is 30 years before that.

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

13 years agoFix chekcAPIs.
gerald [Thu, 27 Jan 2011 19:04:14 +0000 (19:04 +0000)]
Fix chekcAPIs.

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

13 years agoFrom Johannes Berg via bug 5625:
gerald [Thu, 27 Jan 2011 17:45:45 +0000 (17:45 +0000)]
From Johannes Berg via bug 5625:

The radiotap standard just adopted the new MCS field to display MCS
information. The attached patch allows wireshark to parse that field.

From me:

Terminate value_strings. Move the IEEE80211_RADIOTAP_XCHANNEL definition
to packet-radiotap-defs.h.

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

13 years agoUse g_error() (with a hopefully-useful error message) instead of g_assert() to report...
morriss [Thu, 27 Jan 2011 17:31:41 +0000 (17:31 +0000)]
Use g_error() (with a hopefully-useful error message) instead of g_assert() to report problems with preference registrations.

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

13 years agoImprove/rework the way we look for the original frame when there is a DL. retransmission.
martinm [Thu, 27 Jan 2011 16:09:24 +0000 (16:09 +0000)]
Improve/rework the way we look for the original frame when there is a DL. retransmission.

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

13 years agoFrom Roberto Morro: RSVP dissector enhancements
wmeier [Thu, 27 Jan 2011 16:08:41 +0000 (16:08 +0000)]
From Roberto Morro: RSVP dissector enhancements

- add new PROTECTION obj c-type 2 (RFC4872)
- add new TLVs for IF_ID (RFC4920)
- add Path Key subobj in ERO (RFC5520)
- add new ASSOCIATION obj c-type 4 (oif2008.389)
- add new LSP_ATTRIBUTES and LSP_REQUIRED_ATTRIBUTES objects (RFC5420)
- improved ERROR object dissection and new error values added
- ADMIN_STATUS transformed to filter and new flags added
- minor fix to conversation (not applied to ACK, SREFRESH and HELLO messages)
to resolv displaying of "Unknown session type" string in such messages

Moreover, I've deleted some "enum" statements for error values that I thought
they were useless since they were used only once throughout the RSVP dissector
code.

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

From me: fix two typos.

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

13 years agoDon't treat the aligned and unaligned bit strings differently
etxrab [Thu, 27 Jan 2011 15:48:02 +0000 (15:48 +0000)]
Don't treat the aligned and unaligned bit strings differently
always padd LSBs.
 Hopfully this does not break anything else...

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

13 years agoThe attemt to pretify MSISDN and IMSI breaks the dissection.
etxrab [Thu, 27 Jan 2011 15:43:55 +0000 (15:43 +0000)]
The attemt to pretify MSISDN and IMSI breaks the dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593

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

13 years agoFrom Masatake YAMATO: Updating value_string for dlm3.m.result
wmeier [Thu, 27 Jan 2011 14:41:38 +0000 (14:41 +0000)]
From Masatake YAMATO: Updating value_string for dlm3.m.result

... some values are added to value_string table for
dlm3.m.result. It reflects the latest dlm code in linux kernel.

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

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

13 years agoFix a typo and prettify some printouts.
etxrab [Thu, 27 Jan 2011 11:23:22 +0000 (11:23 +0000)]
Fix a typo and prettify some printouts.

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

13 years agoRemoved duplicate hf_gsm_a_bssmap_lsa_only registry.
stig [Thu, 27 Jan 2011 07:45:31 +0000 (07:45 +0000)]
Removed duplicate hf_gsm_a_bssmap_lsa_only registry.

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

13 years agoMissing a Users Guide graphic.
jake [Thu, 27 Jan 2011 07:26:21 +0000 (07:26 +0000)]
Missing a Users Guide graphic.

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

13 years agoFrom Stéphane Bryant: bug fixes and improvements in RELOAD dissector:
wmeier [Thu, 27 Jan 2011 03:39:16 +0000 (03:39 +0000)]
From Stéphane Bryant: bug fixes and improvements in RELOAD dissector:
*Bug Fixes
*NodeId length is now configurable
*Added missing messages

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

From me:
-Remove trailing blanks from a few lines;
-Put "editor mode lines" at the end of the source file.

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

13 years agoFix compilation errors
sfisher [Wed, 26 Jan 2011 23:11:08 +0000 (23:11 +0000)]
Fix compilation errors

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

13 years agoAdd expert info related to gap ack blocks.
tuexen [Wed, 26 Jan 2011 21:21:16 +0000 (21:21 +0000)]
Add expert info related to gap ack blocks.
Based on a patch submitted by Thomas Dreibholz.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5616

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

13 years agoSharpen the description of preference names.
jake [Wed, 26 Jan 2011 21:20:09 +0000 (21:20 +0000)]
Sharpen the description of preference names.

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

13 years agoAdd MS-SMB2 to the list of URLs to reference for this protocol.
sfisher [Wed, 26 Jan 2011 21:00:06 +0000 (21:00 +0000)]
Add MS-SMB2 to the list of URLs to reference for this protocol.

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

13 years agoImprove display of names and descriptions of SMB2 share flags and
sfisher [Wed, 26 Jan 2011 20:58:26 +0000 (20:58 +0000)]
Improve display of names and descriptions of SMB2 share flags and
share capabilities including adding two new flags with the help of
the MS-SMB2 specification.

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

13 years agoMinor changs to NetBIOS Session Service code:
sfisher [Wed, 26 Jan 2011 20:29:44 +0000 (20:29 +0000)]
Minor changs to NetBIOS Session Service code:

 - Simplify a proto_tree_add_uint() call into proto_tree_add_item()
 - Mention RFC 1002 in comment above message type definitions
 - Expand field descriptions for length field

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

13 years agoAdd references to Windows 7 where appropriate; Add temp file info for Windows 7/Vista.
wmeier [Wed, 26 Jan 2011 20:23:18 +0000 (20:23 +0000)]
Add references to Windows 7 where appropriate; Add temp file info for Windows 7/Vista.

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

13 years agoDissect PS-HANDOVER-REQUEST.
etxrab [Wed, 26 Jan 2011 19:44:23 +0000 (19:44 +0000)]
Dissect PS-HANDOVER-REQUEST.

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

13 years agoAdd 10.5.1.14 NAS container for PS HO.
etxrab [Wed, 26 Jan 2011 19:37:30 +0000 (19:37 +0000)]
Add 10.5.1.14 NAS container for PS HO.

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

13 years agoAdd tfs_allowed_not_allowed.
etxrab [Wed, 26 Jan 2011 19:36:00 +0000 (19:36 +0000)]
Add tfs_allowed_not_allowed.

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

13 years agoMinor changes to SMB2 Share Type value string: rename values and change
sfisher [Wed, 26 Jan 2011 19:01:10 +0000 (19:01 +0000)]
Minor changes to SMB2 Share Type value string: rename values and change
from 2 bytes to 1 byte (the next byte is reserved) according to MS-SMB2
specification.

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

13 years agoFrom Irene Ruengeler: Double check that the interface specified in the
tuexen [Wed, 26 Jan 2011 15:15:20 +0000 (15:15 +0000)]
From Irene Ruengeler: Double check that the interface specified in the
preferences still exists. If not, don't use it.

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

13 years agoCorrected entry for packet-lisp-data.c
stig [Wed, 26 Jan 2011 09:37:35 +0000 (09:37 +0000)]
Corrected entry for packet-lisp-data.c

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

13 years agopacket-ocsp-template.c:47: warning: type defaults to 'int' in declaration of 'proto_ocsp'
etxrab [Wed, 26 Jan 2011 09:07:11 +0000 (09:07 +0000)]
packet-ocsp-template.c:47: warning: type defaults to 'int' in declaration of 'proto_ocsp'

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

13 years agoFrom Kaspar Brand:
etxrab [Wed, 26 Jan 2011 08:57:26 +0000 (08:57 +0000)]
From Kaspar Brand:
(Part II)
SSL/TLS dissector: add support for "Certificate Status" messages (aka OCSP stapling)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5503

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

13 years agoFrom Kaspar Brand:
etxrab [Wed, 26 Jan 2011 08:49:06 +0000 (08:49 +0000)]
From Kaspar Brand:
SSL/TLS dissector: add support for "Certificate Status" messages (aka OCSP stapling)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5503

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

13 years agoFrom Alexis La Goutte:
etxrab [Wed, 26 Jan 2011 07:47:31 +0000 (07:47 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Header Field begin by hf_...
Patch 4 - 6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

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

13 years agoFrom Brian Ginsbach:
jake [Wed, 26 Jan 2011 07:24:06 +0000 (07:24 +0000)]
From Brian Ginsbach:
Patch to add a new dissector for Realm Specific IP (RSIP) as defined by
RFC 3102, RFC 3103, and RFC 3104.
This is a very basic dissector.  It could be extended to do addtional RSIP
protocol violation testing.  The dissector is written such that it should be
easy to add later.

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

13 years ago(Trivial) Fix a typo.
wmeier [Wed, 26 Jan 2011 00:15:01 +0000 (00:15 +0000)]
(Trivial) Fix a typo.

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

13 years agoFix fo bug 5616:
jake [Tue, 25 Jan 2011 22:11:59 +0000 (22:11 +0000)]
Fix fo bug 5616:
Remove the filters on IPv6 Link Local and Multicast addresses, since
these _can_ be resolved through the hosts file and manual entry.

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

13 years agoFix gcc compilation.
gerald [Tue, 25 Jan 2011 18:43:43 +0000 (18:43 +0000)]
Fix gcc compilation.

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

13 years agoSwitch more messages over to the "gsm dissector style".
etxrab [Tue, 25 Jan 2011 16:41:59 +0000 (16:41 +0000)]
Switch more messages over to the "gsm dissector style".

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

13 years agopacket-windows-common.c:1492: warning: 'wkwn_sid2_len' may be used uninitialized...
etxrab [Tue, 25 Jan 2011 15:34:52 +0000 (15:34 +0000)]
packet-windows-common.c:1492: warning: 'wkwn_sid2_len' may be used uninitialized in this function

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

13 years agoFix:
etxrab [Tue, 25 Jan 2011 15:33:36 +0000 (15:33 +0000)]
Fix:
Error: the blurb for field "Well-known SID" ("nt.sid.wkwn") matches the field name in packet-windows-common.c

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

13 years agoExport de_emm_trac_area_id.
etxrab [Tue, 25 Jan 2011 13:57:59 +0000 (13:57 +0000)]
Export de_emm_trac_area_id.

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

13 years agoExport Global-ENB-ID.
etxrab [Tue, 25 Jan 2011 13:56:15 +0000 (13:56 +0000)]
Export Global-ENB-ID.

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

13 years agoAdd tfs_reliable_not_reliable.
etxrab [Tue, 25 Jan 2011 13:55:20 +0000 (13:55 +0000)]
Add tfs_reliable_not_reliable.

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

13 years agoFrom Cal Turney:
etxrab [Tue, 25 Jan 2011 13:53:35 +0000 (13:53 +0000)]
From Cal Turney:
 Enhancements to SID dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5613

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

13 years agoFrom Jouni Malinen:
jake [Mon, 24 Jan 2011 22:04:43 +0000 (22:04 +0000)]
From Jouni Malinen:
Allow TDLS Setup Response/Confirm to not include optional fields

Verifying whether non-zero status code is used and use explicit validation of
the remaining length and an expert info instead of implicit failure by an
exception.

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

13 years ago From Alexis La Goutte:
wmeier [Mon, 24 Jan 2011 20:54:20 +0000 (20:54 +0000)]
 From Alexis La Goutte:
 Some patch to cleanup the 802.11 Dissector.
 Part 3:  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

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

13 years agoPrint "0 seconds" when time_val==0 in functions converting seconds to string.
stig [Mon, 24 Jan 2011 19:33:36 +0000 (19:33 +0000)]
Print "0 seconds" when time_val==0 in functions converting seconds to string.

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

13 years ago1.5.0 → 1.5.1.
gerald [Mon, 24 Jan 2011 19:27:38 +0000 (19:27 +0000)]
1.5.0 → 1.5.1.

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

13 years agoFix crash when doing File ! Export ! Objects ! SMB.
wmeier [Mon, 24 Jan 2011 18:59:26 +0000 (18:59 +0000)]
Fix crash when doing File ! Export ! Objects ! SMB.
[Essentially: simplify the code used to test for duplicate packets].
Fixes Bug #5337: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5337

Also:
- Fix "divide by 0" which caused garbage for display of a percent value;
- Remove some unneeded #includes;

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

13 years agoBuild 1.5.0.
gerald [Mon, 24 Jan 2011 18:37:24 +0000 (18:37 +0000)]
Build 1.5.0.

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

13 years agoExport UE-EUTRA-Capability.
etxrab [Sun, 23 Jan 2011 23:45:36 +0000 (23:45 +0000)]
Export UE-EUTRA-Capability.

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

13 years agoFix a crash which can occur if a user hits "Capture:Options" immediately followed...
wmeier [Sun, 23 Jan 2011 20:59:12 +0000 (20:59 +0000)]
Fix a crash which can occur if a user hits "Capture:Options" immediately followed by "Capture:Start"

Fixes Bug #4645: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4645

Essentially: The "Capture Start" code "interrupted" the "Capture Options" code and attempted
 to use not yet initialized "Capture Options" state.

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

13 years agoFrom Alexis La Goutte:
jake [Sun, 23 Jan 2011 20:15:31 +0000 (20:15 +0000)]
From Alexis La Goutte:
Some patch to cleanup the 802.11 Dissector.

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

13 years agoFrom Alexis La Goutte:
jake [Sun, 23 Jan 2011 20:11:08 +0000 (20:11 +0000)]
From Alexis La Goutte:
Some patch to cleanup the 802.11 Dissector.

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

13 years agoReword some text about the accuracy of the dislayed values.
wmeier [Sun, 23 Jan 2011 17:29:06 +0000 (17:29 +0000)]
Reword some text about the accuracy of the dislayed values.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-01-23]
gerald [Sun, 23 Jan 2011 16:03:54 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-01-23]

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