obnox/wireshark/wip.git
12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Tue, 7 Jun 2011 22:50:49 +0000 (22:50 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup in some cases.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
wmeier [Tue, 7 Jun 2011 22:28:55 +0000 (22:28 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings

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

12 years agoFrom Daniel Willmann: Lontalk protocol (EIA-709.1)
wmeier [Tue, 7 Jun 2011 21:10:44 +0000 (21:10 +0000)]
From Daniel Willmann: Lontalk protocol (EIA-709.1)

Attached is a dissector for the Lontalk protocol (EIA-709.1). This dissector
registers as a subdissector of the CN/IP protocol.

Some code (mostly definitions) were taken from Bug #2252
(http://bugs.wireshark.org/bugzilla/attachment.cgi?id=4562)

From me: minor mostly cosmetic changes.

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

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

12 years agoPut packet-cnip.c in the right group (DISSECTOR_SRC not ASN1_DISSECTOR_SRC).
wmeier [Tue, 7 Jun 2011 21:02:29 +0000 (21:02 +0000)]
Put packet-cnip.c in the right group (DISSECTOR_SRC not ASN1_DISSECTOR_SRC).

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

12 years agoMove packet-sercosiii.c to be a builtin dissector.
etxrab [Tue, 7 Jun 2011 20:33:26 +0000 (20:33 +0000)]
Move packet-sercosiii.c to be a builtin dissector.

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

12 years agoFrom Daniel Willmann: dissector for EIA-852 protocol (Component Network over IP)
wmeier [Tue, 7 Jun 2011 18:56:24 +0000 (18:56 +0000)]
From Daniel Willmann: dissector for EIA-852 protocol (Component Network over IP)

Attached is a dissector for CN/IP protocol described in EIA-852. It is mainly
used to encapsulate and send Lontalk (EIA-709.1) or EIA-600 frames over UDP (or
TCP).

This dissector can only decode the common header and data frames can be decoded
by further dissectors.

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

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

12 years agoAdd more missing files.
etxrab [Tue, 7 Jun 2011 15:05:45 +0000 (15:05 +0000)]
Add more missing files.

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

12 years agoDelete no longer used .h file
etxrab [Tue, 7 Jun 2011 14:16:40 +0000 (14:16 +0000)]
Delete no longer used .h file

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

12 years agoAdd files to distribution.
etxrab [Tue, 7 Jun 2011 14:15:50 +0000 (14:15 +0000)]
Add files to distribution.

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

12 years agoWhen doing remote capturing using WinPCap, dumpcap crashes inside the WinPCap
tuexen [Tue, 7 Jun 2011 12:23:15 +0000 (12:23 +0000)]
When doing remote capturing using WinPCap, dumpcap crashes inside the WinPCap
library when no capture filter is used. Then cfilter is NULL and
capture_loop_init_filter() does not call compile_capture_filter() and
pcap_setfilter(). Providing an empty string instead of NULL works around
the problem.

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

12 years agoAdd description of LOAD stats for tshark to the manpage
sahlberg [Tue, 7 Jun 2011 10:27:44 +0000 (10:27 +0000)]
Add description of LOAD stats for tshark to the manpage

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

12 years agoAdded code to distinguish conversations between different RTUs that happen to use...
grahamb [Mon, 6 Jun 2011 22:32:37 +0000 (22:32 +0000)]
Added code to distinguish conversations between different RTUs that happen to use the same address\port pair.

Based on patch supplied by Kelvin Proctor.

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

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

12 years agoAdd links to libtool's recommendations for library versions.
gerald [Mon, 6 Jun 2011 21:40:40 +0000 (21:40 +0000)]
Add links to libtool's recommendations for library versions.

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

12 years agoBump the version.
gerald [Mon, 6 Jun 2011 21:03:49 +0000 (21:03 +0000)]
Bump the version.

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

12 years agoFrom Pascal Quantin:
etxrab [Mon, 6 Jun 2011 20:01:53 +0000 (20:01 +0000)]
From Pascal Quantin:
Add the following enhancements to the UMTS RLC dissector
(as specified in 3GPP 25.322 v9.2.0):
- UDP framing protocol to allow dissection of RLC PDUs over UDP (like what is
done for LTE MAC/RLC/PDCP protocols)
- 15 bits Length Indicator support (both with variable and fixed LI size)
- Poll type SUFI
- enhanced dissection of LIST, Relative List and Bitmap SUFI
- dissection of Reset and Reset Ack Control PDU
- an option to decode RLC headers only
- an option to skip SDU reassembly

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

12 years agoFix Unix compilation error...
sfisher [Mon, 6 Jun 2011 19:49:31 +0000 (19:49 +0000)]
Fix Unix compilation error...

packet-3g-a11.c:135: warning: 'hf_a11_fqi_granted_qos' defined but not used

... by removing definition

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

12 years agoFrom Michael Mann:
etxrab [Mon, 6 Jun 2011 19:45:51 +0000 (19:45 +0000)]
From Michael Mann:

I made 2 changes when merging the source into a single file:
1. Changed filtername to "siii" to match display filter fields (was quicker
than changing all display filter fields to "sercosiii"
2. Converted the "ett_siii arrays" to a single value.   Each subtree doesn't
need its own ett_ value.

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

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

12 years agoOn behalf of Ericsson - enhance A11 dissection.
etxrab [Mon, 6 Jun 2011 19:17:32 +0000 (19:17 +0000)]
On behalf of Ericsson - enhance A11 dissection.

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

12 years agoBump the wiretap version.
gerald [Mon, 6 Jun 2011 16:29:23 +0000 (16:29 +0000)]
Bump the wiretap version.

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

12 years agoWarn if there are > 2 padding subheaders at the beginning of a frame.
martinm [Mon, 6 Jun 2011 16:07:09 +0000 (16:07 +0000)]
Warn if there are > 2 padding subheaders at the beginning of a frame.

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

12 years agoWe're now using fop-1.0 on Windows;
wmeier [Mon, 6 Jun 2011 15:32:40 +0000 (15:32 +0000)]
We're now using fop-1.0 on Windows;
Also: remove trailing whitespace from lines.

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

12 years agoMake the windows builds work again.
etxrab [Mon, 6 Jun 2011 13:34:53 +0000 (13:34 +0000)]
Make the windows builds work again.

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

12 years agoAdd support for LOAD() calculations to tshark too just like I incorrectly
sahlberg [Mon, 6 Jun 2011 10:34:51 +0000 (10:34 +0000)]
Add support for LOAD() calculations to tshark too just like I incorrectly
stated it had at SNIA years ago.

Example :
tshark -n -r ../captures/smbwrite.cap
  -z "io,stat,0.001,LOAD(smb.time)smb.time" -q

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

12 years agoFrom Roland Knall:
etxrab [Mon, 6 Jun 2011 10:32:19 +0000 (10:32 +0000)]
From Roland Knall:
Modbus/TCP: Calculating the drop-out criteria for special data dissection fails.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5997

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

12 years agoAvoid no-newline-at-end-of-file warning.
martinm [Mon, 6 Jun 2011 09:40:30 +0000 (09:40 +0000)]
Avoid no-newline-at-end-of-file warning.

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

12 years agoFrom Roland Knall via bug 5996:
stig [Mon, 6 Jun 2011 08:33:33 +0000 (08:33 +0000)]
From Roland Knall via bug 5996:
Corrected old-style function definition.

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

12 years agoFrom Roland Knall via bug 5995:
stig [Mon, 6 Jun 2011 07:09:49 +0000 (07:09 +0000)]
From Roland Knall via bug 5995:
Fix CMake build.

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

12 years agoAdd support for PARAM_ENUM tap parameters, and use the tap_param_dlg
guy [Mon, 6 Jun 2011 01:04:56 +0000 (01:04 +0000)]
Add support for PARAM_ENUM tap parameters, and use the tap_param_dlg
stuff for the SCSI SRT tap.

Get rid of include of gtk/filter_dlg.h in stats taps that don't need it.

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

12 years agoClean up indentation - use 4-space indentation uniformly. (No tabs -
guy [Sun, 5 Jun 2011 23:16:14 +0000 (23:16 +0000)]
Clean up indentation - use 4-space indentation uniformly.  (No tabs -
tab stops aren't necessarily every 4 spaces.)

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

12 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

12 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

12 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
"DISSECTOR_ASSERT_NOT_REACHED"]

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

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

12 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.

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

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

12 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.

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

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

12 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

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

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

12 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

12 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

12 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.

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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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
http://www.modbus.org/specs.php.
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
code.
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.

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

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

12 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

12 years agoFrom Michael Mann:
etxrab [Sat, 4 Jun 2011 13:50:38 +0000 (13:50 +0000)]
From Michael Mann:
UATification of vcdu.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

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

12 years agoFrom Michael Mann:
etxrab [Sat, 4 Jun 2011 13:47:19 +0000 (13:47 +0000)]
From Michael Mann:
UATification of isakmp dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

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

12 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

12 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

12 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

12 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

12 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
value.

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

12 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

12 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

12 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
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5984

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

12 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

12 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

12 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
  itself.

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

12 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
appreciated.

Added some casts to make it compile on win64.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

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

12 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

12 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

12 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

12 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

12 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

12 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
only abort if WIRESHARK_ABORT_ON_DISSECTOR_BUG is set.

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

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

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

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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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).

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

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

12 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

12 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

12 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

12 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.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

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

12 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

12 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.

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

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