etxrab [Wed, 12 Oct 2011 18:57:50 +0000 (18:57 +0000)]
From Tobias Witek:
This patch extends the ATM parser so as to allow GPRS NS traffic encapsulated
in ATM AAL5.
Additionally, added support for this into the 'Meta' dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6447
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39394
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Wed, 12 Oct 2011 18:38:38 +0000 (18:38 +0000)]
When looping, be sure to iterate over the right number of elements. Fixes Coverity OVERRUN_STATIC errors reported in CID's 1305 and 1306. Also, fix the 3 offending display filter names discovered with tools/checkfiltername.pl.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39393
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 18:04:58 +0000 (18:04 +0000)]
From Robert Bullen: Fix for: Two minor bugs in Wiretap library:
First bug: The Network Instruments Observer file format abbreviation is
incorrect. It is "niobserverv" instead of "niobserver", which is probably a
vestige from 1.4 when the abbreviation was "niobserverv9".
Second bug: The packet header magic number field is correctly swapped the first
time when reading the entire packet header. It is incorrectly swapped yet again
when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op
on little-endian platforms. But the error message that is displayed to users of
big-endian platforms will contain a byte-reversed value.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39392
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Wed, 12 Oct 2011 18:01:41 +0000 (18:01 +0000)]
There are no preferences for this dissector so eliminate unneeded preference-related code. Fixes Coverity CID 1311.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39391
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 12 Oct 2011 17:55:49 +0000 (17:55 +0000)]
From Iain Arnell:
A missing value_ptr parameter in the handling of ajp13 response headers
led to them being displayed differently than the request headers.
This patch also simplifies the offset/length calculation for header
values, and skips the size for consistency with handling of other ajp13
string values.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39390
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 12 Oct 2011 17:54:23 +0000 (17:54 +0000)]
Add Iain Arnell, who contributed ajp13 patches.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39389
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 12 Oct 2011 17:53:58 +0000 (17:53 +0000)]
From Iain Arnell:
Revision 35984 introduced a regression in ajp13_get_nstring. According
to the comments here, the returned length _includes_ the trailing null.
The encoded length, however, does _not_ including the trailing null.
This patch resolves the problem by simply adding 1 to the returned
length.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39388
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 17:30:31 +0000 (17:30 +0000)]
Fix a benign bug: use intended proto_tree_add_uint() instaed of proto_tree_add_item();
Fix an endianness issue;
Add a comment re "tvb_memcpy to a struct is not kosher".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39387
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 12 Oct 2011 16:41:42 +0000 (16:41 +0000)]
Update the Camel and MAP ASN.1 files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39386
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 16:31:41 +0000 (16:31 +0000)]
Cleanup use of proto_tree_add_item()/proto_tree_add_uint() in a few cases
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39385
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 15:02:11 +0000 (15:02 +0000)]
Fix a benign bug: Use correct proto_tree_add_item() encoding arg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39384
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 14:12:36 +0000 (14:12 +0000)]
Fix some proto_tree_add_item() FT_ABSOLUTE_TIME encoding parameters:
Again: a tip o'the hat to Guy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39383
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 12 Oct 2011 07:44:14 +0000 (07:44 +0000)]
Add Modification CMake (Following add in Rev 39379)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39382
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 12 Oct 2011 05:27:41 +0000 (05:27 +0000)]
Revert anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39380
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39381
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 12 Oct 2011 05:12:49 +0000 (05:12 +0000)]
From Eliot:
Patch libwireshark.def adding some symbols needed by wspyton
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39380
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 12 Oct 2011 05:08:51 +0000 (05:08 +0000)]
From Jouni Malinen:
Move sniffer meta data parsing to separate files
packet-ieee80211.c includes dissectors for three different styles
of IEEE 802.11 sniffer meta data (like signal strength). Move these
to separate files in the same style as a fourth format (radiotap)
was already handled, so that packet-ieee80211.c focuses on the
actual IEEE 802.11 frame dissecting.
This reverts
http://anonsvn.wireshark.org/viewvc?revision=23911&view=revision
Objections?
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39379
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 12 Oct 2011 03:28:07 +0000 (03:28 +0000)]
Fix a case wherein proto_tree_add_boolean() was intended instead of proto_tree_add_item().
Also: Use proto_tree_add_boolean() instead of proto_tree_add_item() for code consistency in 2 other cases.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39378
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 11 Oct 2011 20:19:46 +0000 (20:19 +0000)]
Update template to match generated dissector - dissector_try_port() is
dead, long live dissector_try_uint().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39377
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 19:35:43 +0000 (19:35 +0000)]
Use dissector_try_uint()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39376
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 19:24:19 +0000 (19:24 +0000)]
From Eliot:
Patch wspy_dissector.py to use dissector_add_uint
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39375
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 19:16:15 +0000 (19:16 +0000)]
From Eliot:
Patch homeplug.py wspython sample to not conflict with built in homeplug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39374
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 11 Oct 2011 19:01:32 +0000 (19:01 +0000)]
Make asn1/lcsap/Makefile
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39373
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 11 Oct 2011 19:01:15 +0000 (19:01 +0000)]
Set svn:ignore targets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39372
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:46:27 +0000 (18:46 +0000)]
From Jouni Malinen:
Dissect Time Advertisement and Time Zone elements.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39371
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:43:13 +0000 (18:43 +0000)]
From Jouni Malinen:
ieee80211: Start splitting add_tagged_field into helper functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39370
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:40:02 +0000 (18:40 +0000)]
From Jouni Malinen:
Simplify tag_num_vals.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39369
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:29:29 +0000 (18:29 +0000)]
From Jouni Malinen:
Dissect WNM (IEEE 802.11v) information.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39368
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:26:03 +0000 (18:26 +0000)]
From Jouni Malinen:
Wi-Fi P2P: Show frame name in col_info
Make it easier to find specific P2P frames by adding the name of the P2P
Public Action frames into col_info.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39367
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:21:27 +0000 (18:21 +0000)]
From Harald Welte:
In order to ensure one consistent GSMTAP definition, some comments are added to
the code in order to make sure modifications are first merged in the GSMTAP
mainline header file, and then propagated to wireshark.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6442
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39366
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 18:16:53 +0000 (18:16 +0000)]
Build the LCS-AP dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39365
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 11 Oct 2011 18:06:01 +0000 (18:06 +0000)]
Avoid longjmp warning by making adding volatile.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39364
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 11 Oct 2011 17:57:09 +0000 (17:57 +0000)]
Enable GeoIP lookups by default. Don't add GeoIP subtrees if we didn't
find any databases.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39363
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 11 Oct 2011 16:49:18 +0000 (16:49 +0000)]
From Spenser Sheng:
LCS-AP dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39362
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 15:39:47 +0000 (15:39 +0000)]
Fix benign bugs wherein proto_tree_add_uint() was intended instead of proto_tree_add_item();
(Replaces changes made in SVN #39351).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39361
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 15:11:51 +0000 (15:11 +0000)]
Fix a bug wherein proto_tree_add_uint() was intended instead of proto_tree_add_item();
This bug would have caused display of a FT_UINT32 field with the wrong endianness.
(Replaces change made in SVN #39350).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39360
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 14:58:54 +0000 (14:58 +0000)]
Use intended proto_tree_add_uint() instead of proto_tree_add_item() to fix benign bugs (Replaces SVN #39348).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39359
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 14:49:09 +0000 (14:49 +0000)]
Fix several cases wherein proto_tree_add_uint() was intended iso proto_tree_add_item();
One case would have caused display of a FT_UINT16 field with the wrong endianness.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39358
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 14:31:01 +0000 (14:31 +0000)]
Revert SVN #39347; There's a better way.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39357
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 14:10:52 +0000 (14:10 +0000)]
Fix a number of benign bugs wherein proto_tree_add_uint was intended (rather than proto_tree_add_item).
Tip o' the hat to Guy ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39356
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 11 Oct 2011 14:02:26 +0000 (14:02 +0000)]
Revert SVN #39345; (There's a better way ...)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39355
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 11 Oct 2011 01:25:54 +0000 (01:25 +0000)]
No libpcap, no capturing, no capture filters, no capture_filter_init().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39354
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 11 Oct 2011 00:46:21 +0000 (00:46 +0000)]
Ignore (this directory's copy of) MCS-PROTOCOL.asn
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39353
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 23:45:33 +0000 (23:45 +0000)]
Fix "unused variable" compile error.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39352
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 23:36:07 +0000 (23:36 +0000)]
Fix benign bugs in some proto_tree_add_item() 'encoding' args;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39351
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 23:34:24 +0000 (23:34 +0000)]
Fix bugs which caused certain fields to display with the wrong endianness;
Specifically: some proto_tree_add_item() 'encoding' args were incorrect.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39350
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 10 Oct 2011 22:39:35 +0000 (22:39 +0000)]
Check our capture filter syntax in a separate thread.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39349
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 21:53:15 +0000 (21:53 +0000)]
Fix benign bugs in some proto_tree_add_item() 'encoding' args;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39348
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 21:46:19 +0000 (21:46 +0000)]
Fix additiuonal bugs in some proto_tree_add_item() 'encoding' args;
Two of the bugs would appear to have caused display of a FT_UINT16 field with
the wrong endianness.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39347
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 21:29:10 +0000 (21:29 +0000)]
Fix benign bug in some proto_tree_add_item() 'encoding' args;
Use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39346
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 21:12:05 +0000 (21:12 +0000)]
Fix some benign bugs in proto_tree_add_item() 'encoding' arg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39345
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 20:57:56 +0000 (20:57 +0000)]
Comment out some unused hf[] entries;
Add notes about missing hf[] entries.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39344
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 20:12:57 +0000 (20:12 +0000)]
Convert proto_tree_add_item() 'encoding' parameter as appropriate.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39343
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 10 Oct 2011 19:16:58 +0000 (19:16 +0000)]
Use guint64
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39342
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 19:10:13 +0000 (19:10 +0000)]
Fix a benign bug in proto_tree_add_item() 'encoding' arg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39341
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 10 Oct 2011 18:26:33 +0000 (18:26 +0000)]
Make it possible to build custom ASN1 based dissectors on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39340
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 10 Oct 2011 18:11:18 +0000 (18:11 +0000)]
From Donnie Savage:
Re-write of the EIGRP dissector to support Multi-Protocol (TLV 2.0) and
Multi-Topology (TLV 3.0). This version also support Service Advertisement
Framework(SAF) extensions to EIGRP
Dissector includes:
- Dissection of all EIGRP Opcodes and TLVs
- Decode of EIGRP Flags and bitfields
- Decode of EIGRP Communities
- Decode of latest EIGRP "wide metric" formats
- Decode of EIGRP Extended Metrics
- Decode of SAF packets with XML client data handed off to XML dissector
From me:
Fix checkapi errors/warnings use G_GINT64_CONSTANT and G_GINT64_MODIFIER
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39339
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 10 Oct 2011 17:42:43 +0000 (17:42 +0000)]
Fix unused function warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39338
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 10 Oct 2011 14:54:12 +0000 (14:54 +0000)]
Fix ASN.1 dissector generation on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39337
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 10 Oct 2011 12:54:27 +0000 (12:54 +0000)]
Fix a typo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39336
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 10 Oct 2011 12:52:53 +0000 (12:52 +0000)]
Don't remove the ASN.1 dissectors when cleaning: we don't (re)build them during the make process yet.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39335
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 10 Oct 2011 08:50:55 +0000 (08:50 +0000)]
From Anders:
Move packet-t38.c to ASN1_DISSECTOR_SRC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39334
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 10 Oct 2011 02:31:11 +0000 (02:31 +0000)]
Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over). The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").
asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.
Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.
Fix building of conformance files when doing out-of-source-tree builds.
Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39333
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 01:38:20 +0000 (01:38 +0000)]
Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1/*:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_BOOLEAN
FT_IPv4
FT_EUI64
FT_GUID
FT_UINT_STRING
Also: For type FT_IPv6 use ENC_NA. (This was missed in SVN #39260)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39332
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 01:34:44 +0000 (01:34 +0000)]
After regenerating asn1 files, packet-gsm_map.h changed, (presumably due to asn2wrs.py change in SVN #39320).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39331
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 01:32:07 +0000 (01:32 +0000)]
After re-generating ASN1 files, 2 .h files changed (presumably due to asn2wrs.py change in SVN #39320).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39330
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 00:53:55 +0000 (00:53 +0000)]
Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugins/*:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_BOOLEAN
FT_IPv4
FT_EUI64
FT_GUID
FT_UINT_STRING
Also: For type FT_ITv6 use ENC_NA. (This was missed in an earlier SVN)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39329
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 10 Oct 2011 00:39:31 +0000 (00:39 +0000)]
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_BOOLEAN
FT_IPv4
FT_EUI64
FT_GUID
FT_UINT_STRING
Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39328
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 9 Oct 2011 17:42:49 +0000 (17:42 +0000)]
Add a comment with links to I-Ds for protocols that look as if they're
at least somewhat related.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39327
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 9 Oct 2011 15:46:10 +0000 (15:46 +0000)]
Fix a typo.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39326
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 9 Oct 2011 14:03:25 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-10-09]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39323
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 9 Oct 2011 13:09:46 +0000 (13:09 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields
Many of the fixed fields use similar bitfield construction in the proto_tree. Use proto_tree_add_bitmask() to avoid having to implement the same subtree and item addition separately for each field.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39322
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 9 Oct 2011 13:06:32 +0000 (13:06 +0000)]
Enhance BGP Open message
* Make field filterable
* Remove bgp_open struct
* Fix a bug of offset in Optionnel Parameter TLV (Bug include by me in Revision #39098)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39321
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 9 Oct 2011 10:42:54 +0000 (10:42 +0000)]
Always generate packet-*-exp.h.
This fixes a bug when only exporting _PDU objects, and we can have
'#include "packet-*-exp.h"' in packet-*-template.h even when having
no #.EXPORTS in the conformation file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39320
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 9 Oct 2011 09:55:14 +0000 (09:55 +0000)]
Added a button to refresh a UAT from the system defaults (if existing).
Added a button to clear the list.
Added tooltip to some buttons.
Removed unused clist code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39319
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 9 Oct 2011 09:54:48 +0000 (09:54 +0000)]
Check for NULL pointer in file_exists().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39318
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 8 Oct 2011 19:44:36 +0000 (19:44 +0000)]
Move the GeoIP entry where it belongs.
Expand a couple of comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39317
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 18:12:59 +0000 (18:12 +0000)]
Enhance BGP Header
* Remove a not needed subtree
* Make field filtereable
* Use expert info to display a wrong length
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39316
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 17:51:03 +0000 (17:51 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields
The fixed field identifiers were defined to have specific values. However, this is used only within the parser and does not correspond to any specific packet field. As such, there is no need for the specific values to be maintained and an enum makes it simpler to add and remove these fields as needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39315
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 17:50:06 +0000 (17:50 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields
The app_fixed_field() function has grown to overly complex and long function. Split it into separate helper functions for each fixed field and a table of dissector functions. This makes it easier to extend and maintain the implementation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39314
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 17:22:45 +0000 (17:22 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6421
IEEE 802.11u ANQP enhancements
Dissect vendor-specific ANQP Capabilities
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39313
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 17:21:44 +0000 (17:21 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6421
IEEE 802.11u ANQP enhancements
Dissect NAI Realm List
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39312
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 8 Oct 2011 16:55:54 +0000 (16:55 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6420
WPA IE pairwise cipher suite dissector uses incorrect value_string list
From me :
* Use correct value_string for WPA Key MGMT...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39311
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sat, 8 Oct 2011 15:17:56 +0000 (15:17 +0000)]
Remove a duplicate entry
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39310
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 8 Oct 2011 14:42:11 +0000 (14:42 +0000)]
From Stéphane Bryant: fixes in reload fragmentation handling
-Fixes in reload fragmentation
-also updated the code to reflect draft-zong-p2psip-drr-01
From me:
Remove one line of the patch which appears to be incorrect:
At about line 4118 (in dissect_reload_message())
- pinfo->fragmented = save_fragmented;
+ pinfo->fragmented = pinfo->fragmented;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39309
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 8 Oct 2011 14:14:32 +0000 (14:14 +0000)]
From Stéphane Bryant: remove the variables that the previous patch left unused
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me: Add hf[] entry for 'hf_reload_dmflag_underlay_hop'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39308
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sat, 8 Oct 2011 06:09:38 +0000 (06:09 +0000)]
Mimic test for IPv6 support in GeoIP from autofoo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39307
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 7 Oct 2011 16:46:37 +0000 (16:46 +0000)]
From Martin Kaiser:
DVB-CI / CI+ CC resource version 2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6436
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39306
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 7 Oct 2011 16:42:52 +0000 (16:42 +0000)]
- Put a TRY/CATCH block around dissect_h264_nal_unit() in case
a bogus nal unit was sent.
- Delete an unused hf entry.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6407
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39305
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 7 Oct 2011 13:53:43 +0000 (13:53 +0000)]
As suggested/requested in
http://ask.wireshark.org/questions/6756/linking-error-with-str_to_str :
Add str_to_str to the list of exported functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39304
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 6 Oct 2011 22:05:11 +0000 (22:05 +0000)]
From Dirk Jagdmann:
Below is a small enhancement to the EPM dissector. It adds the "type" of
EPM Map request/response to the INFO column. This way I don't have to
dig into the proto tree if I want to see what service is requested.
From me:
Add a modeline blurb.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39303
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 6 Oct 2011 21:12:21 +0000 (21:12 +0000)]
Use '"%" G_GINT64_MODIFIER "d"' instead of "%ld" to format a guint64.
Fixes a compile warning
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39302
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 6 Oct 2011 20:46:45 +0000 (20:46 +0000)]
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39301
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 6 Oct 2011 20:28:40 +0000 (20:28 +0000)]
Don't stuff "(null)" into the protocol tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39300
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 6 Oct 2011 19:33:15 +0000 (19:33 +0000)]
Assume all strings coming from GeoIP are ISO-8859-1. Fix IPv6
destination GeoIP lookups.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39299
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 6 Oct 2011 19:26:21 +0000 (19:26 +0000)]
Added media type multipart/report from RFC3462.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39298
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 6 Oct 2011 19:07:26 +0000 (19:07 +0000)]
Typo FT_IPv4 isf FT_IPv6.
Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39297
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 6 Oct 2011 18:46:47 +0000 (18:46 +0000)]
Add exports
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39296
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Thu, 6 Oct 2011 17:53:44 +0000 (17:53 +0000)]
Fix for bug 6356:
Wireshark encounters error while parsing ieee80211 QoS Null data.
The error is because of invalid read when trying to read mesh_flags
(after the header), which doesn't exist.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39295
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 6 Oct 2011 16:50:13 +0000 (16:50 +0000)]
Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_UINT8
FT_UINT16
FT_UINT24
FT_UINT32
FT_UINT64
FT_INT8
FT_INT16
FT_INT24
FT_INT32
FT_INT64
FT_FLOAT
FT_DOUBLE
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39294
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 6 Oct 2011 16:43:24 +0000 (16:43 +0000)]
Add missing (presumably) entries for credssp,idmp,t124 & x721.
However: t124 & x721 fail to build on Windows so comment them out.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39293
f5534014-38df-0310-8fa8-
9805f1628bb7