8 years agoRename the tap_dfilter_dlg.[ch] files to reflect that they can do more
guy [Sun, 5 Jun 2011 23:04:11 +0000 (23:04 +0000)]
Rename the tap_dfilter_dlg.[ch] files to reflect that they can do more
than just filters.

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

8 years agoSome work on generalizing the "display filter" tap parameter dialog box
guy [Sun, 5 Jun 2011 22:39:23 +0000 (22:39 +0000)]
Some work on generalizing the "display filter" tap parameter dialog box
to more generally support fetching parameters for taps.

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

8 years agoFrom Sean Van Gorder:
etxrab [Sun, 5 Jun 2011 20:12:44 +0000 (20:12 +0000)]
From Sean Van Gorder:
When Wireshark attempts to read an SNMP packet with a variable-bindings item
with an OID containing an index string which includes an entry of type
"Unsigned32", Wireshark will stop dissecting the packet at this index entry and
end with the error:

[Dissector bug, protocol SNMP: proto.c:2761: failed assertion


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

8 years agoFrom Ivan Kluchnikov:
etxrab [Sun, 5 Jun 2011 19:58:02 +0000 (19:58 +0000)]
From Ivan Kluchnikov:

GSMTAP carries payload in various formats of WiMAX interfaces.
It uses the wimax plugin to decode the WiMAX bursts.


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

8 years agoFrom Aamer Akhter:
etxrab [Sun, 5 Jun 2011 19:45:22 +0000 (19:45 +0000)]
From Aamer Akhter:
This patch adds support for a number of performance related metric in NetFlow.


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

8 years agoFrom Cal Turney:
etxrab [Sun, 5 Jun 2011 19:40:05 +0000 (19:40 +0000)]
From Cal Turney:

1.) The resolution of the time values displayed by tshark's "-z io,stat, ..."
should be increased from milliseconds to microseconds (from 3 to 6 decimal
places) in order to be consistent with -z relative time-related options such as
"-z smb,rtt" and "-z rpc,rtt" which display values to 5 decimal places.
[Please note that separate enhancement requests for 6 decimal of precision in
Wireshark will be submitted shortly.)

2.) The "frames  bytes" column displayed in '-z io,stat' is too narrow, frames
    and bytes should each have 15 spaces like all the other column types.

3.) The types "FRAMES" and "BYTES" should be added to allow users to display
    these values separately and allow for filters to be specified.

4.) The 'SUM' option should allow for relative time values such as SRTs to be
    summed.  This would be useful for the calculation of such things as
    request concurrency (total_SRT_time / duration).

5.) The tshark man page needs some corrections and readability improvements


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

8 years agoFix memleaks and sigsegv when coping to clipboard RTP Streams.
darkjames [Sun, 5 Jun 2011 19:35:36 +0000 (19:35 +0000)]
Fix memleaks and sigsegv when coping to clipboard RTP Streams.

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

8 years agoCollect number of errors form ABI checks runs in compare-abis.sh.
rbalint [Sun, 5 Jun 2011 19:29:30 +0000 (19:29 +0000)]
Collect number of errors form ABI checks runs in compare-abis.sh.

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

8 years agowrong sort of column “Packets” in “RTP Streams” window.
etxrab [Sun, 5 Jun 2011 16:33:00 +0000 (16:33 +0000)]
wrong sort of column “Packets” in “RTP Streams” window.


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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-06-05]
gerald [Sun, 5 Jun 2011 15:03:58 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-06-05]

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

8 years agoClean up indentation.
guy [Sun, 5 Jun 2011 02:48:03 +0000 (02:48 +0000)]
Clean up indentation.

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

8 years agoAdding script for comparing ABI's of different Wireshark versions.
rbalint [Sat, 4 Jun 2011 22:27:38 +0000 (22:27 +0000)]
Adding script for comparing ABI's of different Wireshark versions.

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

8 years agoInclude config.h and define _U_ for dumping ABI.
rbalint [Sat, 4 Jun 2011 21:30:27 +0000 (21:30 +0000)]
Include config.h and define _U_ for dumping ABI.

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

8 years agoUse more include dirs for ABI dumping to make preprocessor happier.
rbalint [Sat, 4 Jun 2011 21:29:13 +0000 (21:29 +0000)]
Use more include dirs for ABI dumping to make preprocessor happier.

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

