Commit graph

8232 commits

Author SHA1 Message Date
Gerald Combs
0aaad68faf Try to fix fuzzing errors in bug 3636. When dissecting an options
template, differentiate between Netflow v9 and IPFIX, which require
different interpretations. Add other minor fixes and comments.

svn path=/trunk/; revision=28911
2009-07-01 19:36:24 +00:00
Guy Harris
3de850b274 Thou shalt not call assert() in dissectors.
svn path=/trunk/; revision=28910
2009-07-01 17:40:08 +00:00
Stig Bjørlykke
c18998e9c0 Added support for Simulcrypt EMMG <-> MUX,
and generic support for other interfaces.

svn path=/trunk/; revision=28902
2009-07-01 07:21:13 +00:00
Jörg Mayer
6425275b89 - Put ISMP.EDP into the protocol column to make it clearer
that filtering on edp is not going to help
- Make it possible to filter on ismp.edp
- In case of edp fill info column

svn path=/trunk/; revision=28901
2009-07-01 05:27:34 +00:00
Guy Harris
fe767063a7 Replace one assert() with DISSECTOR_ASSET(), so we don't crash, and get
rid of another, as the pointer in question is non-null in all calls (if
somebody adds another call with a null pointer, it'll crash when
dereferencing the pointer in any case).

svn path=/trunk/; revision=28900
2009-06-30 23:56:26 +00:00
Guy Harris
bc57dc2d75 Don't crash if a null pointer is passed, just skip the appending of the
items.

svn path=/trunk/; revision=28899
2009-06-30 23:52:20 +00:00
Guy Harris
db08b1f783 Get rid of assert() call; either the pointer will never be null, in
which case it won't crash, or it will be null, in which case that just
trades one crash for another, and we should fix the crash.

svn path=/trunk/; revision=28898
2009-06-30 23:49:34 +00:00
Gerald Combs
4f19e431b7 Add some length checks. Fixes bug 3567.
svn path=/trunk/; revision=28897
2009-06-30 20:59:51 +00:00
Bill Meier
6e2bd7cc03 From: Benjamin Roch: Enhancements and small fixes for packet-tte.c dissector;
Also: a few minor mostly formatting changes by me.

svn path=/trunk/; revision=28895
2009-06-30 19:52:43 +00:00
Bill Meier
92446c8005 packet-radius: Fix exception CLEANUP handling when malformed attribute list/pair seen;
Fixes crash reported in Bug #3578. [https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3578]
Essentially: CLEANUP_CALL_AND_POP wasn't being executed for certain error exits from
 dissect_attribute_pairs() thus leaving a CLEANUP entry on the exception stack.
Also: vsa_buffer_table wasn't being destroyed if an exception occurred in dissect_attribute_pairs.

svn path=/trunk/; revision=28891
2009-06-30 13:57:26 +00:00
Stig Bjørlykke
a01a94d02b Always register to tcp.port to be able to decode as.
svn path=/trunk/; revision=28890
2009-06-30 12:26:11 +00:00
Stig Bjørlykke
4721f29558 Changed check for having multiple ldap PDU's in one frame.
The previous check is incorrect when the first ldap frame in the capture is
selected and the filter is changed, or selecting "Follow TCP Stream".

Also removed check_col().

svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
Stig Bjørlykke
942b03f06e Cleanup protocol name for ldap.
svn path=/trunk/; revision=28888
2009-06-30 08:28:21 +00:00
Balint Reczey
aa2c87df87 Added option to show not dissected packet data on a separate packet bytes pane.
It makes offsets in the not dissected data easier to follow.

svn path=/trunk/; revision=28885
2009-06-29 22:22:30 +00:00
Bill Meier
ec28353bb4 From Kovarththanan Rajaratnam: Fix for Bug #3572
[http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3572]

svn path=/trunk/; revision=28884
2009-06-29 20:59:26 +00:00
Jörg Mayer
dcd823565b Add value for vfstate: active
svn path=/trunk/; revision=28883
2009-06-29 20:35:47 +00:00
Anders Broman
a98ce52e80 From Artem Tamazov:
Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix

svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
Jaap Keuter
98fa965a00 Make dissector handle unexpected data better.
svn path=/trunk/; revision=28875
2009-06-28 16:39:31 +00:00
Anders Broman
4d8424a2bb From Jon Smirl:
More packet decoding for Intellon powerline devices.

From me put proto_register_homeplug() last in the file and whitespace changes.

svn path=/trunk/; revision=28872
2009-06-28 15:18:27 +00:00
Anders Broman
9b9880a25a From yin sun:
h248 term wildcard enhancement

svn path=/trunk/; revision=28861
2009-06-27 13:37:03 +00:00
Anders Broman
f179827b21 From Greg Schwendimann:
802.11 decryption is broken
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3590

svn path=/trunk/; revision=28860
2009-06-27 12:41:39 +00:00
Anders Broman
e4fea1939c From Kovarththanan Rajaratnam:
- Fix ncp2222.py and all the epan/dissectors/dcerpc dissectors. The
latter required changes to idl2wrs which used variadic macros (not supported in MSVC 6.0).

- Cleanup PIDL conformance files

svn path=/trunk/; revision=28856
2009-06-27 10:31:42 +00:00
Anders Broman
6a5ea97ff6 From Sebastien Decugis:
Add Missing Diameter EAP support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3600

svn path=/trunk/; revision=28849
2009-06-26 05:48:03 +00:00
Stig Bjørlykke
9733aadcfe Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
Stig Bjørlykke
7f1f48a8b2 From Joakim Wiberg via bug 3103:
Various improvements to the CIP and ENIP dissectors.

From me:
Updated to latest trunk changes.

svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Stig Bjørlykke
74ff21bccf From Nathan Hartwell via bug 2733:
Use time_secs_to_str_unsigned().

svn path=/trunk/; revision=28841
2009-06-25 02:08:06 +00:00
Stig Bjørlykke
26bd9f3623 Remove a tvb_free() call.
svn path=/trunk/; revision=28839
2009-06-25 01:50:56 +00:00
Jaap Keuter
7b79574a5b From Artem Tamazov:
Added: ESMC support as per G.8264 (Slow Protocol Subtype 0x0a).
* QL codes are dissected according to G.781 5.5.1.1 "Option I SDH". 
Added: support for Timestamp entities in ESMC PDU as per WD56 proposal.

svn path=/trunk/; revision=28836
2009-06-24 06:21:45 +00:00
Stig Bjørlykke
69116bfad2 Fixed field types for some reserved fields.
svn path=/trunk/; revision=28835
2009-06-24 05:54:19 +00:00
Stig Bjørlykke
ff7ff86249 More hf_register_info related cleanup.
svn path=/trunk/; revision=28834
2009-06-24 03:03:25 +00:00
Bill Meier
5c91a491ab Remove superflous code; #include <stdio.h> not needed.
svn path=/trunk/; revision=28833
2009-06-24 02:42:43 +00:00
Stig Bjørlykke
8531980952 From Kovarththanan Rajaratnam:
More hf_register_info related cleanup.

svn path=/trunk/; revision=28832
2009-06-24 02:17:12 +00:00
Stig Bjørlykke
975a16f706 From Kovarththanan Rajaratnam:
Cleanup hf_register_info declaration passed to llc_add_oui(). While there,
change the declaration to an array in order to be consistent with the rest
of packet-*.c files.

svn path=/trunk/; revision=28830
2009-06-24 02:11:11 +00:00
Stig Bjørlykke
92215412c5 Change hf_nisplus_dummy to use "dummy" as name instead of " "
(this is the only place where " " was used)

svn path=/trunk/; revision=28829
2009-06-24 02:08:14 +00:00
Stig Bjørlykke
7eefc799b6 From Kovarththanan Rajaratnam:
More hf_register_info related cleanup
* Fix process-x11-fields.pl (packet-x11.c)

svn path=/trunk/; revision=28828
2009-06-24 02:07:16 +00:00
Stig Bjørlykke
43485d8963 More hf_register_info related cleanup.
svn path=/trunk/; revision=28827
2009-06-24 02:05:51 +00:00
Bill Meier
96079919f5 Remove two unused includes
svn path=/trunk/; revision=28825
2009-06-24 00:49:54 +00:00
Bill Meier
c98c466139 if (!initialized) ... not req'd + other addt'l minor revisions;
Also: add packet-hpteam.c to Makefile.common so it gets built as part oif Wireshark.

