obnox/wireshark/wip.git
9 years agoAdd some information about how/why this dissector is (partially) machine-generated...
morriss [Tue, 27 Apr 2010 13:50:43 +0000 (13:50 +0000)]
Add some information about how/why this dissector is (partially) machine-generated and what that means to Wireshark maintainers.

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

9 years agoFrom Jakub Zawadzki:
etxrab [Tue, 27 Apr 2010 12:38:49 +0000 (12:38 +0000)]
From Jakub Zawadzki:
 - use function pointers instead of switch.
 - initalize ->match_type during first use of match_str() func.

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

9 years agoWhitespace changes.
etxrab [Tue, 27 Apr 2010 10:35:12 +0000 (10:35 +0000)]
Whitespace changes.

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

9 years agoFrom Jakub Zawadzki:
etxrab [Tue, 27 Apr 2010 10:32:34 +0000 (10:32 +0000)]
From Jakub Zawadzki:
Itroduce value_string_ext for faster value matching in value_strings.

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

9 years agoExport add_ip_name_from_string from epan.
stig [Tue, 27 Apr 2010 07:41:34 +0000 (07:41 +0000)]
Export add_ip_name_from_string from epan.

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

9 years agoSquelch some compiler complaints.
guy [Tue, 27 Apr 2010 07:41:28 +0000 (07:41 +0000)]
Squelch some compiler complaints.

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

9 years agoAdded Manual IP address resolve functions.
stig [Tue, 27 Apr 2010 06:51:16 +0000 (06:51 +0000)]
Added Manual IP address resolve functions.

This can later be extended with ethernet and probably other addresses.

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

9 years agoFrom David Bond: TRILL (TRansparent Interconnection of Lots of Links) dissector
wmeier [Tue, 27 Apr 2010 00:06:35 +0000 (00:06 +0000)]
From David Bond: TRILL (TRansparent Interconnection of Lots of Links) dissector

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

9 years agoMove proto_reg_handoff... to the end of the file.
wmeier [Mon, 26 Apr 2010 22:19:34 +0000 (22:19 +0000)]
Move proto_reg_handoff... to the end of the file.
Whitespace cleanup: remove trailing spaces from a few lines.

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

9 years agoMove proto_reg_handoff... to the end of the file.
wmeier [Mon, 26 Apr 2010 22:12:48 +0000 (22:12 +0000)]
Move proto_reg_handoff... to the end of the file.

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

9 years agoVarious:
wmeier [Mon, 26 Apr 2010 21:50:09 +0000 (21:50 +0000)]
Various:
 - Fix bugs which caused incorrect packet-bytes highlighting for certain fields;
 - Display all "extended services" fields;
 - Minor code cleanup in several places;
 - Whitespace: Tabs ==> spaces.
(More changes yet to come to handle multiple PDUs in a single packet).

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

9 years agoReindent a bunch
morriss [Mon, 26 Apr 2010 20:48:13 +0000 (20:48 +0000)]
Reindent a bunch

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

9 years agoRemove some boilerplate text; Shorten a few long lines.
wmeier [Mon, 26 Apr 2010 15:30:00 +0000 (15:30 +0000)]
Remove some boilerplate text; Shorten a few long lines.

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

9 years agoDocument ESS Category Attributes UAT.
stig [Mon, 26 Apr 2010 12:19:04 +0000 (12:19 +0000)]
Document ESS Category Attributes UAT.

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

9 years agoClean up properly if we get an error after allocating the private data
guy [Mon, 26 Apr 2010 02:26:22 +0000 (02:26 +0000)]
Clean up properly if we get an error after allocating the private data
structure.

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

9 years agoThe comment here suggests fields should have abbreviations but previously we only...
morriss [Mon, 26 Apr 2010 00:31:06 +0000 (00:31 +0000)]
The comment here suggests fields should have abbreviations but previously we only checked if a string (even an empty string) was given.  Try putting out a warning if a field has an empty string for an abbreviation.

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