8 years agoFix wiretap headers to allow error-free ABI dumping.
rbalint [Sat, 4 Jun 2011 21:20:57 +0000 (21:20 +0000)]
Fix wiretap headers to allow error-free ABI dumping.

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

8 years agoTry to pacify the OSX build bot.
etxrab [Sat, 4 Jun 2011 20:14:06 +0000 (20:14 +0000)]
Try to pacify the OSX build bot.

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

8 years agoTry to fix part of the build bot errors.
etxrab [Sat, 4 Jun 2011 19:17:28 +0000 (19:17 +0000)]
Try to fix part of the build bot errors.

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

8 years agoReorganize dumpabi targets to keep temporary files
rbalint [Sat, 4 Jun 2011 16:44:37 +0000 (16:44 +0000)]
Reorganize dumpabi targets to keep temporary files

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

8 years agoFrom Michael Mann:
etxrab [Sat, 4 Jun 2011 15:45:50 +0000 (15:45 +0000)]
From Michael Mann:
I made the following improvements to the Modbus/TCP dissector:

1. Implemented protocol to the latest specification (v1.1b).  See
2. Upgraded to "tcp_dissect_pdus" instead of having the dissector do it
manually.  This also provides TCP packet reassembly support.
3. Removed support for UDP port 502 because it's not supported by the protocol
specification.  I believe "Decode As..." could be used in its place.
4. Added dissector support for the following function codes:
  a) 8 - Diagnostics
  b) 11 - Event Counter
  c) 12 - Event Log
  d) 43 - Encapsulation Transport (mostly for 43/14)
5. Removed support for function codes not in the protocol specification. None
of them were really being parsed, they just offered a "name" for the function
6. Moved protocol #defines to header file for access from other dissectors.  I
plan to have other dissectors use this, but one patch at a time.
7. Created "modbus" dissector that is accessible to other dissectors.
8. Renamed base "display filter name" to reflect PROTOABBREV.

I removed defines for value_strings, I think it's better to export the vaöue strings if needed.


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

8 years agoDump ABI using all header files related to libwireshark
rbalint [Sat, 4 Jun 2011 14:23:49 +0000 (14:23 +0000)]
Dump ABI using all header files related to libwireshark

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

8 years agoFrom Michael Mann:
etxrab [Sat, 4 Jun 2011 13:50:38 +0000 (13:50 +0000)]
From Michael Mann:
UATification of vcdu.

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

8 years agoFrom Michael Mann:
etxrab [Sat, 4 Jun 2011 13:47:19 +0000 (13:47 +0000)]
From Michael Mann:
UATification of isakmp dissector.

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

8 years agoFrom Roland Knall via bug 5977:
gerald [Fri, 3 Jun 2011 16:56:09 +0000 (16:56 +0000)]
From Roland Knall via bug 5977:

Handling of SercosIII if the plugin can not be loaded.

Changed the behaviour - if the SercosIII plugin is not available, the
openSAFETY dissector registers itself for ETHERTYPE_SERCOS. SercosIII
packages can not be dissected anyway in such a case and currently no
other dissector will handle those packages.

The following steps will be taken to display the situation to the user:

The message "SercosIII dissector not available, openSAFETY/SercosIII
native dissection." will be added to the tree. Additionally a similar
warning will be presented on the console during startup of wireshark.

All openSAFETY packages will be dissected, displaying the normal
openSAFETY information.

This will be more transparent for the customer.

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

8 years agoFrom Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
alagoutte [Fri, 3 Jun 2011 06:47:23 +0000 (06:47 +0000)]
From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
Fix a minor typo about bitmask of a reserved field.

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

8 years agoAdd some notes about attributes with a special format.
guy [Fri, 3 Jun 2011 01:26:08 +0000 (01:26 +0000)]
Add some notes about attributes with a special format.

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

8 years agoUpdate a URL.
guy [Fri, 3 Jun 2011 01:05:22 +0000 (01:05 +0000)]
Update a URL.

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

8 years agoGive some additional information about the format of the Command-Code
guy [Thu, 2 Jun 2011 18:33:14 +0000 (18:33 +0000)]
Give some additional information about the format of the Command-Code

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

8 years agoAdd Michael Chen for his contributions to DTLS.
cmaynard [Thu, 2 Jun 2011 17:19:38 +0000 (17:19 +0000)]
Add Michael Chen for his contributions to DTLS.

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

8 years agoFrom Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5983:
cmaynard [Thu, 2 Jun 2011 17:12:13 +0000 (17:12 +0000)]
From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5983:
Use offset instead of fragment_offset for boundary check.

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

