Commit graph

35865 commits

Author SHA1 Message Date
Guy Harris
a3714500fd 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.

svn path=/trunk/; revision=37606
2011-06-08 04:07:15 +00:00
Guy Harris
e25095dfe5 The SERCOS III dissector is now built-in.
svn path=/trunk/; revision=37605
2011-06-08 01:37:18 +00:00
Bill Meier
2841028cf2 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
svn path=/trunk/; revision=37604
2011-06-07 23:05:53 +00:00
Bill Meier
aaa723e538 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.

svn path=/trunk/; revision=37603
2011-06-07 23:03:12 +00:00
Bill Meier
54105fbc42 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.

svn path=/trunk/; revision=37602
2011-06-07 22:59:19 +00:00
Bill Meier
d75988bacc Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup in some cases.

svn path=/trunk/; revision=37601
2011-06-07 22:50:49 +00:00
Bill Meier
4f420ef6cd Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
svn path=/trunk/; revision=37600
2011-06-07 22:28:55 +00:00
Bill Meier
6399940fd8 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


svn path=/trunk/; revision=37599
2011-06-07 21:10:44 +00:00
Bill Meier
a3285e6131 Put packet-cnip.c in the right group (DISSECTOR_SRC not ASN1_DISSECTOR_SRC).
svn path=/trunk/; revision=37598
2011-06-07 21:02:29 +00:00
Anders Broman
d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Bill Meier
c8475f0b89 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


svn path=/trunk/; revision=37596
2011-06-07 18:56:24 +00:00
Anders Broman
1932ff6734 Add more missing files.
svn path=/trunk/; revision=37593
2011-06-07 15:05:45 +00:00
Anders Broman
fba66f7f7b Delete no longer used .h file
svn path=/trunk/; revision=37590
2011-06-07 14:16:40 +00:00
Anders Broman
1ec3c2e6fd Add files to distribution.
svn path=/trunk/; revision=37589
2011-06-07 14:15:50 +00:00
Michael Tüxen
71325b8ac2 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.

svn path=/trunk/; revision=37588
2011-06-07 12:23:15 +00:00
Ronnie Sahlberg
9164a7f892 Add description of LOAD stats for tshark to the manpage
svn path=/trunk/; revision=37587
2011-06-07 10:27:44 +00:00
Graham Bloice
13743add73 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

svn path=/trunk/; revision=37584
2011-06-06 22:32:37 +00:00
Gerald Combs
349273944d Add links to libtool's recommendations for library versions.
svn path=/trunk/; revision=37582
2011-06-06 21:40:40 +00:00
Gerald Combs
21cccec8a5 Bump the version.
svn path=/trunk/; revision=37577
2011-06-06 21:03:49 +00:00
Anders Broman
318e86e2d7 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

svn path=/trunk/; revision=37576
2011-06-06 20:01:53 +00:00
Stephen Fisher
af0e8c25d0 Fix Unix compilation error...
packet-3g-a11.c:135: warning: 'hf_a11_fqi_granted_qos' defined but not used

... by removing definition


svn path=/trunk/; revision=37575
2011-06-06 19:49:31 +00:00
Anders Broman
2bc6ecf4c1 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

svn path=/trunk/; revision=37574
2011-06-06 19:45:51 +00:00
Anders Broman
c56d401c35 On behalf of Ericsson - enhance A11 dissection.
svn path=/trunk/; revision=37573
2011-06-06 19:17:32 +00:00
Gerald Combs
6e040f6c0d Bump the wiretap version.
svn path=/trunk/; revision=37571
2011-06-06 16:29:23 +00:00
Martin Mathieson
b3cbce492a Warn if there are > 2 padding subheaders at the beginning of a frame.
svn path=/trunk/; revision=37570
2011-06-06 16:07:09 +00:00
Bill Meier
d6d24d6d18 We're now using fop-1.0 on Windows;
Also: remove trailing whitespace from lines.

svn path=/trunk/; revision=37569
2011-06-06 15:32:40 +00:00
Anders Broman
a5700f10c4 Make the windows builds work again.
svn path=/trunk/; revision=37568
2011-06-06 13:34:53 +00:00
Ronnie Sahlberg
c60120a7ba 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