svn path=/trunk/; revision=28824
2009-06-24 00:29:54 +00:00
Jaap Keuter
0621ecb3a8 From Nathan Hartwell:
This patch attempt should more closely align with the Wireshark "layout" of using 
a dissector rather than a "hack" to the packet-llc dissector.

svn path=/trunk/; revision=28823
2009-06-23 21:05:47 +00:00
Anders Broman
2555dcfb74 Revert(Try to fix indentation a bit.)
svn path=/trunk/; revision=28821
2009-06-23 14:16:28 +00:00
Anders Broman
6738ccefeb Try to fix indentation a bit.
svn path=/trunk/; revision=28820
2009-06-23 13:49:46 +00:00
Jaap Keuter
083c3a3027 From Kovarththanan Rajaratnam:
The Bluetooth AMP Manager protocol was recently adopted by the Bluetooth SIG.
This protocol sits on top of L2CAP and requires a few changes in order to
accommodate the new move/create channel request.

This patch includes:
* a new Bluetooth AMP Manager Protocol dissector
* changes to L2CAP to handle the new move/create channel signals
* introduce a dissector table for fixed channel, allowing btamp dissector to
handle the BT AMP Manager Protocol channel
* Preliminary changes in L2CAP to support the new enhanced L2CAP modes
(enhanced retransmission/streaming mode)

svn path=/trunk/; revision=28819
2009-06-23 06:49:38 +00:00
Jaap Keuter
9ba3058f05 From Shinsuke SUZUKI:
Due to an incorrect offset setting in packet-icmpv6.c Wireshark cannot parse RA router-lifetime and RA flags properly.

svn path=/trunk/; revision=28818
2009-06-23 06:45:59 +00:00
Gerald Combs
ddecfd9725 Instead of tvb_get_ptr + ep_alloc + proto_tree_add_string to fetch a string and
add it to the tree, just call proto_tree_add_item. Fixes bug 3564.

Replace another tvb_get_ptr call with tvb_format_text.