8 years agoFix Bug #5984: Infinite loop caused by fcn call arg conversion: guint->guint8
wmeier [Thu, 2 Jun 2011 14:22:19 +0000 (14:22 +0000)]
Fix Bug #5984: Infinite loop caused by fcn call arg conversion: guint->guint8

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

8 years agoRemove extra space at end of IMSI.
etxrab [Thu, 2 Jun 2011 11:06:26 +0000 (11:06 +0000)]
Remove extra space at end of IMSI.

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

8 years agoAdd Id to info column. Makes detecting duplicates and
jmayer [Thu, 2 Jun 2011 07:59:36 +0000 (07:59 +0000)]
Add Id to info column. Makes detecting duplicates and
matching answers so much easier.

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

8 years agoCommit 37516 broke compilation for me in 3 places (with -Werror):
jmayer [Thu, 2 Jun 2011 07:46:08 +0000 (07:46 +0000)]
Commit 37516 broke compilation for me in 3 places (with -Werror):
- get_full_XXX functions are unused in the code
- A case statement which handles only 2 of the many enum elements
  creates another warning promoted to error
- The patch removed usage of a variable but not the variable declaration

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

8 years agoFrom Michael Mann:
etxrab [Thu, 2 Jun 2011 07:11:26 +0000 (07:11 +0000)]
From Michael Mann:
UATification of ESP

UATification of ESP SA keys.  Some notes:
1. Trimmed a lot of fat removing the code that parsed (and reparsed) ESP SA
keys, since UATs can take care of all that.
2. There was no validation on the src/dest, so that was carried through (ie
there is still no validation of src/dest fields)
3. Formatting of the source was a little off, so I attempted to fix the
functions I needed to deal with.  I know that's frowned upon, but the braces
were such that I couldn't tell if/else blocks to understand the code.  If
somebody wanted to run an indent program on the file, that would be

Added some casts to make it compile on win64.

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

8 years agoFrom Matthieu Patou <mat@matws.net>
sahlberg [Thu, 2 Jun 2011 06:59:23 +0000 (06:59 +0000)]
From Matthieu Patou <mat@matws.net>

Add extra paths for finding GTK2
This makes wireshark build on 64 bit Natty boxens

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

8 years agoAllow filtering on docsis-capability-type field;
wmeier [Thu, 2 Jun 2011 00:56:41 +0000 (00:56 +0000)]
Allow filtering on docsis-capability-type field;
Rename docs_cm_... to docsis_cm_cap_....
Do whitespace & indentation cleanup.

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

8 years agoExit if we don't have enough plugins.
gerald [Wed, 1 Jun 2011 21:56:11 +0000 (21:56 +0000)]
Exit if we don't have enough plugins.

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

8 years agoShow the plugin paths in Help→About→Plugins. Add a "-G plugins" option
gerald [Wed, 1 Jun 2011 21:48:17 +0000 (21:48 +0000)]
Show the plugin paths in Help→About→Plugins. Add a "-G plugins" option
to TShark which dumps a list of plugins.

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

8 years agoFrom Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863, with...
cmaynard [Wed, 1 Jun 2011 18:34:41 +0000 (18:34 +0000)]
From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863, with some additional enhancements by me:  Add dtls heuristics.

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

8 years agoIf a dissector table doesn't exist, print a more useful message, and
guy [Wed, 1 Jun 2011 18:02:16 +0000 (18:02 +0000)]
If a dissector table doesn't exist, print a more useful message, and

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

8 years agoRemove the temporary debugging stuff.
guy [Wed, 1 Jun 2011 16:23:51 +0000 (16:23 +0000)]
Remove the temporary debugging stuff.

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

8 years agoYet another cast to uint.
stig [Wed, 1 Jun 2011 13:58:19 +0000 (13:58 +0000)]
Yet another cast to uint.

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

8 years agoCorrected usage of uint/pointer conversion.
stig [Wed, 1 Jun 2011 13:57:13 +0000 (13:57 +0000)]
Corrected usage of uint/pointer conversion.

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

8 years agoAdded support for DMP version 2 and some national variants.
stig [Wed, 1 Jun 2011 13:31:48 +0000 (13:31 +0000)]
Added support for DMP version 2 and some national variants.

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