svn path=/trunk/; revision=37567
2011-06-06 10:34:51 +00:00
Anders Broman
5bb09a0c10 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

svn path=/trunk/; revision=37566
2011-06-06 10:32:19 +00:00
Martin Mathieson
4295086a6f Avoid no-newline-at-end-of-file warning.
svn path=/trunk/; revision=37565
2011-06-06 09:40:30 +00:00
Stig Bjørlykke
6188db17c1 From Roland Knall via bug 5996:
Corrected old-style function definition.

svn path=/trunk/; revision=37564
2011-06-06 08:33:33 +00:00
Stig Bjørlykke
5cffc12201 From Roland Knall via bug 5995:
Fix CMake build.

svn path=/trunk/; revision=37563
2011-06-06 07:09:49 +00:00
Guy Harris
04269d4ac6 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.

svn path=/trunk/; revision=37562
2011-06-06 01:04:56 +00:00
Guy Harris
7d1b946c0e Clean up indentation - use 4-space indentation uniformly. (No tabs -
tab stops aren't necessarily every 4 spaces.)

svn path=/trunk/; revision=37561
2011-06-05 23:16:14 +00:00
Guy Harris
dd05bb48b2 Rename the tap_dfilter_dlg.[ch] files to reflect that they can do more
than just filters.

svn path=/trunk/; revision=37560
2011-06-05 23:04:11 +00:00
Guy Harris
3a1097a0ae Some work on generalizing the "display filter" tap parameter dialog box
to more generally support fetching parameters for taps.

svn path=/trunk/; revision=37559
2011-06-05 22:39:23 +00:00
Anders Broman
2477298026 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

svn path=/trunk/; revision=37558
2011-06-05 20:12:44 +00:00
Anders Broman
70f488cea7 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

svn path=/trunk/; revision=37557
2011-06-05 19:58:02 +00:00
Anders Broman
7cd35baaaf 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

svn path=/trunk/; revision=37556
2011-06-05 19:45:22 +00:00
Anders Broman
cf3d8e1b69 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

svn path=/trunk/; revision=37555
2011-06-05 19:40:05 +00:00
Jakub Zawadzki
11426cb47b Fix memleaks and sigsegv when coping to clipboard RTP Streams.
svn path=/trunk/; revision=37554
2011-06-05 19:35:36 +00:00
Balint Reczey
198c4138ca Collect number of errors form ABI checks runs in compare-abis.sh.
svn path=/trunk/; revision=37553
2011-06-05 19:29:30 +00:00
Anders Broman
aa369ddbae wrong sort of column “Packets” in “RTP Streams” window.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5988

svn path=/trunk/; revision=37550
2011-06-05 16:33:00 +00:00
Gerald Combs
9bcbc68682 [Automatic manuf, services and enterprise-numbers update for 2011-06-05]
svn path=/trunk/; revision=37548
2011-06-05 15:03:58 +00:00
Guy Harris
0082437631 Clean up indentation.
svn path=/trunk/; revision=37547
2011-06-05 02:48:03 +00:00
Balint Reczey
309f147f5d Adding script for comparing ABI's of different Wireshark versions.
svn path=/trunk/; revision=37546
2011-06-04 22:27:38 +00:00
Balint Reczey
77ea6956a0 Include config.h and define _U_ for dumping ABI.
svn path=/trunk/; revision=37545
2011-06-04 21:30:27 +00:00
Balint Reczey
d2dea01900 Use more include dirs for ABI dumping to make preprocessor happier.
svn path=/trunk/; revision=37544
2011-06-04 21:29:13 +00:00
Balint Reczey
311f9acfd5 Fix wiretap headers to allow error-free ABI dumping.
svn path=/trunk/; revision=37543
2011-06-04 21:20:57 +00:00
Anders Broman
7b75e66774 Try to pacify the OSX build bot.
svn path=/trunk/; revision=37542
2011-06-04 20:14:06 +00:00