obnox/wireshark/wip.git
8 years agoEscape the '.' in radius dictionary ATTRIBUTE names. This may fix the OSX-10.5 build...
morriss [Thu, 26 May 2011 14:15:51 +0000 (14:15 +0000)]
Escape the '.' in radius dictionary ATTRIBUTE names.  This may fix the OSX-10.5 builds too.

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

8 years agoInspired by one of the changes from r37406 and bug 2794: detect hf abbreviations
morriss [Thu, 26 May 2011 13:32:04 +0000 (13:32 +0000)]
Inspired by one of the changes from r37406 and bug 2794: detect hf abbreviations
with two or more periods in a row.  Fix one case of that.

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

8 years agoFrom Michael Mann.
etxrab [Thu, 26 May 2011 06:32:51 +0000 (06:32 +0000)]
From Michael Mann.
Part of "display filters with redundancies of PROTABBREV in them."
The ones left outs should be fixed differently I think.
Rename som ndps hf variables while at it.

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

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

8 years agoAllow the character '.' in radius dictionary ATTRIBUTE names;
wmeier [Thu, 26 May 2011 02:59:25 +0000 (02:59 +0000)]
Allow the character '.' in radius dictionary ATTRIBUTE names;

Fixes issue caused by dictionary.foundry having ATTRIBUTE names containing
 a '.' (e.g., Foundry-MAC-Authent-needs-802.1x).

So: Revert SVN #37386 which temporarily changed the '.' to '-'.

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

8 years agoFrom Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 :
morriss [Thu, 26 May 2011 02:20:23 +0000 (02:20 +0000)]
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 :

Added support for the following services of the Connection Manager object:
LargeForwardOpen
GetConnectionOwner

Added support for the following services of the Connection Configuration
Object:
GetAttributeAll
SetAttributeAll

From me:
Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3.

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

8 years agoFrom Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943 :
morriss [Thu, 26 May 2011 01:55:04 +0000 (01:55 +0000)]
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943 :

The two patches attached allow the dissection of the Homeplug AV Ethernet MAC
management frames between a controlling device and a Homeplug AV Ethernet to
PLC adapter. This protocol is pretty similar to the previous generation
Homeplug protocol (dissected by packet-homeplug.c) but a couple of noticeable
differences make it require its own dissector handler.

