Commit graph

32050 commits

Author SHA1 Message Date
Jaap Keuter
c5502f37e3 Whitespace/indentation/code style cleanup.
svn path=/trunk/; revision=33070
2010-06-03 07:38:27 +00:00
Jeff Morriss
fa15217ece From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4832 :
Add field 'nfs.ops.count' in the detail pane of NFSv4 calls and replies that
displays the number of operations in NFSv4 COMPOUND requests/replies.

From me: change the blurb wording a bit.

svn path=/trunk/; revision=33069
2010-06-03 02:23:36 +00:00
Jeff Morriss
6d1db36944 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4830 :
Display the fsid (filesystem ID) in decimal as well as hex in the "attributes"
section of the header in NFSv3/v4 replies.

svn path=/trunk/; revision=33068
2010-06-03 02:15:32 +00:00
Jeff Morriss
584595fab3 From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :
Mesa moved its API description file again.

Also, while I'm here, I noticed that they stopped using signed tags, so add
--tags to "git describe" for a better description of the mesa version used to
build the X11 dissector.

svn path=/trunk/; revision=33067
2010-06-03 02:05:52 +00:00
Bill Meier
9c859f5f10 From: Sven Eckelmann:Add support for v10 packet format
"v10 of the packet format was added recently and could be added
  to the wireshark dissector"
See: Bug #4833: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4833

From me:
- Fix a compile error: ...version=tvb_get_ntohs...
- Fix a missing = NULL.

svn path=/trunk/; revision=33066
2010-06-03 02:03:32 +00:00
Guy Harris
96d478e006 Sorry, I forgot that 8.6. UDVM Cycles says
Note that the number of UDVM cycles MUST NOT be increased if a
	request for additional compressed data fails.

so we *shouldn't* increase the cycle count further when
SIGCOMP_INSTR_INPUT_BYTES fails.  That does *NOT* of course, mean that
we shouldn't increase the cycle count by 1 for a failed INPUT-BYTES
instruction - that would leave UDVM vulnerable to infinite loops (as per
bug 4826), and I *really* doubt that was their intent; presumably, it
means it should not be increased *by the number of cycles for the
additional data*:

	Additionally, if the UDVM successfully requests n bits of
	compressed data using one of the INPUT instructions then the
	number of available UDVM cycles is increased by n *
	cycles_per_bit once the instruction has been executed.

if the attempt to get that additional data fails.