8 years agoImprove handling of command line arg errors (for example "wireshark -f").
tuexen [Wed, 1 Jun 2011 09:26:33 +0000 (09:26 +0000)]
Improve handling of command line arg errors (for example "wireshark -f").
From Irene Ruengeler.

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

8 years agoTemporary debugging stuff to see in what environment tshark is being
guy [Wed, 1 Jun 2011 09:12:10 +0000 (09:12 +0000)]
Temporary debugging stuff to see in what environment tshark is being
run - the plugins might not be getting loaded, and the goal is to figure
out why.

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

8 years agoFrom Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
alagoutte [Tue, 31 May 2011 21:41:43 +0000 (21:41 +0000)]
From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
802.11 Tag WME Qos Info field is not decoded

From me :
* Update from Trunk
* Make item fiterable

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

8 years agoRemove HAVE_AIRPDCAP
etxrab [Tue, 31 May 2011 21:41:00 +0000 (21:41 +0000)]

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

8 years agoRemove HAVE_AIRPDCAP
etxrab [Tue, 31 May 2011 21:38:39 +0000 (21:38 +0000)]

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

8 years agoREmove the check for HAVE_AIRPDCAP
etxrab [Tue, 31 May 2011 21:34:23 +0000 (21:34 +0000)]
REmove the check for HAVE_AIRPDCAP

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

8 years agoAdd abi-descriptor.template to the distribution.
gerald [Tue, 31 May 2011 20:45:28 +0000 (20:45 +0000)]
Add abi-descriptor.template to the distribution.

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

8 years agoHandle snaplen before choplen for consistency. Also, if chopping more bytes
cmaynard [Tue, 31 May 2011 20:24:26 +0000 (20:24 +0000)]
Handle snaplen before choplen for consistency.  Also, if chopping more bytes
than present, just chop all by setting caplen to 0.  In all cases, don't touch
len.  In other words, change incl_len but leave orig_len alone.

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

8 years agoFrom Roland Knall: openSAFETY dissector.
guy [Tue, 31 May 2011 19:31:45 +0000 (19:31 +0000)]
From Roland Knall: openSAFETY dissector.

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

8 years agoEnhance Vendor Specific IE (227)
alagoutte [Tue, 31 May 2011 19:30:53 +0000 (19:30 +0000)]
Enhance Vendor Specific IE (227)
Specifically WPA/WME sub dissector
* Rework from scratch VS WPA/WME dissector
* Replace proto_tree_add_text/string (ugly hf_ieee80211_tag_interpretation header field...) by proto_tree_add_item
* Make item filterable
* and other stuff...

Based on WMM_Specification_1-1

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

8 years agoTry adding the fifo step to Wireshark. Clean up the order of tests.
gerald [Tue, 31 May 2011 18:34:24 +0000 (18:34 +0000)]
Try adding the fifo step to Wireshark. Clean up the order of tests.

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

8 years agoFix some gcc 'old-style function definition' warnings.
wmeier [Tue, 31 May 2011 15:49:59 +0000 (15:49 +0000)]
Fix some gcc 'old-style function definition' warnings.

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

8 years agoWhen a snaplen is specified using "-s <snaplen", if it's smaller than the
cmaynard [Tue, 31 May 2011 15:31:34 +0000 (15:31 +0000)]
When a snaplen is specified using "-s <snaplen", if it's smaller than the
original capture file's snaplen, save the new snaplen in the capture file
header so wireshark and capinfos can report it.

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

8 years agoDeclare the snapshot_length as unsigned.
cmaynard [Tue, 31 May 2011 15:27:48 +0000 (15:27 +0000)]
Declare the snapshot_length as unsigned.

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

8 years agoGet rid of has_cfilter to simplify the handling of multiple interfaces.
tuexen [Tue, 31 May 2011 14:49:21 +0000 (14:49 +0000)]
Get rid of has_cfilter to simplify the handling of multiple interfaces.

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

8 years agoImprove handling of command line errors.
tuexen [Tue, 31 May 2011 14:45:55 +0000 (14:45 +0000)]
Improve handling of command line errors.

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

8 years agoAdd top-level dumpabi target.
rbalint [Tue, 31 May 2011 14:33:49 +0000 (14:33 +0000)]
Add top-level dumpabi target.

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

8 years agoFixing wrong library names in r37474
rbalint [Tue, 31 May 2011 12:09:47 +0000 (12:09 +0000)]
Fixing wrong library names in r37474

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