9 years agoMake the OpcUa plugin's fields filterable (by giving them abbreviations).
morriss [Mon, 26 Apr 2010 00:15:30 +0000 (00:15 +0000)]
Make the OpcUa plugin's fields filterable (by giving them abbreviations).
(Thank you, sed, for doing the 90% of the work for me.)

Note that two of these files says "do not modify" implying that they are
machine generated but AFAIK we don't have the means to rebuild them.

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

9 years agoAdd dissection of Class Based Flow Control Pause frames.
wmeier [Sun, 25 Apr 2010 21:46:18 +0000 (21:46 +0000)]
Add dissection of Class Based Flow Control Pause frames.

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

9 years agoEmpty strings are not very useful abbreviations. Even if it seems unlikely someone...
morriss [Sun, 25 Apr 2010 17:38:46 +0000 (17:38 +0000)]
Empty strings are not very useful abbreviations.  Even if it seems unlikely someone would want to filter on a specific field, we should give the user the option.

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

9 years agoSlightly reword the preference text about CCSDS packets.
wmeier [Sun, 25 Apr 2010 17:34:32 +0000 (17:34 +0000)]
Slightly reword the preference text about CCSDS packets.

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

9 years agoReapply SVN #27273 which was lost when SSVN #27768 was aspplied.
wmeier [Sun, 25 Apr 2010 16:37:08 +0000 (16:37 +0000)]
Reapply SVN #27273 which was lost when SSVN #27768 was aspplied.
"http://stationpayloads.jsc.nasa.gov/J-reference/documents/ssp57002B.pdf
is a dead link; supply another link, to a document that describes *some*
of this."

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-04-25]
gerald [Sun, 25 Apr 2010 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-04-25]

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

9 years agoChange copyright date in sample dissector code to 201x from 200x for the
sfisher [Sun, 25 Apr 2010 08:23:12 +0000 (08:23 +0000)]
Change copyright date in sample dissector code to 201x from 200x for the
new decade.

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

9 years agoMake the absolute_time_display_e enum start at 1000 to avoid overlapping with
morriss [Sat, 24 Apr 2010 19:07:21 +0000 (19:07 +0000)]
Make the absolute_time_display_e enum start at 1000 to avoid overlapping with
the base_display_e enum.

Fix a couple of dissectors that were still using FT_ABSOLUTE_TIME with
BASE_NONE.  (The time format chosen is based only on an attempt to not change
the behavior.  I don't know that it's right.)  One of these is built by Pidl.
I'll send a patch upstream too.

When checking hfinfos, display the absolute_time_display_e values too.
Display "bit count: X" instead of "unknown" when the display value doesn't
match one of the enumerated values.

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

9 years ago64-bit integers take the same FIELDDISPLAY as shorter integers
morriss [Sat, 24 Apr 2010 14:53:30 +0000 (14:53 +0000)]
64-bit integers take the same FIELDDISPLAY as shorter integers

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

9 years agoDissectors aren't allowed to call g_assert()
morriss [Sat, 24 Apr 2010 14:13:37 +0000 (14:13 +0000)]
Dissectors aren't allowed to call g_assert()

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

9 years agoWhen checking the header_field_infos, use g_error() to give the developer a
morriss [Sat, 24 Apr 2010 03:08:08 +0000 (03:08 +0000)]
When checking the header_field_infos, use g_error() to give the developer a
(hopefully useful) explanation of what's wrong with his/her hfinfo field
rather than just asserting out.

So now instead of just getting a message saying aborted(core dumped), you can
get, for example:

22:31:54          Err  Field 'Message in frame' (sccp.assoc.msg) is an FT_FRAMENUM and is BASE_DEC instead of BASE_NONE

*and* an abort(core dumped) (for those who want it).

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

