obnox/wireshark/wip.git
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

9 years agoFrom Clark Tucker:
etxrab [Thu, 15 Apr 2010 17:49:15 +0000 (17:49 +0000)]
From Clark Tucker:
RTPS2 dissector update.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4672

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

9 years agoMake it build without zlib on OSX.
stig [Thu, 15 Apr 2010 13:59:15 +0000 (13:59 +0000)]
Make it build without zlib on OSX.

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

9 years agoLet's try that again: Reword comment.
wmeier [Thu, 15 Apr 2010 02:32:59 +0000 (02:32 +0000)]
Let's try that again: Reword comment.

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

9 years agoReword comment slightly.
wmeier [Thu, 15 Apr 2010 02:21:24 +0000 (02:21 +0000)]
Reword comment slightly.

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

9 years agoCopyedit.
guy [Wed, 14 Apr 2010 22:33:23 +0000 (22:33 +0000)]
Copyedit.

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

9 years agoSome changes req'd to build Wireshark with VS 2010 (VC10). [More changes still needed].
wmeier [Wed, 14 Apr 2010 21:56:00 +0000 (21:56 +0000)]
Some changes req'd to build Wireshark with VS 2010 (VC10). [More changes still needed].

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

9 years agoFix the build
morriss [Wed, 14 Apr 2010 21:38:08 +0000 (21:38 +0000)]
Fix the build

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

9 years agoUse the sample rate from SDP info in RTP stream analysis.
etxrab [Wed, 14 Apr 2010 20:48:37 +0000 (20:48 +0000)]
Use the sample rate from SDP info in RTP stream analysis.

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

9 years agoBe sure we initialize the p_id in hf's. This fixes
morriss [Wed, 14 Apr 2010 18:39:00 +0000 (18:39 +0000)]
Be sure we initialize the p_id in hf's.  This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3010 .

Also finish the implementation of ShowTimes for GOGs so that the variable gets
initialized (preventing another uninitialized variable warning from Valgrind).

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

9 years agoFix up MATE's hf display values so MATE will actually run.
morriss [Wed, 14 Apr 2010 14:20:16 +0000 (14:20 +0000)]
Fix up MATE's hf display values so MATE will actually run.

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

9 years agoSIP headers are case-insensitive, fix case sensitivity introduced probably by mistake
kukosa [Wed, 14 Apr 2010 12:07:29 +0000 (12:07 +0000)]
SIP headers are case-insensitive, fix case sensitivity introduced probably by mistake

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

9 years agoAdded packet-pkixac.h
stig [Wed, 14 Apr 2010 10:04:13 +0000 (10:04 +0000)]
Added packet-pkixac.h

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

9 years agoMoved pkixac to clean dissectors.
stig [Wed, 14 Apr 2010 08:51:28 +0000 (08:51 +0000)]
Moved pkixac to clean dissectors.

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

9 years agoAdded PKIXAttributeCertificate (RFC3281).
stig [Wed, 14 Apr 2010 08:42:24 +0000 (08:42 +0000)]
Added PKIXAttributeCertificate (RFC3281).

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

9 years agoRegister SignedData as a BER syntax dissector.
stig [Wed, 14 Apr 2010 07:57:01 +0000 (07:57 +0000)]
Register SignedData as a BER syntax dissector.

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

9 years agoIn the section on WIRESHARK_ABORT_ON_DISSECTOR_BUG, give the name of the
guy [Wed, 14 Apr 2010 00:46:29 +0000 (00:46 +0000)]
In the section on WIRESHARK_ABORT_ON_DISSECTOR_BUG, give the name of the
program the man page describes, and give a bit more detail.

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

9 years agoAdd an entry to the environment variable section about WIRESHARK_ABORT_ON_DISSECTOR_BUG
morriss [Tue, 13 Apr 2010 22:08:56 +0000 (22:08 +0000)]
Add an entry to the environment variable section about WIRESHARK_ABORT_ON_DISSECTOR_BUG

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

9 years agoFix for bug 4535: The SSL dissector can not correctly resemple SSL records when the...
sake [Tue, 13 Apr 2010 19:37:44 +0000 (19:37 +0000)]
Fix for bug 4535: The SSL dissector can not correctly resemple SSL records when the record header is spit between packets

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

9 years agoExtract encoding name and sample rate
etxrab [Tue, 13 Apr 2010 19:27:14 +0000 (19:27 +0000)]
Extract encoding name and sample rate
i.e "AMR/8000"
This string can then be put in the hastable, extracted by
packet-rtp.c and split into "AMR" and "8000"
sample rate can then be a part of rtp_info and get rid of the
clock rate maping.
(I have some problem splitting the string, help apreciated) :-)

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

9 years agoInclude (horizontal) tabs in the Copy (Printable Text Only) output. This
morriss [Tue, 13 Apr 2010 17:56:59 +0000 (17:56 +0000)]
Include (horizontal) tabs in the Copy (Printable Text Only) output.  This
fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2921 .

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