8 years agoAdd dumpabi target to Makefiles in wsutil, epan and wiretap directories.
rbalint [Tue, 31 May 2011 12:07:25 +0000 (12:07 +0000)]
Add dumpabi target to Makefiles in wsutil, epan and wiretap directories.
We can use the dumped ABI description for comparing ABI changes between revisions.

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

8 years agoDon't limit the snaplen if not reqested.
tuexen [Tue, 31 May 2011 07:30:38 +0000 (07:30 +0000)]
Don't limit the snaplen if not reqested.
Found by Irene Ruengeler.

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

8 years agoFrom Michael Mann:
etxrab [Tue, 31 May 2011 06:01:09 +0000 (06:01 +0000)]
From Michael Mann:
Dissect DVB-CI host control resource
according to section 8.5.1 of the DVB-CI specification (EN50221).


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

8 years agoInclude the profile name in the Edit item in the profiles popup.
stig [Mon, 30 May 2011 12:49:04 +0000 (12:49 +0000)]
Include the profile name in the Edit item in the profiles popup.

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

8 years agoRenamed reassembled snmp bytes buffer to "Reassembled SMTP".
stig [Mon, 30 May 2011 12:43:35 +0000 (12:43 +0000)]
Renamed reassembled snmp bytes buffer to "Reassembled SMTP".

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

8 years agoChanged "Rename" to "Edit" in profiles popup menu.
stig [Mon, 30 May 2011 12:42:46 +0000 (12:42 +0000)]
Changed "Rename" to "Edit" in profiles popup menu.

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

8 years agoFrom Michael Mann:
etxrab [Mon, 30 May 2011 06:10:25 +0000 (06:10 +0000)]
From Michael Mann:
UATification of 802.11 decryption keys.

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

8 years agoRemove unused varable:
etxrab [Sun, 29 May 2011 19:50:55 +0000 (19:50 +0000)]
Remove unused varable:
iseries.c:305: warning: unused variable 'tcpformat'

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

8 years agoFrom Martin Warnes:
etxrab [Sun, 29 May 2011 19:36:21 +0000 (19:36 +0000)]
From Martin Warnes:
This is significant update to the existing iseries wiretap module. It adds
support for IPv6 (formatted & unformatted comms traces), in addition I've
tidied up the sscanf routines to better handle traces files with offset lines.


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

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

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

8 years agoRemove an (almost) duplicate entry
jmayer [Sun, 29 May 2011 14:06:14 +0000 (14:06 +0000)]
Remove an (almost) duplicate entry

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

8 years agoAdd some comments about RSN IE
alagoutte [Sun, 29 May 2011 13:04:06 +0000 (13:04 +0000)]
Add some comments about RSN IE
Fix some Clang Warnings

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

8 years agoDon't return offset when it is the end of Extended Capability IE (Only use break)
alagoutte [Sun, 29 May 2011 12:51:10 +0000 (12:51 +0000)]
Don't return offset when it is the end of Extended Capability IE (Only use break)

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

8 years agoFix a wrong length when there is unknown Atheros IE Data
alagoutte [Sun, 29 May 2011 12:16:53 +0000 (12:16 +0000)]
Fix a wrong length when there is unknown Atheros IE Data

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

8 years agoRev 37446 added export_sslkeys.c
jmayer [Sun, 29 May 2011 08:51:04 +0000 (08:51 +0000)]
Rev 37446 added export_sslkeys.c

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

8 years agoFrom Martin Kaiser:
etxrab [Sun, 29 May 2011 06:59:54 +0000 (06:59 +0000)]
From Martin Kaiser:
allows filtering
of the event in the pseudo header and removes the pointless filter for


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

8 years agoFrom Martin Kaiser:
etxrab [Sun, 29 May 2011 06:43:27 +0000 (06:43 +0000)]
From Martin Kaiser:
DVB-CI dissector: exception in close_session_request apdus (wrong offset)


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

8 years agoFrom Martin Kaiser:
etxrab [Sun, 29 May 2011 06:34:05 +0000 (06:34 +0000)]
From Martin Kaiser:
 checks the address of the Configuration
Option Register that is used for switching a PC-Card in DVB-CI mode.

The address must be <= 0xffe..


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

8 years agoFrom Martin Kaiser:
etxrab [Sun, 29 May 2011 06:29:48 +0000 (06:29 +0000)]
From Martin Kaiser:
 implements the DVB-CI date-time resource
according to section 8.5.2 of the DVB-CI specification (EN50221).


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