svn path=/trunk/; revision=33065
2010-06-03 01:22:18 +00:00
Bill Meier
8d05670e53 Add back a few 'if (check_col()...' removed by me in a previous commit.
Possibly it's better to use an 'if (checkcol()' if the enclosed call to
'col_...' has "complex" arguments.

svn path=/trunk/; revision=33064
2010-06-03 00:52:08 +00:00
Gerald Combs
e1a9e4e84f From Reinhard Speyerer via bug 4779:
From reading the rawshark(1) manpage my assumption was that rawshark
could be used like
$ /usr/bml/bin/rawshark -s -r test.pcap -d encap:EN10MB ...

However rawshark either expects the -r argument to be -
(read from stdin) or a pipe which results in the following error
message:

rawshark: ".../test.pcap" is neither an interface nor a pipe

The proposed rawshark.pod patch updates the -r description to
the implemented rawshark functionality.

The patch also applies to the current SVN version.

svn path=/trunk/; revision=33063
2010-06-03 00:42:21 +00:00
Bill Meier
6aa673baa6 From Sven Eckelmann: Synchronize bat dissector with batadv dissector
"Different people made changes to enhance the batman-adv dissector. It seems
 that the batman dissector wasn't touched and misses those changes. Following
 patchset should improve the dissector the same way Gerald Combs, Guy Harris and
 Bill Meier improved batman-adv."
See Bug #4384: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4834

From me: Add back a few 'if (check_col()) ...';
 I probably went just a bit too far in changes I made in packet-batadv.c

svn path=/trunk/; revision=33062
2010-06-03 00:26:27 +00:00
Gerald Combs
19e13130d2 Increment the cycle count no matter what. Increase the cycle count
further when SIGCOMP_INSTR_INPUT_BYTES fails. Fixes the infinite loop
found in bug 4826.

svn path=/trunk/; revision=33061
2010-06-02 22:16:49 +00:00
Bill Meier
2be028a73f From Sven Eckelmann: Fix endless recursive loop
See Bug #2631: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2631

svn path=/trunk/; revision=33060
2010-06-02 21:36:24 +00:00
Anders Broman
32abf98aab From David Bond:
Added the IEEE defined ether types for TRILL and Layer 2 ISIS. Also had ISIS
register itself with the ethertype dissector.

References:
http://www.postel.org/pipermail/rbridge/2010-May/003998.html
http://tools.ietf.org/html/draft-ietf-isis-layer2-05
http://tools.ietf.org/html/draft-ietf-trill-rbridge-protocol-16

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

svn path=/trunk/; revision=33059
2010-06-02 19:29:14 +00:00
Jaap Keuter
0829787c21 Set Subversion properties right.
svn path=/trunk/; revision=33058
2010-06-02 19:01:16 +00:00
Bill Meier
6e00247f65 Misc changes:
- Clear info col before beginning dissection;
- Remove some uneeded forward declarations;
- Remove some ... = NULL initializers;
- Display protocol as BATADV_??? if unknown type;
- '(gwflags & 0x7C) >> 3'  ==> '(gwflags & 0x78) >> 3'

svn path=/trunk/; revision=33057
2010-06-02 19:00:20 +00:00
Gerald Combs
1bac7c2610 From Chris Maynard via bug 4014:
This trivial patch merely displays the ICMP ID and sequence # in the Info
column.

svn path=/trunk/; revision=33056
2010-06-02 18:13:00 +00:00
Bill Meier
263c23d913 check_col() no longer required;
Use col_add_fstr() instead of col_clear()/col_append_fstr() combo.

svn path=/trunk/; revision=33055
2010-06-02 18:11:17 +00:00
Stig Bjørlykke
6c4863c864 Added packet-batadv.c
svn path=/trunk/; revision=33054
2010-06-02 17:59:18 +00:00
Guy Harris
64682d90a9 Fix incorrect fetch of version field.
svn path=/trunk/; revision=33053
2010-06-02 17:33:45 +00:00
Gerald Combs
427eed652b From Sven Eckelmann via but 2631:
The wireless meshing protocol B.A.T.M.A.N. Advanced changed their packet format
in such a way that now versions can be identified and so correct dissection of
the packets can be supported by wireshark.
Since it is a ever moving target it is very possible that the packet format is
changing slightly. The dissector was written in such a way that new version can
be supported relative easy.
I hope that it sufficient for the inclusion in wireshark.

I tried to fuzzing it some hours and no error was reported.


From me:

Initialize our dissector handles.

Merge packet-batadv.h into packet-batadv.c. It isn't included anywhere else.

Fuzz 500 passes using attached capture files.

svn path=/trunk/; revision=33052
2010-06-02 17:10:55 +00:00
Jeff Morriss
a9b0b95b8a Initialize no_vs_avps_ext with a pointer to a valid 'match' function so we don't crash in val_to_str_ext() if an AVP from an unknown vendor is encountered.
svn path=/trunk/; revision=33051
2010-06-02 16:01:51 +00:00
Graeme Lunt
f3248dac71 Definition of certificatePolicies certificate extension and removal of warnings
svn path=/trunk/; revision=33050
2010-06-02 15:09:11 +00:00
Graeme Lunt
e4fbebc044 CA Version certificate extension
svn path=/trunk/; revision=33049
2010-06-02 14:58:42 +00:00
Graeme Lunt
eef8c02bd7 Bug 3597 - implicit octet string that is constructed causes PRES/FTAM dissect failure
Introduced some state to remember last dissected Tag/Length so that they can be recalled if an IMPLICIT tag is encountered and stripped. This allows its to be determined if the value has a constructed value - and so can be reassembled.

In this case, it is a IMPLICIT constructed OCTET STRING at the presentation layer.

Many thanks to Fred Gruman for identifying - and apologies for the delay in commiting.


svn path=/trunk/; revision=33048
2010-06-02 14:42:57 +00:00
Graeme Lunt
2edbeadfc4 Minor change to remember the object identifier.
svn path=/trunk/; revision=33047
2010-06-02 13:36:10 +00:00
Graeme Lunt
3644d0faa7 Updated get_ber_length to handle multiple nested indefinite length encodings.
svn path=/trunk/; revision=33046
2010-06-02 13:33:37 +00:00
Anders Broman
970dbcb464 Clean up a bit, fix indent.
svn path=/trunk/; revision=33045
2010-06-02 10:50:39 +00:00
Anders Broman
2fdf04a43e Update value_strings with IE names.
svn path=/trunk/; revision=33043
2010-06-02 06:17:02 +00:00
Gerald Combs
07354a18c1 From Jim Young via bug 4331:
This patch adds a new '-S' option to editcap that will rewrite timestamps of
packets to insure that the new capture file is in strict chronological order.

This option's primary use case is to fixup the occasional timestamps that have
a negative delta time relative to previous packet.

This feature is related to (but does not depend on) capinfos enhancement
submitted in bug #4315 which helps identify tracefiles with "out-of-order"
packets.

svn path=/trunk/; revision=33042
2010-06-02 00:30:25 +00:00
Gerald Combs
f194916d62 From Jim Young via bug 4049:
This patch adds a new '-o' option to capinfos (enabled by default) to report if
the packets within a particular capture file are in strict chronological time
order or not.

svn path=/trunk/; revision=33041
2010-06-02 00:24:03 +00:00
Gerald Combs
533ed87f31 Rebuild the IEC 61850 dissector.
svn path=/trunk/; revision=33040
2010-06-02 00:20:12 +00:00
Gerald Combs
ad273c35b6 From Michael Bernhard via bug 3398 with minor fixups:
I've created a ASN.1 dissector for the IEC 61850 Sampled Values protocol. It
dissects ethernet frames of the IEC 61850-9-2LE specification form the UCA
International User Group.

There is also a new TAP for tshark (-R sv) which extracts the important
information of the frame and allows to create plots (with external tools) of
the sampled values.

I've developed under Linux (Ubuntu 8.10) but everything should be in place for
successful compilation under Windows.

It would be great if this dissector could be included in wireshark. I'm looking
forward for your comments.


svn path=/trunk/; revision=33039
2010-06-01 23:27:16 +00:00
Anders Broman
c58a769956 Remove the now unused value_strings.
svn path=/trunk/; revision=33038
2010-06-01 22:23:22 +00:00
Anders Broman
875240d59e - Traffic flow template miss dissected, use de_sm_tflow_temp()
insted.
- Dissect vendor id of private message.

svn path=/trunk/; revision=33037
2010-06-01 22:22:09 +00:00
Gerald Combs
fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Stephen Fisher
217b344bd9 Per Jaap's suggestion on -dev list: remove "with new_packet_list" from
version output since it has been the default for a while now and show
"with old_packet_list" if compiled as such. 


svn path=/trunk/; revision=33035
2010-06-01 18:33:16 +00:00
Stephen Fisher
89640a8682 There's no need to assign numerical values to the enum values.
svn path=/trunk/; revision=33034
2010-06-01 18:32:03 +00:00
Jaap Keuter
695f49e065 From Herbert Lischka:
Lori made a simple change to the bacapp.c file for segmentation parsing. 
Basically all fragments have some common data in the APDU which is useful to
see parsed in the tree.

I added support for vendor numbers bigger than 255. 

Corrected Info column for "message fragment" and "message reassembled"

svn path=/trunk/; revision=33033
2010-06-01 18:10:21 +00:00
Graeme Lunt
f1216dd205 The Permitted-Actions-Attribute is exported from ftam-exp.cnf as DISPLAY = BASE_HEX. This causes a runtime error and so we override the definition here until we can find the correct fix.
svn path=/trunk/; revision=33032
2010-06-01 09:25:51 +00:00
Stig Bjørlykke
0100633d63 Fixed a comment.
svn path=/trunk/; revision=33031
2010-06-01 07:31:10 +00:00
Anders Broman
9b9aaed177 From Pascal Quantin:
Decode the EIA0 (null integrity algorithm) bit in EMM messages. This was introduced in 3GPP 24.301 CR-0422 (Release 9.2) and is also used by the LTSI (LTE/SAE Trial Initiative) for interoperability tests between constructors (with Release 8 equipments). I also updated the description of EEA0 as stated in 24.302 release 9.2.

svn path=/trunk/; revision=33030
2010-06-01 07:26:08 +00:00
Guy Harris
7ecae442c5 capture() can, in some cases, return FALSE when the capture succeeds;
back out the change to check its return value until we fix that.

Also back out the test suite changes to look for an error exit for
invalid capture filters and interfaces.

svn path=/trunk/; revision=33029
2010-06-01 03:37:51 +00:00
Guy Harris
61e40b5c52 Wireshark requires routines from libm, such as ceil(), so link with it;
we shouldn't rely on getting it pulled in by other shared libraries, as

	1) there's no guarantee that the other shared libraries we use
	   are linked with it or will continue to be linked with it;

	2) there's no guarantee that we're even linking dynamically;

	3) it fails on Fedora 13 as part of a change to catch programs
	   that implicitly (or explicitly) assume, in their build
	   procedures, that they'll get libraries linked in as a result
	   of linking with other libraries.