9 years agoTell, in the version info, if we were compiled 32- or 64-bit.
morriss [Sat, 24 Apr 2010 02:04:14 +0000 (02:04 +0000)]
Tell, in the version info, if we were compiled 32- or 64-bit.

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

9 years agoFrom Alexis La Goutte:
jake [Fri, 23 Apr 2010 21:58:05 +0000 (21:58 +0000)]
From Alexis La Goutte:
Enhancements ISAKMP Vendor ID.

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

9 years agoInterpret international point codes according to Q.708; white space edits
dimeg [Fri, 23 Apr 2010 21:24:32 +0000 (21:24 +0000)]
Interpret international point codes according to Q.708; white space edits

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

9 years agoFrom Vincenzo Condoleo via bug 3724:
gerald [Fri, 23 Apr 2010 21:21:11 +0000 (21:21 +0000)]
From Vincenzo Condoleo via bug 3724:

Update the compare stats documentation.

From me: Add a screen shot and editorial updates. Change some lables to
better match the IP and TCP dissectors.

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

9 years agoRevert r31529. Timing out while waiting for the pcap file header causes
gerald [Fri, 23 Apr 2010 17:22:51 +0000 (17:22 +0000)]
Revert r31529. Timing out while waiting for the pcap file header causes
more problems than it solves.

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

9 years agoAdded a decoding table for ESS Security Category Attributes.
stig [Fri, 23 Apr 2010 12:43:14 +0000 (12:43 +0000)]
Added a decoding table for ESS Security Category Attributes.

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

9 years agoAdded initial support for Dropbox LAN sync Protocol.
stig [Fri, 23 Apr 2010 06:13:34 +0000 (06:13 +0000)]
Added initial support for Dropbox LAN sync Protocol.

This is mostly to recognize the packets and a start to reverse engineer
the currently undocumented protocol.  It's very far from complete/correct!

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

9 years agoFrom Artem Tamazof via bug 3653:
gerald [Thu, 22 Apr 2010 22:18:56 +0000 (22:18 +0000)]
From Artem Tamazof via bug 3653:

MDS dissector works improperly in some corner cases.

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

9 years agoManifests are not needed when building with VC10.
wmeier [Thu, 22 Apr 2010 19:35:47 +0000 (19:35 +0000)]
Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

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

9 years agoSet TA control element expert info based on improved understanding of spec.
martinm [Thu, 22 Apr 2010 17:46:12 +0000 (17:46 +0000)]
Set TA control element expert info based on improved understanding of spec.

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

9 years ago- Lower severity on expert items about Timing Advance if <= 31
martinm [Thu, 22 Apr 2010 13:54:30 +0000 (13:54 +0000)]
- Lower severity on expert items about Timing Advance if <= 31
- Detect original frame for DL HARQ retx also 9 SFs ago (have even seen 10...)
- Getting ready to log 'grant subframe' for UL frames (only interesting for TDD)

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

9 years agoA bit more information.
guy [Thu, 22 Apr 2010 04:50:55 +0000 (04:50 +0000)]
A bit more information.

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

9 years agoMore updates to reflect all the hairy details of Linux USB capture.
guy [Thu, 22 Apr 2010 04:38:48 +0000 (04:38 +0000)]
More updates to reflect all the hairy details of Linux USB capture.

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

9 years agoUpdate a comment to reflect recent changes and to reflect behavior of
guy [Thu, 22 Apr 2010 00:10:17 +0000 (00:10 +0000)]
Update a comment to reflect recent changes and to reflect behavior of
later Linux kernels.

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

9 years agoFrom Chris Maynard:
guy [Wed, 21 Apr 2010 20:51:22 +0000 (20:51 +0000)]
From Chris Maynard:

Support PPP-over-USB.

Don't remove the USB pseudo-header from the packet data for
Linux USB packets, just byte-swap it if necessary and have the
USB dissector fetch the pseudo-header from the raw packet data.