8 years ago- Added new SignatureIdentity values.
etxrab [Sun, 29 May 2011 06:16:19 +0000 (06:16 +0000)]
- Added new SignatureIdentity values.
From Marc Petit-Huguenin:
- Removed directResponseForwarding.
- The certificate_type enum is now defined as RFC 6091's CertificateType
  so moved the definition to packet-ssl-utils.[ch].
- Fixed invalid values for CERTIFICATE_BY_NODE and CERTIFICATE_BY_USER

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

8 years agoFrom Pascal Quantin:
etxrab [Sun, 29 May 2011 06:06:22 +0000 (06:06 +0000)]
From Pascal Quantin:
Update 3GPP NAS MS Radio Access Capability dissection to Release 9.

From me change all enc type to ENC_BIG_ENDIAN.

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

8 years agoMake a routine not used outside this file static.
guy [Sun, 29 May 2011 00:08:27 +0000 (00:08 +0000)]
Make a routine not used outside this file static.

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

8 years agoSquelch yet another warning.
guy [Sat, 28 May 2011 22:52:00 +0000 (22:52 +0000)]
Squelch yet another warning.

Use the ws_ "routines" (really #defines) for consistency.

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

8 years agoMore warning squelching. (Thank you, GLib developers, for using gulong
guy [Sat, 28 May 2011 22:17:22 +0000 (22:17 +0000)]
More warning squelching.  (Thank you, GLib developers, for using gulong
rather than gsize as the second argument to the GLib snprintf routines.)

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

8 years agoGet rid of some warnings on Win64.
guy [Sat, 28 May 2011 20:55:21 +0000 (20:55 +0000)]
Get rid of some warnings on Win64.

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

8 years agoAdd "File -> Export -> SSL Session Keys..." to be able to save the keyring info for...
sake [Sat, 28 May 2011 18:17:50 +0000 (18:17 +0000)]
Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.

(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)

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

8 years agoInitialize pcap using an empty array instead of NULL. So no special
tuexen [Sat, 28 May 2011 12:48:21 +0000 (12:48 +0000)]
Initialize pcap using an empty array instead of NULL. So no special
check is needed.

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

8 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5959
cmaynard [Fri, 27 May 2011 18:18:28 +0000 (18:18 +0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5959
Use _U_ for unused function parameter.

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

8 years agoUse a non-volatile temporary variable as a parameter to DISSECTOR_ASSERT().
cmaynard [Fri, 27 May 2011 18:08:46 +0000 (18:08 +0000)]
Use a non-volatile temporary variable as a parameter to DISSECTOR_ASSERT().
This avoids an "assert with side effects" warning and resolves Coverity CID322.

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

8 years agoPut proto_reg_handoff_...() at the end of the file as per the usual Wireshark convention.
wmeier [Fri, 27 May 2011 15:51:21 +0000 (15:51 +0000)]
Put proto_reg_handoff_...() at the end of the file as per the usual Wireshark convention.

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

8 years agoWhen parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
cmaynard [Fri, 27 May 2011 14:38:42 +0000 (14:38 +0000)]
When parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
number of bytes consumed.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962

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

8 years agoFix a gcc 4.6 error: "variable might be clobbered by 'longjmp' or 'vfork' [-Werror...
wmeier [Fri, 27 May 2011 13:23:54 +0000 (13:23 +0000)]
Fix a gcc 4.6 error: "variable might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]"

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

8 years agoRemove some stuff again.
etxrab [Fri, 27 May 2011 13:16:28 +0000 (13:16 +0000)]
Remove some stuff again.

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

8 years agoOne more still dirty.
stig [Fri, 27 May 2011 12:46:35 +0000 (12:46 +0000)]
One more still dirty.

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

8 years agoInclude missing files in distribution.
etxrab [Fri, 27 May 2011 12:22:20 +0000 (12:22 +0000)]
Include missing files in distribution.

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

8 years agoMoved nbap and pcap back as dirty dissectors.
stig [Fri, 27 May 2011 11:58:47 +0000 (11:58 +0000)]
Moved nbap and pcap back as dirty dissectors.

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

8 years agoCorrected "old-style function definition".
stig [Fri, 27 May 2011 11:03:04 +0000 (11:03 +0000)]
Corrected "old-style function definition".

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

8 years agoTry building some ASN.1 dissectors as clean.
stig [Fri, 27 May 2011 10:52:25 +0000 (10:52 +0000)]
Try building some ASN.1 dissectors as clean.

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