9 years agoFrom Ivan Sy:
jake [Tue, 13 Apr 2010 17:38:53 +0000 (17:38 +0000)]
From Ivan Sy:
Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535
for the CD Bit.

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

9 years agoPoint out that hostname and MAC address resolution in capture filters will not
morriss [Mon, 12 Apr 2010 21:35:19 +0000 (21:35 +0000)]
Point out that hostname and MAC address resolution in capture filters will not
use any of the Wireshark "personal" files.

This helps to address the complaint in:

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

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

9 years agoUpdate to V9.2.0 (2010-03).
etxrab [Mon, 12 Apr 2010 19:35:51 +0000 (19:35 +0000)]
Update to V9.2.0 (2010-03).

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

9 years agoUpdate to V9.2.0 (2010-03).
etxrab [Mon, 12 Apr 2010 19:13:36 +0000 (19:13 +0000)]
Update to V9.2.0 (2010-03).

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

10 years agoAttempt (blindly--I don't have a Mac) to fix
morriss [Mon, 12 Apr 2010 16:26:27 +0000 (16:26 +0000)]
Attempt (blindly--I don't have a Mac) to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2844 :

Quote all references to $HOME in case that variable has a space in it.

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

10 years agoAdd remark about including packet.h before tap.h
jake [Mon, 12 Apr 2010 16:06:52 +0000 (16:06 +0000)]
Add remark about including packet.h before tap.h

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

10 years agoFrom KATAOKA Toshihiro:
etxrab [Mon, 12 Apr 2010 07:23:49 +0000 (07:23 +0000)]
From KATAOKA Toshihiro:
3GPP Gx "Online" AVP is not decoded because of missing vendor-id.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4662

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

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

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

10 years agoPartly revert the changes made to epan/proto.c in SVN-29490
sake [Sat, 10 Apr 2010 19:19:13 +0000 (19:19 +0000)]
Partly revert the changes made to epan/proto.c in SVN-29490
because they break 'tshark -r <file> -q -z io,phs' (no statistics
are shown, unless you omit the -q and use -V).

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

10 years agoFix the build.
gerald [Sat, 10 Apr 2010 01:45:36 +0000 (01:45 +0000)]
Fix the build.

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

10 years agoFix the U3 and PortableApps builds.
gerald [Fri, 9 Apr 2010 23:51:22 +0000 (23:51 +0000)]
Fix the U3 and PortableApps builds.

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

10 years agoRename README.win32 to README.windows and add a 64-bit download link.
gerald [Fri, 9 Apr 2010 21:42:51 +0000 (21:42 +0000)]
Rename README.win32 to README.windows and add a 64-bit download link.

Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

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

10 years agoAdd AVP:s
etxrab [Fri, 9 Apr 2010 17:10:43 +0000 (17:10 +0000)]
Add AVP:s

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

10 years agoUpdate AVP.s
etxrab [Fri, 9 Apr 2010 14:47:27 +0000 (14:47 +0000)]
Update AVP.s

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

10 years agoMore hf renaming.
etxrab [Fri, 9 Apr 2010 05:58:48 +0000 (05:58 +0000)]
More hf renaming.

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

10 years agoFrom Jouni Malinen:
etxrab [Fri, 9 Apr 2010 05:46:30 +0000 (05:46 +0000)]
From Jouni Malinen:
Add a dissection ofr FT Action frames (part of IEEE 802.11r)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4658
From me name header fields a bit more consistent.

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

10 years agoAs requested in:
morriss [Fri, 9 Apr 2010 02:09:10 +0000 (02:09 +0000)]
As requested in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2132

Point to the Wiki's page on capture filter syntax in case neither libpcap's
nor tcpdump's man pages are available (e.g., on Windows).

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

10 years agoSquelch compiler warnings. (We know that header.content_length is less
guy [Fri, 9 Apr 2010 02:00:07 +0000 (02:00 +0000)]
Squelch compiler warnings.  (We know that header.content_length is less
than a value that fits into an int, so we know its value will fit into
an int.)

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

10 years agoUse a 64-bit number to store the content length. This fixes:
morriss [Fri, 9 Apr 2010 01:42:12 +0000 (01:42 +0000)]
Use a 64-bit number to store the content length.  This fixes:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1958

Of course this doesn't mean we can reassemble that much data.

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

10 years agoFix for Bug 4651:
dimeg [Thu, 8 Apr 2010 19:40:57 +0000 (19:40 +0000)]
Fix for Bug 4651:
Dissector call used uninitialized packet_info pointer

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

10 years agoRevert 31864 and 31866: don't use suffix rules. Pattern rules would work but I don...
morriss [Thu, 8 Apr 2010 19:18:05 +0000 (19:18 +0000)]
Revert 31864 and 31866: don't use suffix rules.  Pattern rules would work but I don't know if they're portable enough.

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

10 years agoRevert incorrect change.
etxrab [Thu, 8 Apr 2010 19:06:27 +0000 (19:06 +0000)]
Revert incorrect change.

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