svn path=/trunk/; revision=33028
2010-05-31 19:37:26 +00:00
Anders Broman
404e77beac From Ian Schorr:
NFS Dissector needs FH support for EMC Celerra.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4813

svn path=/trunk/; revision=33027
2010-05-31 05:13:27 +00:00
Jaap Keuter
bea4d4fc0d From Chris Maynard:
Fix for bug 4810 so PPP/USB dissector registers for IF_CLASS_CDC_DATA
- in addition to IF_CLASS_UNKNOWN and IF_CLASS_VENDOR_SPECIFIC, for those rare 
occasions that the right set of circumstances arise where PPP traffic will be 
(correctly) encapsulated in a USB frame of that interface class.

svn path=/trunk/; revision=33026
2010-05-30 21:39:41 +00:00
Gerald Combs
2669f7542f [Automatic manuf and enterprise-numbers update for 2010-05-30]
svn path=/trunk/; revision=33023
2010-05-30 15:03:31 +00:00
Jaap Keuter
305277d132 From Matteo Valdina
There are two typos in the RTCP TMMBR packets:
1. In the dissector of RTCP TMMBR is written "messured" instead of measured.
2. In the text title field is written TMMBN instead on TMMBR and vice-versa.

svn path=/trunk/; revision=33022
2010-05-30 10:51:44 +00:00
Jaap Keuter
89d1ecd951 From Chris Maynard:
Fix for bug 4807 to handle compressed (NULL) address and control bytes.

The problem seems to be that the address and control bytes are missing,
presumably because they are compressed per section 3.2 of
http://tools.ietf.org/html/rfc1662.  The attached patch tries to account for
that.

The patch also fixes another bug.  If the hdlc framing character, 0x7e, is not
present, but the address and control fields are, then the offset might need to
be 3 bytes instead of only 2 bytes if the control field is escaped.  Sometimes
it is escaped and sometimes it isn't, so we need to handle both cases.

svn path=/trunk/; revision=33021
2010-05-30 10:28:21 +00:00
Anders Broman
d0888eb389 Increase the base size to 100 000 we are using more than that.
svn path=/trunk/; revision=33020
2010-05-29 22:29:09 +00:00
Jeff Morriss
d19f63e8f8 Include glib.h (for g_snprintf).
svn path=/trunk/; revision=33019
2010-05-29 03:35:32 +00:00
Jeff Morriss
7cfd2c66f9 Add braces to avoid an ambiguous else
svn path=/trunk/; revision=33018
2010-05-29 03:34:05 +00:00