Commit Graph

31917 Commits

Author SHA1 Message Date
Gerald Combs cfe5890af7 According to RFC 3220 section 7 the max UDVM message size is 65536,
not 65535. Hopefully fixes bug 4837.

svn path=/trunk/; revision=33087
2010-06-04 18:28:02 +00:00
Bill Meier 44f9eec459 From Samu Varjonen: Whitespace cleanup
Tabs converted to 8 spaces and trailing whitespaces removed, etc.

svn path=/trunk/; revision=33086
2010-06-04 17:59:53 +00:00
Gerald Combs e5def72fe7 If BIN_DIR is ".", set WIRESHARK_RUN_FROM_BUILD_DIRECTORY so that we
test plugins.

svn path=/trunk/; revision=33085
2010-06-04 16:59:49 +00:00
Graeme Lunt 397f576de2 Description for netscape-cert-type bit 4 (e.g. see http://docs.sun.com/source/816-5531-10/poli_ext.htm#1078885)
svn path=/trunk/; revision=33084
2010-06-04 15:07:17 +00:00
Graeme Lunt d6bd39b51f RCS 3280, which obsoletes RFC 2459, allows an IA5String CHOICE in the DisplayText of a UserNotice.
svn path=/trunk/; revision=33083
2010-06-04 14:36:53 +00:00
Stig Bjørlykke 946f225f9c From Holger Freyther via bug 4841:
Add a new dissector for the NexusWare C7 MTP over UDP/TCP protocol. One of
NexusWare's example applications provide a way to forward MTP Level 3 messages
via UDP/TCP. This is a dissector for this protocol (which is lacking an IANA
assigned port).

svn path=/trunk/; revision=33082
2010-06-04 12:14:18 +00:00
Jaap Keuter 525deb3f70 Set the right DPI for PDF production.
svn path=/trunk/; revision=33081
2010-06-04 05:57:05 +00:00
Bill Meier effff179f4 From Sven Eckelmann: Remove recursion for aggregated packets in batman dissector
"Different developers wanted to have the recursive dissector for aggregated
 packets changed to a iterative approach."

See Bug #4836: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4836

svn path=/trunk/; revision=33080
2010-06-04 01:32:21 +00:00
Bill Meier 80562f4620 From Cal Turney: The NFS FH hash (nfs.fh.hash) incorrectly matches multiple filehandles.
"The method used in packet-nfs.c to calculate a 32-bit hash representing the 
 32-byte filehandle is faulty in that the hash often matches multiple
 filehandles."

"This patch uses CRC-32 to calculate the hash.
 We (EMC GNS) have tested this patch for the past two years and we have not
 found a single case where the hash matched more than one filehandle."

See Bug #4839: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4839


svn path=/trunk/; revision=33079
2010-06-04 00:45:37 +00:00
Jaap Keuter 578638c7ac Bring more texts and examples up to date.
svn path=/trunk/; revision=33078
2010-06-03 21:39:38 +00:00
Bill Meier 5a307bb6d1 Fix a gcc -Wshadow warning
svn path=/trunk/; revision=33077
2010-06-03 19:14:18 +00:00
Jeff Morriss 673a9de331 Set the (pinfo) address if a PC is present (for now: regardless of whether routing is on GT or not).
svn path=/trunk/; revision=33076
2010-06-03 18:57:25 +00:00
Bill Meier 6dcdb5fee6 From Sven Eckelmann: Change recursion for aggregated packets to iteration.
See Bug #2631: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2631

svn path=/trunk/; revision=33075
2010-06-03 18:56:39 +00:00
Stig Bjørlykke bdc492cc40 Improved readability when displaying seconds with hours and minutes.
svn path=/trunk/; revision=33074
2010-06-03 13:53:03 +00:00
Jörg Mayer 09bbfe21dd - Add tap-sv.c and packet-sv.c to the list of files to build
- Whitespace fixes
- Add Fedora 64 bit to the list of platforms where cmake should
  work

svn path=/trunk/; revision=33073
2010-06-03 13:04:22 +00:00
Anders Broman 5b2722c6b3 Use g_hash_table_new_full().
svn path=/trunk/; revision=33072
2010-06-03 08:22:08 +00:00
Anders Broman 9ea0a509b5 From Pascal Quantin:
Avoid triggering a malformed packet error when decoding a simple UE terminated Detach Request when the EMM cause IE is not present:

svn path=/trunk/; revision=33071
2010-06-03 07:47:07 +00:00
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