Update USB language ID values.

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

9 years agoRemoved second include <epan/packet.h>.
stig [Wed, 21 Apr 2010 10:15:01 +0000 (10:15 +0000)]
Removed second include <epan/packet.h>.

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

9 years agoExport Certificate PDU so this can be dissected from non-asn dissectors.
stig [Wed, 21 Apr 2010 10:14:04 +0000 (10:14 +0000)]
Export Certificate PDU so this can be dissected from non-asn dissectors.

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

9 years agoPut offset++ back in again.
martinm [Wed, 21 Apr 2010 10:12:03 +0000 (10:12 +0000)]
Put offset++ back in again.

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

9 years agoDo not give a warning for not implemented OID if value is a "NULL tag".
stig [Wed, 21 Apr 2010 10:05:19 +0000 (10:05 +0000)]
Do not give a warning for not implemented OID if value is a "NULL tag".

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

9 years agoAdd settings for "Microsoft Visual Studio 2010" note that
etxrab [Wed, 21 Apr 2010 05:23:29 +0000 (05:23 +0000)]
Add settings for "Microsoft Visual Studio 2010" note that
Wireshark does not build with Visual studio 10 yet.

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

9 years agoExport MALLOC_CHECK_=3 when fuzz testing in case we're on a glibc-based system:
morriss [Wed, 21 Apr 2010 00:53:24 +0000 (00:53 +0000)]
Export MALLOC_CHECK_=3 when fuzz testing in case we're on a glibc-based system:
this value will cause glibc to do some memory allocation checking for us and
abort if it finds a problem.

(If we're not on a glibc-based system this will have no effect but should also
do no harm.)

(I think the buildbot already runs with this set but it's better for all of us
to have it set, too.)

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

9 years agoUpdate Peter Harris' entry
morriss [Wed, 21 Apr 2010 00:49:29 +0000 (00:49 +0000)]
Update Peter Harris' entry

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

9 years agoFrom Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4701 :
morriss [Wed, 21 Apr 2010 00:47:55 +0000 (00:47 +0000)]
From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4701 :

The ChangeProperty request always calls LISTofBYTE, which always tries to
dissect at least one byte, even when the request is empty. This causes
Wireshark to put a big, red, scary "Malformed Packet" entry in the dissection.

Also, ChangeProperty only dissects (data_length) bytes. data_length is "number
of units", and units may be 16 or 32-bit entities. In this case, the dissected
data will be truncated.

First reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481#c10

The attached patch fixes these two bugs.

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

9 years agoFrom Jakub Zawadzki:
etxrab [Tue, 20 Apr 2010 17:32:12 +0000 (17:32 +0000)]
From Jakub Zawadzki:
Add support for multi byte entries.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4413

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

9 years agoFrom Pascal Quantin:
martinm [Tue, 20 Apr 2010 15:41:03 +0000 (15:41 +0000)]
From Pascal Quantin:
Don't report as an error if see non-zero padding bits.

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

9 years agoUpdate the services file from IANA's port-numbers.
stig [Tue, 20 Apr 2010 10:51:58 +0000 (10:51 +0000)]
Update the services file from IANA's port-numbers.

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

9 years agoFrom Jakub Zawadzki:
etxrab [Tue, 20 Apr 2010 07:47:33 +0000 (07:47 +0000)]
From Jakub Zawadzki:
Improve bitview display

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

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

9 years agoFrom Tamas Regos via bug 4699:
stig [Tue, 20 Apr 2010 06:24:30 +0000 (06:24 +0000)]
From Tamas Regos via bug 4699:
Added get_version() Lua function to get Wireshark version.

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

9 years agoFrom Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :
morriss [Tue, 20 Apr 2010 00:18:51 +0000 (00:18 +0000)]
From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :

The XKEYBOARD extension is a pain in the... so XCB had to grow new ways to
describe the protocol.