This dissector is based on the work done by Nicolas Thill, Xavier Carcelle and
myself in the Faifa project (https://dev.open-plc.org).

The dissector handles the standard Homeplug AV Ethernet MAC management frames
(called public) as well as the Intellon specific management frames (vendor).

From me:
Remove unnecessary global variables.
Add to COL_INFO even when !tree.
Remove gotos.
Remove unnecessary includes.

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

8 years agoExtended the SSL key log import routine to be able to read the following format:
sake [Wed, 25 May 2011 21:49:29 +0000 (21:49 +0000)]
Extended the SSL key log import routine to be able to read the following format:

RSA Session-ID:xxxx Master-Key:xxxx

This makes it easy to use the "openssl s_client" output for decryption
(see: http://ask.wireshark.org/questions/4229/follow-ssl-stream-using-master-key-and-session-id)

It also paves the way for exporting SSL keyring material. See also the enhancement request in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444

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

8 years agoAdd some expert infos for unusual messages:
morriss [Wed, 25 May 2011 21:47:35 +0000 (21:47 +0000)]
Add some expert infos for unusual messages:
 - routing on SSN but the SSN is not present or is unspecified (zero)
 - message handling has an unexpected value
 - message class is incorrect for the message type

Also clean up some indentation and other white space.

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

8 years agoFilter out arg_list_utf_16to8.
gerald [Wed, 25 May 2011 18:38:39 +0000 (18:38 +0000)]
Filter out arg_list_utf_16to8.

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

8 years agoRemove a backslash.
gerald [Wed, 25 May 2011 18:09:04 +0000 (18:09 +0000)]
Remove a backslash.

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

8 years agoCopy-paste error.
etxrab [Wed, 25 May 2011 15:01:07 +0000 (15:01 +0000)]
Copy-paste error.

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

8 years agoMake it easier to add custom asn1 dissectors.
etxrab [Wed, 25 May 2011 14:21:42 +0000 (14:21 +0000)]
Make it easier to add custom asn1 dissectors.

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

8 years agoUse PI_UNDECODED instead.
etxrab [Wed, 25 May 2011 13:17:51 +0000 (13:17 +0000)]
Use PI_UNDECODED instead.

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

8 years agoAdd a convinience function to add expert warnings for not dissected items.
etxrab [Wed, 25 May 2011 11:05:23 +0000 (11:05 +0000)]
Add a convinience function to add expert warnings for not dissected items.

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

8 years agoAllow longer field names in the advanced filter control.
martinm [Wed, 25 May 2011 09:08:27 +0000 (09:08 +0000)]
Allow longer field names in the advanced filter control.

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

8 years agoFrom tschardt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5949
alagoutte [Wed, 25 May 2011 07:15:05 +0000 (07:15 +0000)]
From tschardt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5949
802.11 IE tag number 61/62 still decoded to "Unknown"/Reserved tag Number

Remove inadvertently by me in rev36120

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

8 years agoFrom Florian Fainelli:
etxrab [Wed, 25 May 2011 05:33:00 +0000 (05:33 +0000)]
From Florian Fainelli:
Patch adding the Homeplug AV ethertype.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943

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

8 years agoOne "-Warray-bounds" suffices; as we're including it in the default
guy [Wed, 25 May 2011 02:35:30 +0000 (02:35 +0000)]
One "-Warray-bounds" suffices; as we're including it in the default
options, no need to include it in the "extra warnings" options as well.

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

8 years agoAn Attribute Name with a '.' (Foundry-MAC-Authent-needs-802.1x) causes an access...
wmeier [Wed, 25 May 2011 01:44:13 +0000 (01:44 +0000)]
An Attribute Name with a '.' (Foundry-MAC-Authent-needs-802.1x) causes an access violation.
Change '802.1x' to '802-1x' in 2 places temporarily until I get a chance to see what's going on.

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

8 years agoAdd new dictionary from freeradius.org: GIT 2.1.x branch.
wmeier [Wed, 25 May 2011 00:40:35 +0000 (00:40 +0000)]
Add new dictionary from freeradius.org: GIT 2.1.x branch.

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

8 years agoUse freeradius.org version [from the GIT 2.1.x branch]
wmeier [Wed, 25 May 2011 00:30:09 +0000 (00:30 +0000)]
Use freeradius.org version [from the GIT 2.1.x branch]

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

8 years agoTunnel related VALUEs are actually defined in dictionary.rfc2867.
wmeier [Wed, 25 May 2011 00:07:37 +0000 (00:07 +0000)]
Tunnel related VALUEs are actually defined in dictionary.rfc2867.
Also: remove 3 "unassigned" entries to match the FreeRadius dictionary.rfc2866.
Note: This version (w/o the dup Acct-Status-Type) will be submitted upstream.

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

8 years agoUse latest version from FreeRadius 2.1.10 release.
wmeier [Tue, 24 May 2011 20:59:34 +0000 (20:59 +0000)]
Use latest version from FreeRadius 2.1.10 release.

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

8 years agoRemove blank line added by mistake ...
wmeier [Tue, 24 May 2011 19:20:59 +0000 (19:20 +0000)]
Remove blank line added by mistake ...

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

8 years agoUpdate list of radius dictionary files to reflect adds/deletes.
wmeier [Tue, 24 May 2011 19:13:04 +0000 (19:13 +0000)]
Update list of radius dictionary files to reflect adds/deletes.

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

8 years agoObsolete; See dictionary.rfc2868
wmeier [Tue, 24 May 2011 18:47:03 +0000 (18:47 +0000)]
Obsolete; See dictionary.rfc2868

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

8 years agoObsolete; See dictionary.erx
wmeier [Tue, 24 May 2011 18:42:04 +0000 (18:42 +0000)]
Obsolete; See dictionary.erx

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

8 years agoUpdated dictionary files released as part of FreeRadius v2.1.7 thru v2.1.10
wmeier [Tue, 24 May 2011 18:24:29 +0000 (18:24 +0000)]
Updated dictionary files released as part of FreeRadius v2.1.7 thru v2.1.10

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

8 years agoSome dictionary files added in FreeRadius v2.1.7 - 2.1.10.
wmeier [Tue, 24 May 2011 17:18:34 +0000 (17:18 +0000)]
Some dictionary files added in FreeRadius v2.1.7 - 2.1.10.
(These aren't list in the dictionary file).

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

8 years agoAdd new dictionary files from FreeRadius v2.1.7 thru 2.1.10
wmeier [Tue, 24 May 2011 16:30:32 +0000 (16:30 +0000)]
Add new dictionary files from FreeRadius v2.1.7 thru 2.1.10

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

8 years agoDon't print hidden columns.
guy [Tue, 24 May 2011 16:17:43 +0000 (16:17 +0000)]
Don't print hidden columns.

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

8 years agoMove the Windows argument list conversion code to a common routine.
gerald [Tue, 24 May 2011 00:07:56 +0000 (00:07 +0000)]
Move the Windows argument list conversion code to a common routine.

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

8 years agoFix various benign cases of Coverity [UNUSED]: 996,995,956,936,899,1133,1000
wmeier [Mon, 23 May 2011 18:04:45 +0000 (18:04 +0000)]
Fix various benign cases of Coverity [UNUSED]: 996,995,956,936,899,1133,1000

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

8 years agoFrom Romain Fliedel via bug 5947: Fix the mask for extracting FMID.
cmaynard [Mon, 23 May 2011 17:53:51 +0000 (17:53 +0000)]
From Romain Fliedel via bug 5947: Fix the mask for extracting FMID.

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

8 years agoUse the 'proto_tree *' (not the 'proto_item *') for a proto_tree_add_item(): Coverity...
wmeier [Mon, 23 May 2011 17:51:33 +0000 (17:51 +0000)]
Use the 'proto_tree *' (not the 'proto_item *') for a proto_tree_add_item(): Coverity 963 {UNUSED]

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

8 years agoPass tap info into sequence analysis function.
martinm [Mon, 23 May 2011 17:15:00 +0000 (17:15 +0000)]
Pass tap info into sequence analysis function.

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

8 years agoDetect when padding non-final padding comes after other control subheaders.
martinm [Mon, 23 May 2011 16:11:32 +0000 (16:11 +0000)]
Detect when padding non-final padding comes after other control subheaders.

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

8 years ago(Trivial) Testing _MSC_FULL_VER can be done at compile time.
wmeier [Mon, 23 May 2011 16:09:09 +0000 (16:09 +0000)]
(Trivial) Testing _MSC_FULL_VER can be done at compile time.

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

8 years agoFix compilation.
tuexen [Mon, 23 May 2011 14:41:04 +0000 (14:41 +0000)]
Fix compilation.

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

8 years agoRemove an unneeded redundant line of code: Fixes Coverity 1001.
wmeier [Mon, 23 May 2011 14:34:59 +0000 (14:34 +0000)]
Remove an unneeded redundant line of code: Fixes Coverity 1001.
Also:
 Use a separate ett variable for a subtree;
 Convert what appears to be '4 space tabs' to '4 spaces'.

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

8 years agoUse correct subtree in two cases: Fixes Coverity 920;
wmeier [Mon, 23 May 2011 14:30:00 +0000 (14:30 +0000)]
Use correct subtree in two cases: Fixes Coverity 920;
Also:
  Remove a number of unneeded #include statements;
  Do some whitespace cleanup.

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

8 years agoFix compilation.
tuexen [Mon, 23 May 2011 14:28:02 +0000 (14:28 +0000)]
Fix compilation.

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

8 years agoUse correct subtree in a few cases: Fixes Coverity 921,894,878 & 1136;
wmeier [Mon, 23 May 2011 14:26:43 +0000 (14:26 +0000)]
Use correct subtree in a few cases: Fixes Coverity 921,894,878 & 1136;

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

8 years agoUse correct subtree in several 'proto_tree_add_text(...)' statements: Fixes Coverity...
wmeier [Mon, 23 May 2011 14:17:30 +0000 (14:17 +0000)]
Use correct subtree in several 'proto_tree_add_text(...)' statements: Fixes Coverity 938 [UNUSED].

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

8 years agoUse correct subtree in 'call dissector(...)': Fixes Coverity 962 [UNUSED].
wmeier [Mon, 23 May 2011 14:14:43 +0000 (14:14 +0000)]
Use correct subtree in 'call dissector(...)': Fixes Coverity 962 [UNUSED].

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

8 years agoAdd a missing line of code: Fixes Coverity 967 [UNUSED].
wmeier [Mon, 23 May 2011 14:13:03 +0000 (14:13 +0000)]
Add a missing line of code: Fixes Coverity 967 [UNUSED].

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

8 years agoUse correct subtree for proto_tree_add_item in several places: Coverity 1130 [UNUSED];
wmeier [Mon, 23 May 2011 14:11:14 +0000 (14:11 +0000)]
Use correct subtree for proto_tree_add_item in several places: Coverity 1130 [UNUSED];
Also: Reformat a few lines and do some whitespace cleanup.

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

8 years agoAdd missing braces.
martinm [Mon, 23 May 2011 10:09:08 +0000 (10:09 +0000)]
Add missing braces.

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

8 years ago7.3.2.25 or 802.11-2007 gives an example of length 20, so it is unclear where the...
jmayer [Mon, 23 May 2011 08:54:47 +0000 (08:54 +0000)]
7.3.2.25 or 802.11-2007 gives an example of length 20, so it is unclear where the 24 came from (unintentionally fixes bug 5942)

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

8 years agoClean duplicated contributors.
darkjames [Mon, 23 May 2011 08:03:50 +0000 (08:03 +0000)]
Clean duplicated contributors.

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

8 years agoDelete unused header field entries found by running checkhf.pl.
cmaynard [Mon, 23 May 2011 00:32:40 +0000 (00:32 +0000)]
Delete unused header field entries found by running checkhf.pl.

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

8 years agoAdded Michael Mann for his contributions to bug 2794.
cmaynard [Mon, 23 May 2011 00:05:07 +0000 (00:05 +0000)]
Added Michael Mann for his contributions to bug 2794.

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

8 years agoFrom Micheal Mann via bug 2794: Fix some display filter field names.
cmaynard [Mon, 23 May 2011 00:00:53 +0000 (00:00 +0000)]
From Micheal Mann via bug 2794: Fix some display filter field names.

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

8 years agoFrom Yaniv Kaul: Some 'set but not used' compilation fixes;
wmeier [Sun, 22 May 2011 22:04:24 +0000 (22:04 +0000)]
From Yaniv Kaul: Some 'set but not used' compilation fixes;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5858

From me: 2 corrections to the patch and sevral other minor changes.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-05-22]
gerald [Sun, 22 May 2011 15:04:14 +0000 (15:04 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-05-22]

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

8 years agoFix the case where you start with interfaces on the command line
tuexen [Sun, 22 May 2011 11:11:00 +0000 (11:11 +0000)]
Fix the case where you start with interfaces on the command line
(so using ifaces) and then using the GUI (which only deals with
iface).

These kind of problems will completely disappear when the
old strucuture components like iface have completely be
retired. This is the next thing we will work on.

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

8 years agoUse appropriate temporary filename when capturing from multiple interfaces.
tuexen [Sat, 21 May 2011 20:57:00 +0000 (20:57 +0000)]
Use appropriate temporary filename when capturing from multiple interfaces.

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

8 years agoAs suggested on the dev list: Use pcapng and threads
tuexen [Sat, 21 May 2011 18:51:25 +0000 (18:51 +0000)]
As suggested on the dev list: Use pcapng and threads
when capturing on multiple interfaces even if not specified
on the command line.

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

8 years agoFix the capturing from the GUI. Honor the iface variable.
tuexen [Sat, 21 May 2011 13:22:38 +0000 (13:22 +0000)]
Fix the capturing from the GUI. Honor the iface variable.

The next step is to retire the iface variable and use
the ifaces array only. This should simplify things and
fix the cases, where you start wireshark with command
line arguments and also use the GUI.

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

8 years agoPass a pcap_options * instead of a pcap_options **.
gerald [Sat, 21 May 2011 00:10:57 +0000 (00:10 +0000)]
Pass a pcap_options * instead of a pcap_options **.

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

8 years agoDon't assign to a variable which is then not referenced: Coverity 998 [UNUSED].
wmeier [Fri, 20 May 2011 20:41:23 +0000 (20:41 +0000)]
Don't assign to a variable which is then not referenced: Coverity 998 [UNUSED].

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

8 years agoDon't assign to an unused variable: Fixes Coverity 874 [UNUSED].
wmeier [Fri, 20 May 2011 20:29:19 +0000 (20:29 +0000)]
Don't assign to an unused variable: Fixes Coverity 874 [UNUSED].

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

8 years agoFix a typo ...
wmeier [Fri, 20 May 2011 20:22:59 +0000 (20:22 +0000)]
Fix a typo ...

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

8 years agoRemove unneeded code: Fixes Coverity 890 [UNUSED].
wmeier [Fri, 20 May 2011 20:21:14 +0000 (20:21 +0000)]
Remove unneeded code: Fixes Coverity 890 [UNUSED].

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

8 years agoUse (what appears to be) the correct tvb for a function call: Fixes Coverity 919...
wmeier [Fri, 20 May 2011 20:10:41 +0000 (20:10 +0000)]
Use (what appears to be) the correct tvb for a function call: Fixes Coverity 919 [UNUSED];
#include <stdlib.h> not req'd.

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

8 years agoRemove unused code: Fixes Coverity 972 [UNUSED].
wmeier [Fri, 20 May 2011 20:00:16 +0000 (20:00 +0000)]
Remove unused code: Fixes Coverity 972 [UNUSED].

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

8 years agoAdd #include <stdlib.h> to files which reference fcns declared in stdlib.h;
wmeier [Fri, 20 May 2011 19:00:09 +0000 (19:00 +0000)]
Add #include <stdlib.h> to files which reference fcns declared in stdlib.h;
 (In many cases I previously incorrectly removed the #include <stdlib.h>).

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

8 years agoAdd bugs 4985 and 5580 to the list of known problems.
gerald [Fri, 20 May 2011 17:02:20 +0000 (17:02 +0000)]
Add bugs 4985 and 5580 to the list of known problems.

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

8 years agoDon't assign to a proto_item* if the value won't be used:
wmeier [Fri, 20 May 2011 15:44:25 +0000 (15:44 +0000)]
Don't assign to a proto_item* if the value won't be used:
 Fixes Coverity 903,935,968,985,997,999,1024,1025,1134;
Remove unneeded #includes;
Do whitespace cleanup.

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

8 years agoAdd to comment about using a heuristic; Fix a typo.
wmeier [Fri, 20 May 2011 15:34:29 +0000 (15:34 +0000)]
Add to comment about using a heuristic; Fix a typo.

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

8 years agoUse correct parent tree when creating a subtree: Fixes Coverity 902 [UNUSED];
wmeier [Fri, 20 May 2011 15:22:58 +0000 (15:22 +0000)]
Use correct parent tree when creating a subtree: Fixes Coverity 902 [UNUSED];
Remove unneeded #includes;
Do some whitespace cleanup.

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

8 years ago'#if 0' code related to already commented out code: Fixes Coverity 881.
wmeier [Fri, 20 May 2011 15:19:26 +0000 (15:19 +0000)]
'#if 0' code related to already commented out code: Fixes Coverity 881.

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

8 years agoDon't assign to a proto_item* if the value won't be used: Coverity 975 [UNUSED]
wmeier [Fri, 20 May 2011 14:21:02 +0000 (14:21 +0000)]
Don't assign to a proto_item* if the value won't be used: Coverity 975 [UNUSED]
Remove unneeded prefs callback in prefs registration;
Remove 'if (!initialized)' test from proto_reg_handoff...();
Remove unneeded #include;
Do some whitespace cleanup.

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

8 years agoPrettify som 3GPP AVP:s
etxrab [Fri, 20 May 2011 13:55:21 +0000 (13:55 +0000)]
Prettify som 3GPP AVP:s

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

8 years agogtk_menu_item_set_label() is from gtk 2.16.
stig [Fri, 20 May 2011 11:58:00 +0000 (11:58 +0000)]
gtk_menu_item_set_label() is from gtk 2.16.

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

8 years agoInclude the profile name in the Delete item in the profiles popup.
stig [Fri, 20 May 2011 11:30:51 +0000 (11:30 +0000)]
Include the profile name in the Delete item in the profiles popup.
Fixed creating a new profile from the popup without setting a create from.
Removed some unneeded ep_strdup_printf.

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

8 years agoCopy data from the TVB into ep_alloc'd memory, rather than saving a pointer into...
morriss [Fri, 20 May 2011 03:22:27 +0000 (03:22 +0000)]
Copy data from the TVB into ep_alloc'd memory, rather than saving a pointer into the TVB.

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

8 years agoUse tvb_get_ephemeral_string() instead of tvb_get_ptr().
morriss [Fri, 20 May 2011 03:20:20 +0000 (03:20 +0000)]
Use tvb_get_ephemeral_string() instead of tvb_get_ptr().

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

8 years agoUse tvb_bytes_to_str() instead of a homegrown version.
morriss [Fri, 20 May 2011 03:17:01 +0000 (03:17 +0000)]
Use tvb_bytes_to_str() instead of a homegrown version.

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

8 years agoUse TVB accessor functions instead of tvb_get_ptr()
morriss [Fri, 20 May 2011 03:15:18 +0000 (03:15 +0000)]
Use TVB accessor functions instead of tvb_get_ptr()

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

8 years agoUse tvb_ether_to_str()
morriss [Fri, 20 May 2011 03:12:56 +0000 (03:12 +0000)]
Use tvb_ether_to_str()

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

8 years agoFix annoying typo.
guy [Fri, 20 May 2011 02:44:12 +0000 (02:44 +0000)]
Fix annoying typo.

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

8 years agoUse proto_tree_add_item() instead of proto_tree_add_xxx() with a pointer into
morriss [Fri, 20 May 2011 02:42:14 +0000 (02:42 +0000)]
Use proto_tree_add_item() instead of proto_tree_add_xxx() with a pointer into
the TVB.

Introduce and start using tvb_get_manuf_name() and tvb_get_manuf_name_if_known()
which do the same as the non-tvb versions but take a tvb and an offset instead
of (commonly) a pointer into a TVB.

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

8 years agoIn at least some versions of OS X SystemStarter gets cranky if the
guy [Fri, 20 May 2011 02:35:05 +0000 (02:35 +0000)]
In at least some versions of OS X SystemStarter gets cranky if the
startup item is group-writable.

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

8 years agoAdd pdml2html.xsl to the source tarball.
guy [Thu, 19 May 2011 21:11:44 +0000 (21:11 +0000)]
Add pdml2html.xsl to the source tarball.

(Can we have a macro that has everything in pkgdata_DATA except for
COPYING, and use that macro in both the definition of pkgdata_DATA and
EXTRA_DIST?)

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

8 years agoUpdate the User's Guide.
gerald [Thu, 19 May 2011 21:09:29 +0000 (21:09 +0000)]
Update the User's Guide.

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

8 years agoDrop privileges after opening all pcap devices, not after the first one...
tuexen [Thu, 19 May 2011 20:48:58 +0000 (20:48 +0000)]
Drop privileges after opening all pcap devices, not after the first one...

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

8 years ago1.6 → 1.7.
gerald [Thu, 19 May 2011 20:37:36 +0000 (20:37 +0000)]
1.6 → 1.7.

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

8 years agoDon't assign to an unused 'proto item *': Coverity 1033 & 906
wmeier [Thu, 19 May 2011 20:21:08 +0000 (20:21 +0000)]
Don't assign to an unused 'proto item *': Coverity 1033 & 906

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

8 years agoIn case we have no interface information in the array, use the global value.
tuexen [Thu, 19 May 2011 20:20:35 +0000 (20:20 +0000)]
In case we have no interface information in the array, use the global value.
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5935.

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

8 years agoCreate subtree under the correct parent tree: Coverity 1138.
wmeier [Thu, 19 May 2011 20:16:10 +0000 (20:16 +0000)]
Create subtree under the correct parent tree: Coverity 1138.

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

8 years agoDon't assign a value which is never used to a 'proto item *': Covertiy 1135;
wmeier [Thu, 19 May 2011 20:13:54 +0000 (20:13 +0000)]
Don't assign a value which is never used to a 'proto item *': Covertiy 1135;
Remove some unneeded #includes.

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

8 years agoFix markup.
gerald [Thu, 19 May 2011 20:13:33 +0000 (20:13 +0000)]
Fix markup.

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

8 years agoUpdate the version and command output.
gerald [Thu, 19 May 2011 19:52:56 +0000 (19:52 +0000)]
Update the version and command output.

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

8 years ago#if 0 some not currently used code: Fixes Coverity 966 [UNUSED]
wmeier [Thu, 19 May 2011 19:48:39 +0000 (19:48 +0000)]
#if 0 some not currently used code: Fixes Coverity 966 [UNUSED]
Convert apparent "4 space tabs" to "4 spaces".

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

8 years agoRemove unneeded variable and code; Rename a function arg; Fix usage of _U_: Fixes...
wmeier [Thu, 19 May 2011 19:22:49 +0000 (19:22 +0000)]
Remove unneeded variable and code; Rename a function arg; Fix usage of _U_: Fixes Coverity 1146 [UNUSED]

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

8 years agoFOP 0.95 → 1.0.
gerald [Thu, 19 May 2011 19:03:22 +0000 (19:03 +0000)]
FOP 0.95 → 1.0.

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

8 years agoFrom Dirk Jagdmann via bug 5875:
gerald [Thu, 19 May 2011 18:10:21 +0000 (18:10 +0000)]
From Dirk Jagdmann via bug 5875:

My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.

The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.

To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml".  Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.

You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.

From me:

Minor fixups.

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

8 years agoGive some routines used for info levels that appear both in set and get
guy [Thu, 19 May 2011 16:22:21 +0000 (16:22 +0000)]
Give some routines used for info levels that appear both in set and get
names beginning with dissect_qspi_, and give some of them names with the
info level structure in them rather than the SNIA CIFS specification
section number.

Have separate routines for SMB_INFO_STANDARD and SMB_INFO_QUERY_EA_SIZE;
SMB_INFO_STANDARD is specified differently in the SNIA CIFS
specification and the MS-CIFS specification, and some captures have the
SNIA CIFS version, with the EA length and some have the MS-CIFS version
without it.  The dissector for SMB_INFO_STANDARD will dissect it if it's
there and not say "this structure is truncated" if it's not there.

Rename dissect_qfi_SMB_FILE_ALTERNATE_NAME_INFO() to
dissect_qfi_SMB_FILE_NAME_INFO(), as it also dissects
SMB_QUERY_FILE_NAME_INFO.

Merge the dissectors for SMB_FILE_ALLOCATION_INFO and
SMB_SET_FILE_ALLOCATION_INFO, and for SMB_FILE_END_OF_FILE_INFO and
SMB_SET_FILE_END_OF_FILE_INFO, as the structures are the same.

Dissect some presumed "passthrough info levels" the same way the
corresponding official SMB infos are dissected.

Expand some comments for info level dissectors to give the MS-CIFS
section number and to give some other details.

If an info level is truncated, put in an expert info error.

If we don't know about a given info level, just dissect the body as
"Information level unknown", rather than having it dissected as an
"unknown information" trailer.

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

8 years agoWhen capturing from multiple interface, indicate this in the main status bar.
tuexen [Thu, 19 May 2011 16:11:02 +0000 (16:11 +0000)]
When capturing from multiple interface, indicate this in the main status bar.

This patch is, as all other patches related to capturing from multiple interfaces,
based on work of Irene Ruengeler.

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