svn path=/trunk/; revision=28815
2009-06-22 22:38:29 +00:00
Stig Bjørlykke
7f77783e20 From Kovarththanan Rajaratnam:
More header field info cleanup in plugins/* and epan/dissectors/*

svn path=/trunk/; revision=28811
2009-06-22 18:23:58 +00:00
Jörg Mayer
6270137b07 Fix my 'fix': guint8 > 0 is always true
svn path=/trunk/; revision=28807
2009-06-22 07:27:14 +00:00
Jörg Mayer
cf0746df92 Fix warning: always evaluates to true/false
svn path=/trunk/; revision=28805
2009-06-22 06:29:32 +00:00
Jörg Mayer
abdbac3ec6 Lots of additional decoding, still quite a few things missing.
svn path=/trunk/; revision=28804
2009-06-22 06:28:10 +00:00
Jaap Keuter
8eee6e4cd8 Fix for bug 3559:
Don't let the index run over the size of the array.

svn path=/trunk/; revision=28801
2009-06-22 05:57:44 +00:00
Stig Bjørlykke
7614d925c2 More header_field_info cleanup.
svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
Stig Bjørlykke
c08baee3d8 More header_field_info cleanup.
svn path=/trunk/; revision=28798
2009-06-22 05:18:37 +00:00
Stig Bjørlykke
f8c959dc8c From Kovarththanan Rajaratnam:
Move header field info declarations into function scope.

This is the first step. Another patch will be submitted which actually scrubs
the header field info declarations (remove empty blurbs, etc.)

svn path=/trunk/; revision=28797
2009-06-22 04:58:08 +00:00
Stig Bjørlykke
85c8e31574 From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup.

From me:
Don't fix the empty name for hf_nisplus_dummy.

svn path=/trunk/; revision=28792
2009-06-21 18:45:56 +00:00
Anders Broman
983175d9cf Add duration to the tap info.
svn path=/trunk/; revision=28791
2009-06-21 18:27:34 +00:00
Graeme Lunt
05a3dca2bc LDAP control support for Password policy for LDAP directories.
svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
Jörg Mayer
631380a950 Lots of improvements to GLPB dissector - still lot of stuff missing.
svn path=/trunk/; revision=28781
2009-06-20 16:07:01 +00:00
Stig Bjørlykke
21b253b4e0 And delete the added file...
svn path=/trunk/; revision=28780
2009-06-19 06:16:29 +00:00
Stig Bjørlykke
1733596a6f Revert changes committed by an accident.
Will be committed again later.

svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
Jörg Mayer
4be57a71e6 The previous patch fixed only part of the problem,
as offset was only increased inside the if statement.
Get rid of offset and put in the numeric value.

svn path=/trunk/; revision=28778
2009-06-19 06:14:29 +00:00
Stig Bjørlykke
b3e10e559a Moved setting of length2 to make it always set.
svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
Jörg Mayer
ea64b28267 Add beginnings of Cisco's GLBP protocol. It's based
on the trace referred to by bug 3544 and the documentation
URL given in the dissector.

svn path=/trunk/; revision=28776
2009-06-19 05:29:20 +00:00
Jörg Mayer
caf2c996ef Replace my email address by a reference to AUTHORS
svn path=/trunk/; revision=28775
2009-06-19 05:27:15 +00:00
Stig Bjørlykke
9391dce6b2 From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup.

svn path=/trunk/; revision=28772
2009-06-19 02:09:52 +00:00
Stig Bjørlykke
b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Stig Bjørlykke
89162943b0 From Anders:
Update to June specification.

svn path=/trunk/; revision=28767
2009-06-17 15:02:12 +00:00
Martin Mathieson
fae33ea177 Call RRC dissector inside TRY/CATCH block, in order to:
- finish dissecton of other bodies
- make sure stats are updated in the face of RRC exceptions

svn path=/trunk/; revision=28766
2009-06-17 12:13:29 +00:00
Martin Mathieson
ec48fc388f Trivial prettifications
svn path=/trunk/; revision=28765
2009-06-17 09:43:56 +00:00
Michael Tüxen
f177e9f3f7 Suggested by Anders...
svn path=/trunk/; revision=28761
2009-06-16 20:32:17 +00:00
Graeme Lunt
21a230d14c Bug 2833:
Naming attributes in subject DNs defined for Extended Validation Certificates
http://www.cabforum.org/EV_Certificate_Guidelines_draft11.pdf


svn path=/trunk/; revision=28746
2009-06-15 19:43:29 +00:00
Jeff Morriss
c53823afbf Remove non-ASCII character
svn path=/trunk/; revision=28737
2009-06-15 14:59:08 +00:00
Bill Meier
496d36cfb9 proto_reg_handoff... doesn't need 'if (!inited) ...';
Remove unneeded forward declaration;
Set emacs editor modelines value to a "safe" value.

svn path=/trunk/; revision=28734
2009-06-15 12:36:50 +00:00
Martin Mathieson
55a1075bea Show data-segment info in info column.
svn path=/trunk/; revision=28733
2009-06-15 09:46:13 +00:00
Stig Bjørlykke
b78a4f2a34 Added missing 'const' for value_string.
svn path=/trunk/; revision=28732
2009-06-15 04:52:50 +00:00
Jörg Mayer
c321f29518 Trivial warning fixes:
- Might be used uninitialized
- not a prototype
- comma at end of enum


svn path=/trunk/; revision=28730
2009-06-15 02:34:53 +00:00
Gerald Combs
8afdf51d9f From Didier Gautheron via bug 3531:
Recent glib versions always include signal.h in gbacktrace.h

On Linux PPC signal.h defines PT_R4 which is also defined by samba and
compilation fails.

svn path=/trunk/; revision=28727
2009-06-14 20:57:57 +00:00
Michael Tüxen
a9de6414e0 Fix from yamisoe@gmail.com for Bug 3533.
svn path=/trunk/; revision=28721
2009-06-14 10:24:52 +00:00
Jaap Keuter
a78d986bd1 Prevent duplicate header field registrations.
svn path=/trunk/; revision=28720
2009-06-14 05:35:35 +00:00
Gerald Combs
99dcb5e99b Add a Banana dissector. This is used by the Twisted Python framework for
data serialization.

svn path=/trunk/; revision=28716
2009-06-12 17:48:39 +00:00
Graeme Lunt
2c105f125b Decode id-data, usually found within S/MIME (CMS), as IMF/MIME.
svn path=/trunk/; revision=28711
2009-06-12 10:39:03 +00:00
Anders Broman
1b5af9ff1f Updates to Jun spec. version.
svn path=/trunk/; revision=28706
2009-06-11 16:26:31 +00:00
Anders Broman
2169c5f139 From Duncan Salerno:
GTPv2 IE names incorrect/incomplete
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3525

svn path=/trunk/; revision=28705
2009-06-11 16:25:35 +00:00
Martin Mathieson
ab7a96c2e6 Trivial: add spaces to info column string text.
svn path=/trunk/; revision=28703
2009-06-11 14:05:31 +00:00
Martin Mathieson
db0bd672a6 Set length of proto item for status pdu.
svn path=/trunk/; revision=28702
2009-06-11 13:58:08 +00:00
Martin Mathieson
73aa7cc85b Add BSR reports into their own subtrees.
Check frame length from context info against actual length.

svn path=/trunk/; revision=28701
2009-06-11 13:55:49 +00:00
Stig Bjørlykke
1564b860e4 Remove some warnings.
svn path=/trunk/; revision=28699
2009-06-11 11:52:42 +00:00
Stig Bjørlykke
9b6fc0d050 From Jens Braeuer via bug 3522:
Change "wps.serial_number" from bytes to string.

svn path=/trunk/; revision=28697
2009-06-11 11:35:45 +00:00
Jörg Mayer
701cedf791 Add decoding of auto-neg capabilites in inverse (wrong) order as
proposed in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1455#c32

svn path=/trunk/; revision=28680
2009-06-09 22:09:23 +00:00
Stig Bjørlykke
0530813ecd From Edward J. Paradise via bug 3520:
From revision 00 to revision 01 the tlv values changed for the SCS TLV's.

svn path=/trunk/; revision=28679
2009-06-09 21:41:53 +00:00
Jörg Mayer
0db429e50c Powervalue is in units of 100mW, print effective value and unit
svn path=/trunk/; revision=28674
2009-06-09 16:51:04 +00:00
Stig Bjørlykke
3677441868 Enable Lua tcp tap userdata.
svn path=/trunk/; revision=28673
2009-06-09 14:51:00 +00:00
Jörg Mayer
7856eef821 RFC3576 states, that some messages will use port 3799 instead
of the "standard" radius ports. Register radius to that port
as well.

svn path=/trunk/; revision=28672
2009-06-09 10:52:28 +00:00
Martin Mathieson
f56c2e8156 Check for leftover bytes following Status PDU.
svn path=/trunk/; revision=28650
2009-06-07 13:35:17 +00:00
Anders Broman
c2509b0b3f Handle Detach and Service request, make it possible to set direction on link(UL/DL).
svn path=/trunk/; revision=28648
2009-06-06 17:03:34 +00:00
Guy Harris
cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Michael Tüxen
2f5d2bb8a3 * Fix name of Irene in AUTHORS.
* Add Varun Notibala to AUTHORS.
* Add support for NR-SACK and fix stability problems.

svn path=/trunk/; revision=28642
2009-06-05 13:33:18 +00:00
Graeme Lunt
63ec29238c Microsoft PKCS#12 local machine keyset bag attribute
svn path=/trunk/; revision=28641
2009-06-05 12:04:24 +00:00
Jaap Keuter
ba01060178 From Jakub Zawadzki:
Fix edonkey dissector a little, by using gint type for tvb_length_remaining() result.

svn path=/trunk/; revision=28640
2009-06-04 17:37:48 +00:00
Martin Mathieson
3b4e37916f Fix typos, and make filter strings more consistent.
svn path=/trunk/; revision=28638
2009-06-04 15:08:56 +00:00
Graeme Lunt
99a105954f A segmented DATA SPDU sequence of length one has user information.
svn path=/trunk/; revision=28634
2009-06-04 08:30:03 +00:00
Stig Bjørlykke
f55541c7e1 Fixed bit position for wlan_mgt.fixed.delba.param.initiator.
This fixes bug 3505.

svn path=/trunk/; revision=28620
2009-06-03 10:38:07 +00:00