This patch adds support to the Wireshark dissector, so it can successfully
process the XCB description of the XKEYBOARD extension.

Without this patch, "make x11-dissector" chokes on the current xcbproto from
git.

Also update the script to deal with the new mesa directory structure.

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

9 years agoIf that should truly "never happen", use DISSECTOR_ASSERT_NOT_REACHED()
guy [Mon, 19 Apr 2010 23:38:55 +0000 (23:38 +0000)]
If that should truly "never happen", use DISSECTOR_ASSERT_NOT_REACHED()
so it's more clearly marked as a dissector bug.

(It apparently *does* happen - see bug 4698.)

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

9 years agoMore updates towards V9.2.0 (2010-04).
etxrab [Mon, 19 Apr 2010 20:12:26 +0000 (20:12 +0000)]
More updates towards V9.2.0 (2010-04).

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

9 years agoFix for bug 4695:
jake [Mon, 19 Apr 2010 18:48:12 +0000 (18:48 +0000)]
Fix for bug 4695:
Modify ProtoField_tostring() to ProtoField__tostring()
and clean up description.

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

9 years agoSimplify Makefile.nmake so that adding a new plugin to Makefile.nmake
wmeier [Mon, 19 Apr 2010 14:38:20 +0000 (14:38 +0000)]
Simplify Makefile.nmake so that adding a new plugin to Makefile.nmake
requires only adding the plugin (directory) name to a list of plugins.

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

9 years agoFrom KATAOKA Toshihiro:
etxrab [Mon, 19 Apr 2010 14:06:12 +0000 (14:06 +0000)]
From KATAOKA Toshihiro:
NAS EPC dissector correction.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4696

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

9 years agoUse correct name for gprs-ns.
stig [Mon, 19 Apr 2010 10:34:52 +0000 (10:34 +0000)]
Use correct name for gprs-ns.

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

9 years agoRevision 32295 renamed "nsip" to "gprs_ns".
stig [Mon, 19 Apr 2010 10:23:41 +0000 (10:23 +0000)]
Revision 32295 renamed "nsip" to "gprs_ns".

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

9 years agoImproved dumping when incorrect line ending.
stig [Mon, 19 Apr 2010 09:04:49 +0000 (09:04 +0000)]
Improved dumping when incorrect line ending.

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

9 years agoDisable usage of zlibVersion() on win32.
stig [Mon, 19 Apr 2010 06:39:45 +0000 (06:39 +0000)]
Disable usage of zlibVersion() on win32.

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

9 years agoFrom Tamas Regos:
etxrab [Mon, 19 Apr 2010 06:02:56 +0000 (06:02 +0000)]
From Tamas Regos:
Another bug in packet-gtp.c (mask of Signalling Indication)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4694

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

9 years agoUpdate to V9.1.0 (2010-03).
etxrab [Mon, 19 Apr 2010 05:58:01 +0000 (05:58 +0000)]
Update to V9.1.0 (2010-03).

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

9 years agoUpdate MCC/MNC list; remove double appearance of the same value
dimeg [Sun, 18 Apr 2010 19:34:57 +0000 (19:34 +0000)]
Update MCC/MNC list; remove double appearance of the same value
in the MCC list.

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-04-18]
gerald [Sun, 18 Apr 2010 15:03:27 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-04-18]

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

9 years ago(Trivial) Escape a '?' in an error message.
wmeier [Sun, 18 Apr 2010 14:08:12 +0000 (14:08 +0000)]
(Trivial) Escape a '?' in an error message.

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

9 years agokerberos is currently not actually being used.
wmeier [Sun, 18 Apr 2010 14:06:59 +0000 (14:06 +0000)]
kerberos is currently not actually being used.
Use '_FORCE_' (rather than '::').
Whitespace changes.

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

9 years agoFrom Richard Brodie via bug 4606:
stig [Sat, 17 Apr 2010 10:22:38 +0000 (10:22 +0000)]
From Richard Brodie via bug 4606:
Display runtime version for libz, as well as build version.

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

