guy [Sat, 11 Jun 2011 21:49:24 +0000 (21:49 +0000)]
Use spaces uniformly in AC_WIRESHARK_PYTHON_CHECK.
If we don't find python-config, set want_python to no, so the
end-of-configuration message says we're not using the Python
interpreter. Also fix some cases where we were setting want_zlib rather
than want_python (cut-and-pasteo).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37654
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 20:24:24 +0000 (20:24 +0000)]
Just as with autoconf, we need to include the Python cflags when
building libwireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37653
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 19:05:17 +0000 (19:05 +0000)]
Do the Python embedding similarly to other "default = yes, if available"
items.
Add some quoting to the zlib tests, just in case the argument contains
white space.
Clean up capitalization of Lua and Python.
Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37652
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 17:20:44 +0000 (17:20 +0000)]
Include <Python.h> to get the Python version number.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37651
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 02:35:58 +0000 (02:35 +0000)]
The "shared by every program in the Wireshark suite, including dumpcap"
version information doesn't include Python version information (only
programs using libwireshark have that) or GeoIP version information
(ditto). Don't include headers required only for that information;
hopefully this will keep dumpcap from requiring the Python library on
Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37650
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 10 Jun 2011 17:25:55 +0000 (17:25 +0000)]
Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37649
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 10 Jun 2011 17:16:09 +0000 (17:16 +0000)]
Add some more error checking.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37648
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 16:27:53 +0000 (16:27 +0000)]
Make capture dialog compile with GTK3+
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37647
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 11:01:43 +0000 (11:01 +0000)]
Seemingly this is needed to...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37646
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 08:31:14 +0000 (08:31 +0000)]
Add casts to make it compile on some old ERHL box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37645
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 08:30:17 +0000 (08:30 +0000)]
From Pascal Quantin:
allowing Length Indicator 0x7ffb for RLC AM PDUs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37644
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 10 Jun 2011 07:16:10 +0000 (07:16 +0000)]
Fix capinfo: ** ERROR **: Unknown capture file type 61
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37643
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 10 Jun 2011 02:10:44 +0000 (02:10 +0000)]
Add a hack to prevent a gcc warning "ignoring return value of 'strtoul'..."
for some gcc configurations (see _FORTIFY_SOURCE).
This hack is used instead of storing the result returned by strtoul() in a
dummy variable so as to prevent a gcc 4.6 with -Wextra warning:
"set but not used ...".
TBD: will this hack pass muster with other validators
such as Coverity, CLang, & etc ?
For much gory detail: see the message thread starting at:
http://www.wireshark.org/lists/wireshark-dev/201106/msg00088.html
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37642
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 23:14:57 +0000 (23:14 +0000)]
Add another cast.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37641
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 9 Jun 2011 22:46:00 +0000 (22:46 +0000)]
The only place where we care about zlib is file_wrappers.c; include
<zlib.h> there, rather than wtap-int.h. That obviates the need to
include config.h earlier in ascend_scanner.l; revert the previous
change, so we don't require a version of Flex that supports %top.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37640
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 22:42:44 +0000 (22:42 +0000)]
Add a couple of casts to make Visual C++ happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37639
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 22:01:57 +0000 (22:01 +0000)]
Fix possible compilation errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37638
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 21:37:19 +0000 (21:37 +0000)]
- Add something to columns when using mime-encap
- Replace decoders in wiretap/CMakeLists.txt
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37637
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 21:21:06 +0000 (21:21 +0000)]
- Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
- Add new dissector packet-mime-encap which understands mime_file fragmentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37636
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 21:13:40 +0000 (21:13 +0000)]
Move the copyright notice and the config.h include to the top of the
file so that we have the proper definitions in place for large file
support on Solaris (bug 6102).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37635
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 18:31:39 +0000 (18:31 +0000)]
Make sure we don't write invalid record lengths.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37634
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 9 Jun 2011 18:27:11 +0000 (18:27 +0000)]
Simplify timestamp checking: only check the packet's timestamp if
check_startstop is set.
Refuse to write packets that do not fit in the file type we're writing. This
allows fuzz testing to be done on JPEGs without generating bogus files (with
packets bigger than the maximum packet size). This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6010 .
Note that this is only a problem with editcap is run with -T to force the
encapsulation type.
Maybe this needs a more generic solution (e.g., should this check be done in
the wiretap routines?), but at least for now it'll pacify the buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37633
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 9 Jun 2011 18:02:13 +0000 (18:02 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980
Add draft-ietf-6man-rpl-routing-header-03 Support (RH4 RPL Routing Header)
From me :
* Display Bytes of Address and Full Address (Generated)
* Fix some Whitespace and minor enhance...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37632
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 17:30:13 +0000 (17:30 +0000)]
Only count an ACK if it's part of an existing conversation, otherwise we
get a lot of false positives.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37631
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 12:54:44 +0000 (12:54 +0000)]
Add ws-coding-style.cfg to dist.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37630
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 08:51:30 +0000 (08:51 +0000)]
Add casts to make it compile on some old ERHL box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37629
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 08:28:04 +0000 (08:28 +0000)]
From Francesco Fondelli:
Add crustyfy .cfg file
I found it useful on some inetnal dissector where the indentation
was relay messed up so I think it's a usfel tool to have in the toolbox.
I don't think we should run it on every file.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37628
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 06:36:40 +0000 (06:36 +0000)]
From Madhusudhan M:
Cisco and Vodafone Diameter AVP:s
I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37627
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 21:33:38 +0000 (21:33 +0000)]
As pointed out by Jakub Zawadzki:
While updating to the current cmake version of FindZLIB I missed
a Wireshark specific addition. Add it back.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37626
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 8 Jun 2011 20:58:44 +0000 (20:58 +0000)]
Limit the lengths of some of our patterns. Fixes an infinite loop found
when trying to read a TPNCP data file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37625
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 8 Jun 2011 18:26:50 +0000 (18:26 +0000)]
* Add Keep Going bit flag in insert command
* Replace tab by space
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37624
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 18:10:03 +0000 (18:10 +0000)]
Add GTK3 cmake options. It doesn't build, just like its configure pendant.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37623
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 8 Jun 2011 17:10:40 +0000 (17:10 +0000)]
Fix a typo (spotted by Pascal Quantin).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37622
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 8 Jun 2011 17:08:27 +0000 (17:08 +0000)]
The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37621
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 17:07:06 +0000 (17:07 +0000)]
Last patch removed $Id$ head line
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37620
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 16:24:36 +0000 (16:24 +0000)]
Copy over changes from cmake git HEAD.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37619
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Wed, 8 Jun 2011 14:12:47 +0000 (14:12 +0000)]
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6008
Clear the list of interfaces before adding new interfaces.
Also fix an endless loop which would occur in case of an error
when getting remote interfaces.
From Irene Ruengeler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37618
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 13:11:51 +0000 (13:11 +0000)]
Try to fix the Ubuntu buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37617
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 12:05:49 +0000 (12:05 +0000)]
Assign to a dummy variable to squelch the warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37616
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 12:02:38 +0000 (12:02 +0000)]
Move the warning "...SercosIII heuristic dissector cannot be registered.." to the handoff routine as sercosIII most probably will
not have registered it's name when opensafty's register routine is executed e.g the warning will always be printed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37615
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 8 Jun 2011 07:03:53 +0000 (07:03 +0000)]
From Roland Knall via bug 6007:
Remove plugins/interlink from CMake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37614
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:27:39 +0000 (05:27 +0000)]
Remove the interlinki plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37612
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:23:17 +0000 (05:23 +0000)]
Remove theinterlinki plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37611
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:20:43 +0000 (05:20 +0000)]
From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37610
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:06:02 +0000 (05:06 +0000)]
Remove the sercosiii plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37609
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 04:55:29 +0000 (04:55 +0000)]
Remove the sercosiii plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37608
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 8 Jun 2011 04:49:35 +0000 (04:49 +0000)]
Didn't need to introduce that variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37607
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 8 Jun 2011 04:07:15 +0000 (04:07 +0000)]
Try to squelch the warning about not using the return value of strtoul()
- we really *are* using it just for its side-effects if it fails; its
return value is not the best way to check for failure, as the failure
return values are also valid return values on success.
While we're at it, check for it setting errno, which is one of the
better ways to check for failure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37606
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 8 Jun 2011 01:37:18 +0000 (01:37 +0000)]
The SERCOS III dissector is now built-in.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37605
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 7 Jun 2011 23:05:53 +0000 (23:05 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37604
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 7 Jun 2011 23:03:12 +0000 (23:03 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37603
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 7 Jun 2011 22:59:19 +0000 (22:59 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37602
f5534014-38df-0310-8fa8-
9805f1628bb7
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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