9 years agoFrom Jakub Zawadzki:
stig [Sat, 17 Apr 2010 10:09:52 +0000 (10:09 +0000)]
From Jakub Zawadzki:
Fix compile without zlib.

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

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3387 (crash
morriss [Fri, 16 Apr 2010 22:48:33 +0000 (22:48 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3387 (crash
when changing the font and deleting a column at the same time while using
the old packet list):

Don't calculate the default column widths until after both the font and column
preferences have been applied.

This isn't a problem in the new packet list.

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

9 years agoFrom Marcus Renz: Fix for "PTP dissector displays big correction field values wrong"
wmeier [Fri, 16 Apr 2010 19:27:56 +0000 (19:27 +0000)]
From Marcus Renz: Fix for "PTP dissector displays big correction field values wrong"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4635

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

9 years agoFrom Alexis La Goutte:
jake [Fri, 16 Apr 2010 19:21:31 +0000 (19:21 +0000)]
From Alexis La Goutte:
Add support of TCP Packet Mood (TCP Option 25)
More information is available in RFC 5841

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

9 years ago(Trivial changes)
wmeier [Fri, 16 Apr 2010 17:28:03 +0000 (17:28 +0000)]
(Trivial changes)

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

9 years ago(Trivial changes)
wmeier [Fri, 16 Apr 2010 17:26:47 +0000 (17:26 +0000)]
(Trivial changes)

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

9 years agoUpdates:
wmeier [Fri, 16 Apr 2010 16:37:31 +0000 (16:37 +0000)]
Updates:
1. Include stdio.h, stdlib.h and string.h only if needed;
2. Add dissector source filename to epan/CMakeLists.txt as well as
   epan/Makefile.common.

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

9 years agoFrom Jens Kilian: VXI-11 (a.k.a. Network Instrument Protocol) dissector
wmeier [Fri, 16 Apr 2010 16:12:29 +0000 (16:12 +0000)]
From Jens Kilian: VXI-11 (a.k.a. Network Instrument Protocol) dissector

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

9 years agoFix a typo
wmeier [Fri, 16 Apr 2010 15:17:18 +0000 (15:17 +0000)]
Fix a typo

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

9 years agoFix a few comment typos
morriss [Fri, 16 Apr 2010 15:05:42 +0000 (15:05 +0000)]
Fix a few comment typos

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

9 years agoSimplify the Makefile ....
wmeier [Fri, 16 Apr 2010 14:50:39 +0000 (14:50 +0000)]
Simplify the Makefile ....

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

9 years agoFix the fuzz failure found in
morriss [Fri, 16 Apr 2010 14:48:30 +0000 (14:48 +0000)]
Fix the fuzz failure found in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4685 :

Don't store pointers to g_malloc()'d memory (in this case GLists) in
se_alloc()'d memory: the se_alloc()'d memory is freed before the reinit
functions are called so it's no longer safe to use.

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

9 years agoAdd an MTP3 equivalent for the SLS
morriss [Fri, 16 Apr 2010 14:05:08 +0000 (14:05 +0000)]
Add an MTP3 equivalent for the SLS

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

9 years agoA previous patch added another implementaion of grps-ns and
jmayer [Fri, 16 Apr 2010 08:34:48 +0000 (08:34 +0000)]
A previous patch added another implementaion of grps-ns and
removed the old implementation from Makefile.common.
This caused a duplicate registration and subsequent assertion
failure for cmake users. Fix this.

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

9 years agoTurn on memory scrubbing when fuzz testing.
morriss [Fri, 16 Apr 2010 00:56:11 +0000 (00:56 +0000)]
Turn on memory scrubbing when fuzz testing.

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

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2742 :
morriss [Fri, 16 Apr 2010 00:54:00 +0000 (00:54 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2742 :

If the user specifies -V or -x, turn on print_packet_info (-S) so they actually
get some output in case we're also writing to a file.

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

9 years agoRemove svn:executable property
wmeier [Fri, 16 Apr 2010 00:21:45 +0000 (00:21 +0000)]
Remove svn:executable property

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

9 years agoEnhance Windows ASN1 Makefiles:
wmeier [Thu, 15 Apr 2010 22:44:02 +0000 (22:44 +0000)]
Enhance Windows ASN1 Makefiles:
1. Implement a 'compare_files' target which can be used when generating
   an individual ASN1 dissector. This generates the dissector and
   then compares the generated .[hc] files with apn\dissectors (rather than
   copying the files to epan\dissectors).
2. Rework asn1\Makefile.nmake to provide additional targets for
   use when building all the ASN1 dissectors.
   - compare_files
   - generate_dissectors [generate but don't copy]

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

9 years ago#include <stdio.h> & <string.h> not needed.
wmeier [Thu, 15 Apr 2010 22:20:59 +0000 (22:20 +0000)]
#include <stdio.h> & <string.h> not needed.

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

9 years agoAs requested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2748 :
morriss [Thu, 15 Apr 2010 21:27:27 +0000 (21:27 +0000)]
As requested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2748 :

Mark the "MTP3 equivalents" fields as generated.  They do come directly from
the packet but the fields themselves are kind-of artificial so it makes some
sense to mark them as "special" somehow.

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

9 years agoFrom Dave Higton:
jake [Thu, 15 Apr 2010 21:12:34 +0000 (21:12 +0000)]
From Dave Higton:
When decoding NTP where the Reference Clock ID is "MSF/0", Wireshark textifies
this as "Rugby (UK) Radio 60 kHz".  The MSF transmitter was moved several years
ago from Rugby to Anthorn.

Also updates from RFC 4330.

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

9 years agoRename FIELDBASE to FIELDDISPLAY, as it's a "how to display this"
guy [Thu, 15 Apr 2010 20:54:27 +0000 (20:54 +0000)]
Rename FIELDBASE to FIELDDISPLAY, as it's a "how to display this"
indication, not necessarily a base (the base is "how to display" some
numeric fields, but it's not how to display some other fields).

Note that FIELDDISPLAY is the number of bits in the field containing an
FT_BOOLEAN bitfield.

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

9 years agoDiameter command codes update.
etxrab [Thu, 15 Apr 2010 20:47:20 +0000 (20:47 +0000)]
Diameter command codes update.

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

9 years agoAs per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4680 :
morriss [Thu, 15 Apr 2010 20:22:23 +0000 (20:22 +0000)]
As per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4680 :

Update the link to point to MSVC 2008EE now that 2010 is out.

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

9 years agoFix fuzz failure in bug 4671: don't assume the conversation data exists (check for...
morriss [Thu, 15 Apr 2010 20:09:46 +0000 (20:09 +0000)]
Fix fuzz failure in bug 4671: don't assume the conversation data exists (check for a NULL pointer).  Also correct a typo (assignment to wrong variable).

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

9 years agoRevise comment on use of 'display' field in hf[] entry to show
wmeier [Thu, 15 Apr 2010 19:40:11 +0000 (19:40 +0000)]
Revise comment on use of 'display' field in hf[] entry to show
that for FT_BOOLEAN the display field contains the bit-field width
only when hf[] entry bitmask is non-zero.

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

9 years agoFix a typo
wmeier [Thu, 15 Apr 2010 19:33:33 +0000 (19:33 +0000)]
Fix a typo

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

9 years agoFrom Tamas Regos:
etxrab [Thu, 15 Apr 2010 17:58:54 +0000 (17:58 +0000)]
From Tamas Regos:
Harmless typo and whitespace bugs in packet-gtp.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4677
(didn't apply cleanly so partly applied by hand).

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