Commit graph

8403 commits

Author SHA1 Message Date
Gerald Combs
16c1dd1b2d Don't use tvb_memcpy to fill in a struct. (Cue Jamie Hyneman saying
"EVER!") Expand the entry/scope struct to include private enterprise
numbers instead of casting guint32s to arbritrary chunks of memory.
Limit the number of entries and scopes we allocate.  Don't allocate
memory every time we see a new template.  Don't use a C++ keyword for
variable names.

svn path=/trunk/; revision=29061
2009-07-10 23:39:23 +00:00
Jaap Keuter
24d2fb5126 From David Aggeler:
* - Fixed corrupt files on DICOM Export
 * - Fixed memory limitation on DICOM Export
 * - Removed minimum packet length for static port mode
 * - Simplified checks for heuristic mode
 * - Removed unused functions

svn path=/trunk/; revision=29060
2009-07-10 21:54:29 +00:00
Bill Meier
58ed99ea6e Two minor changes: include emem.h not req'd; SUB_IPACCESS not used.
svn path=/trunk/; revision=29059
2009-07-10 20:35:34 +00:00
Michael Tüxen
0d2271b2cc Fix last issue reported by Jaap.
svn path=/trunk/; revision=29058
2009-07-10 20:07:57 +00:00
Michael Tüxen
5e6cc00044 Fix the two other nits reported by Jaap.
svn path=/trunk/; revision=29057
2009-07-10 20:03:25 +00:00
Michael Tüxen
9c6ee5cefd Add ip.access A-bis over IP dissector received from Harald Welte.
Removed check_col() calls.

svn path=/trunk/; revision=29056
2009-07-10 20:00:54 +00:00
Stig Bjørlykke
2002748969 Cleanup handling of ICMPv6 type and code (not complete):
- Use value_string to convert strings
- Added more types and codes from IANA

Removed use of check_col()
Some white space cleanup

svn path=/trunk/; revision=29054
2009-07-10 12:48:48 +00:00
Anders Broman
7b8cdbe44f Restore hf_gtp_ext_rat_type as it's used in decode_gtp_rat_type().
Fix IMEI(SV) While we're at it.

svn path=/trunk/; revision=29053
2009-07-10 12:26:39 +00:00
Stig Bjørlykke
d4b575f041 Use correct length for "Version OD Calling".
This fixes bug 3694.

svn path=/trunk/; revision=29051
2009-07-10 09:12:13 +00:00
Stig Bjørlykke
8af0d42c47 Cleanup handling of ICMP type and code:
- Use value_string to convert strings
- Added more types and codes from IANA

Removed use of check_col()
Check checksum also if no tree
Some white space cleanup

svn path=/trunk/; revision=29050
2009-07-10 09:09:11 +00:00
Stig Bjørlykke
a69f313e68 Header field cleanup.
svn path=/trunk/; revision=29049
2009-07-10 08:03:19 +00:00
Anders Broman
889d1f124e From Joan Ramio:
IEC 60870-5-104 dissector decodes nothing
(new_tvb reported length bug)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3650

svn path=/trunk/; revision=29048
2009-07-10 05:40:02 +00:00
Anders Broman
aec691c11f Reworked patch from massimo:
SNMP cannot be decoded in case of appended data to message
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3684

svn path=/trunk/; revision=29047
2009-07-09 21:43:57 +00:00
Bill Meier
4b00d59822 From: : Nathan Hartwell: Patch to fix output of HP Team dissector in Info column
svn path=/trunk/; revision=29045
2009-07-09 21:05:37 +00:00
Anders Broman
298feb719f From Joakim Wiberg:
Device Level Ring protocol addition.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3685

With some minor changes (blurb NULL whem text equal).

svn path=/trunk/; revision=29044
2009-07-09 20:44:28 +00:00
Bill Meier
59cc6f3e61 packet-gtp: 3GPP AVP custom VSA dissection no longer required for 3GPP-RAT-Type attribute.
3GPP-RAT-Type values are now defined in the Radius dictionary.3gpp file.

svn path=/trunk/; revision=29039
2009-07-09 16:02:34 +00:00
Stig Bjørlykke
046a329a66 Split packet-ip into packet-ip and packet-icmp.
Some cleanup in handles and ett entries.

svn path=/trunk/; revision=29035
2009-07-09 11:32:50 +00:00
Anders Broman
6c25896d84 From Kovarththanan Rajaratnam:
No letter-shortcuts in Telephony menu.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3678

svn path=/trunk/; revision=29028
2009-07-08 18:36:31 +00:00
Jaap Keuter
863057ff9c Address the size_t vs. gint issue.
svn path=/trunk/; revision=29027
2009-07-08 17:46:37 +00:00
Jörg Mayer
c43391cd08 Currently, the expert code notifies if a packet is addressed
to 224.0.0.x with a TTL>1. Some protocols (notably VRRP and GLBP)
send out a TTL of 255 and thus cause a notice. That should be fixed,
so for now: Add a FIXME about that.

svn path=/trunk/; revision=29024
2009-07-08 15:29:37 +00:00
Jörg Mayer
8daca54c04 Readd the feature to skip the unknown/faulty remainder
of an IE and still display the next one(s).

svn path=/trunk/; revision=29023
2009-07-08 15:26:04 +00:00
Bill Meier
f569b013d6 Add references to two specifications
svn path=/trunk/; revision=29019
2009-07-08 13:10:00 +00:00
Bill Meier
b60ff9f677 Do defragment inits via registered init routine
instead of once-only in proto_reg_handoff;
Also: localize handles to proto_reg_handoff;
      Fix a typo;

svn path=/trunk/; revision=29018
2009-07-08 12:50:09 +00:00
Stig Bjørlykke
c0622654ed From Kovarththanan Rajaratnam:
Duplicate name/blurb removal.

svn path=/trunk/; revision=29012
2009-07-08 07:48:13 +00:00
Guy Harris
b0f37069b7 "uint" isn't a standard type, and isn't a type defined by GLib; use
guint, as defined by GLib, instead.

svn path=/trunk/; revision=29011
2009-07-08 06:40:17 +00:00
Jaap Keuter
437318216b From Don Chirieleison:
Within the attached diff file are two source files, packet-dtn.h and
packet-dtn.c. Their function is to decode Bundle Protocol PDUs sent using the
UDP or TCP Convergence Layers. These protocols have been released by the
Internet Research Task Force and are described in RFC 4838 and RFC 5050.
Detailed information on DTN can be obtained at www.dtnrg.org.

svn path=/trunk/; revision=29010
2009-07-08 06:07:21 +00:00
Gerald Combs
98c1ca42c9 Fix several dissector assertions.
svn path=/trunk/; revision=29005
2009-07-08 00:28:54 +00:00
Martin Mathieson
fd6bcf67a7 Add expert item to warn of AM data PDUs that don't have any data.
svn path=/trunk/; revision=28995
2009-07-07 17:07:24 +00:00
Stig Bjørlykke
801cd0249b Do not use tfs true_string and false_string directly.
svn path=/trunk/; revision=28991
2009-07-07 15:21:36 +00:00
Stig Bjørlykke
4d8dd01e8e Changed flags_set_truth -> tfs_set_notset
svn path=/trunk/; revision=28989
2009-07-07 14:54:15 +00:00
Martin Mathieson
47552ea3a4 Add preference for turning off LTE RRC.
svn path=/trunk/; revision=28988
2009-07-07 14:38:14 +00:00
Stig Bjørlykke
f7b964b078 No need to include tfs.h
svn path=/trunk/; revision=28987
2009-07-07 14:34:33 +00:00
Stig Bjørlykke
eb18a596d7 From Kovarththanan Rajaratnam:
Move hf/ett into proto_register_jxta() and do some field cleanup

svn path=/trunk/; revision=28984
2009-07-07 14:13:45 +00:00
Stig Bjørlykke
871294f998 From Kovarththanan Rajaratnam:
Duplicate name/blurb removal from packet-fix.h (and template)

svn path=/trunk/; revision=28982
2009-07-07 12:14:47 +00:00
Stig Bjørlykke
d3c75a218b From Kovarththanan Rajaratnam:
Move hf/ett into proto_register_amqp() and do some field cleanup
(duplicate name/blurb removal)

svn path=/trunk/; revision=28981
2009-07-07 11:58:23 +00:00
Stig Bjørlykke
b9a11a95a6 From Kovarththanan Rajaratnam:
Move hf/ett definitions from packet-infiniband.h -> packet-infiniband.c to
align it with the rest of the bunch

svn path=/trunk/; revision=28979
2009-07-07 11:40:40 +00:00
Stig Bjørlykke
87d24c9101 From Kovarththanan Rajaratnam:
Remove trailing spaces in protocol/field names

svn path=/trunk/; revision=28978
2009-07-07 11:37:15 +00:00
Stig Bjørlykke
3f625c283e From Kovarththanan Rajaratnam:
More header field info cleanup

svn path=/trunk/; revision=28975
2009-07-07 10:12:15 +00:00
Stig Bjørlykke
d00c2baf5c Remove some check_col() calls.
svn path=/trunk/; revision=28974
2009-07-07 10:07:42 +00:00
Anders Broman
1dacabc5ba Cleanup header_field_info definitions
- Regenerating x420 seems to have fixed the "last" problem :-)

svn path=/trunk/; revision=28972
2009-07-07 09:27:52 +00:00
Stig Bjørlykke
0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Stig Bjørlykke
fd9d18bbe9 From Julián Lastiri via bug 3656:
ClassifierID should be before Priority field in the Extended Classifier of
PacketCable Multimedia Protocol. Also the reference to PacketCable Multimedia
document PKT-SP-MM-I02-040930 is wrong because there is no definition about
Extended Classifier. My fix is based on PacketCable Multimedia
PKT-SP-MM-I04-080522 document.

svn path=/trunk/; revision=28969
2009-07-07 08:27:15 +00:00
Stig Bjørlykke
6d472a50fc From Kovarththanan Rajaratnam via bug 3548:
Minor hf cleanup.

svn path=/trunk/; revision=28968
2009-07-07 07:46:57 +00:00
Anders Broman
739bfc6ff0 Delete obsolete protocol dissectors.
svn path=/trunk/; revision=28966
2009-07-07 05:43:43 +00:00
Anders Broman
54965169c2 From Kovarththanan Rajaratnam:
More "Cleanup header_field_info definitions"

svn path=/trunk/; revision=28964
2009-07-07 04:41:53 +00:00
Gerald Combs
46f8dbf674 From Kovarththanan Rajaratnam via bug 3652:
This patch protects against malformed Unique ID lengths (>= 252 bytes) and
defer all tvb_xxx related calls to when we actually need them. This allows us
to dissects as much as possible before bailing out (in case of a malformed
length).

From me:

Add a link to the protocol specification.  Remove packet-miop.h along
with some struct definitions. (Don't tvb_memcpy over structs!) Remove
some more tvbuffs.  Don't call proto_item_add_subtree if we're not going
to use the trees.  Call proto_tree_add_item instead of
proto_tree_add_text Remove a bunch of unused ett_ variables.  Add an
expert item for the protocol version.  Register the field array with the
correct length.

svn path=/trunk/; revision=28963
2009-07-06 20:23:32 +00:00
Anders Broman
6d7ba64d68 From Kovarththanan Rajaratnam:
More "Cleanup header_field_info definitions"

svn path=/trunk/; revision=28962
2009-07-06 18:36:00 +00:00
Jörg Mayer
162f9ef199 Shorten a few variables for values read from the packet.
Inspired by Kovarththanan Rajaratnam's patch for bug 3665
which in turn was a duplicate for the (fixed) bug 3660.

svn path=/trunk/; revision=28960
2009-07-06 17:49:33 +00:00
Jörg Mayer
d7020119ed Move edp to the top level tree instead of inside the ismp
tree.

svn path=/trunk/; revision=28959
2009-07-06 17:45:40 +00:00
Jörg Mayer
5cd78e2625 OK, nobody cared about the waring, so just remove the
test for now.

svn path=/trunk/; revision=28958
2009-07-06 17:44:02 +00:00
Anders Broman
3cc1acb3b1 CFLOW decoding is wrong for IPv6 fields.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3328

svn path=/trunk/; revision=28957
2009-07-06 17:37:03 +00:00
Stig Bjørlykke
383809a151 Rewrite non-ASCII characters.
svn path=/trunk/; revision=28954
2009-07-06 14:14:13 +00:00
Anders Broman
c0e6bc1eca Small editorial changes.
svn path=/trunk/; revision=28953
2009-07-06 14:09:52 +00:00
Bill Meier
60e658e132 Radius: Additional attribute handling:
- implement "ether" attribute; 
 - parse "abinary" attribute [uses existing radius_abinary()]
Also: add a comment in packet-radius.h about the meaning of the encrypt flag.

svn path=/trunk/; revision=28952
2009-07-06 14:05:37 +00:00
Stig Bjørlykke
da47d6113a From Joakim Wiberg via bug 3670:
This patch correctes serveral minor things.

1. Adds decoding of generic services to classes that have a separate dissect
   function.
2. Adds new error codes.
3. Adds new CIP objects.
4. Extends the VendorID list.

svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
Jörg Mayer
0a48757c84 Fix for bug 3660: Length (guint32) could become 0 or very large
(overflow).

svn path=/trunk/; revision=28948
2009-07-06 13:00:04 +00:00
Anders Broman
1853380559 Decode error for network-id in BICC BCU-ID
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3648

svn path=/trunk/; revision=28947
2009-07-06 12:50:12 +00:00
Anders Broman
f16859def3 From Kovarththanan Rajaratnam:
Cleanup header_field_info definitions
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548

svn path=/trunk/; revision=28940
2009-07-05 11:49:36 +00:00
Anders Broman
508d91b358 A fix for:
"ANSI ISUP Cause indicators with coding standard=ANSI fail to dissect."
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3654

svn path=/trunk/; revision=28939
2009-07-04 15:15:51 +00:00
Guy Harris
bf7462bf97 Set save_fragmented regardless of whether we're reassembling or not, as
we restore it regardless of whether we're reassembling or not.

svn path=/trunk/; revision=28938
2009-07-03 17:12:36 +00:00
Bill Meier
d36f35f28b From: Tobias Witek: Fix processing of radius 'vendor specific attributes'
In the RADIUS dissector, the function radius_register_avp_dissector() registers
vendors that are not already present in the dictionary hash-table. As far as I
can see, there are two problems with this:

1. The function does not set the number of type/length octets and the has_flags
 variable for that AVP, which is required to correctly decode AVP/VSA values
2. In some situations, the function is called _before_ radius_load_dictionary()
is called (for example for the vendor 3GPP (ID: 10415))

Therefore, all vendor entries that are created by calling
radius_register_avp_dissector() leave their type_octets and length_octets un-initialized,
which causes incorrect decoding.

[Result: Radius dissector displays messages such as:
 "Malformed Packet: RADIUS" and "Error/Malformed: Malformed Packet(Exception occurred)"]

The attached patch fixes this problem by assuming that the dictionary knows the
'ground truth' about the type/length octet and the has_flags information and allows it to
overwrite these values even for vendors that have already been loaded.

Also: (from Bill Meier): set the type/length octet and the has_flags variables to default
"standard" values (1,1,FALSE) in radius_register_avp_dissector().

Fixes Bug #3651 (and Bug #3635).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3651
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3635

svn path=/trunk/; revision=28937
2009-07-03 16:03:02 +00:00
Anders Broman
1415c62c68 Fix:
packet-ndmp.c:562: warning: unused parameter 'pinfo'

svn path=/trunk/; revision=28936
2009-07-03 13:05:45 +00:00
Anders Broman
24b17483b7 From Chris Costa:
NDMP fragmentation fix.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3395

svn path=/trunk/; revision=28935
2009-07-03 11:45:42 +00:00
Gerald Combs
5631122d1d Try to allocate enough memory on all platforms.
svn path=/trunk/; revision=28930
2009-07-03 00:17:06 +00:00
Gerald Combs
88ba030310 From Kovarththanan Rajaratnam via bug 3567:
The template cache contains pointers that are session-scope (only freed in
netflow_reinit()) but still we use g_malloc(). This patch changes that so we
now use se_alloc(). With this patch I'm able to reproduce the crash
("Per-session memory corrupted").

svn path=/trunk/; revision=28927
2009-07-02 20:35:58 +00:00
Gerald Combs
2391d808af Update documentation links.
svn path=/trunk/; revision=28926
2009-07-02 20:35:46 +00:00
Anders Broman
9952ce524f From Radek Vokál:
Support for new NFSv4 features.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3258

svn path=/trunk/; revision=28919
2009-07-02 16:54:20 +00:00
Stig Bjørlykke
75a8a15e2b From Albert Chin:
Small patch to make it compile on AIX.

svn path=/trunk/; revision=28917
2009-07-02 06:51:27 +00:00
Gerald Combs
e2890d4053 Fix a couple of labels.
svn path=/trunk/; revision=28914
2009-07-01 23:36:35 +00:00
Stig Bjørlykke
581d804ce5 Added error value tables.
svn path=/trunk/; revision=28913
2009-07-01 21:20:18 +00:00
Gerald Combs
a66905c3d2 Add a couple of IPFIX labels where they differ from Netflow.
svn path=/trunk/; revision=28912
2009-07-01 20:56:03 +00:00
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
Stig Bjørlykke
5fc6f20298 Added a preference to define more udp ports to use for TFTP.
svn path=/trunk/; revision=28619
2009-06-03 09:57:22 +00:00
Jaap Keuter
a27093be2e Remove the module globals.
Clean up the source code.

svn path=/trunk/; revision=28615
2009-06-02 21:44:00 +00:00
Bill Meier
0a6a096b34 Do find_dissector_handles once-only in proto_reg_handoff...
lenght ==> length in a few places;

svn path=/trunk/; revision=28610
2009-06-02 19:41:35 +00:00
Stig Bjørlykke
7a71847e0d Fixed the type for key_len in dissect_key().
svn path=/trunk/; revision=28609
2009-06-02 19:35:45 +00:00
Bill Meier
8ccf0f9ba4 packet_hip: (Minor): Remove unused data_handle; move proto_register... to just before proto_reg-handoff...
svn path=/trunk/; revision=28604
2009-06-02 18:47:20 +00:00
Stig Bjørlykke
ab319c586e From Alexis La Goutte via bug 3488:
Add support for decoding CAPWAP Control Packet (RFC5415)

From me:
Adjusted some names.
Some space cleanup.

svn path=/trunk/; revision=28603
2009-06-02 18:39:38 +00:00
Stig Bjørlykke
7e6d072ce7 Rewrote to add IPv6 addresses correctly and rewrote some proto_item_add_bytes()
to avoid using tvb_get_ptr().

svn path=/trunk/; revision=28601
2009-06-02 15:46:55 +00:00
Jeff Morriss
05322d40f1 Decode SCCP cause values in SUA (using value_strings exported from the SCCP
dissector).

svn path=/trunk/; revision=28599
2009-06-02 15:34:17 +00:00
Stig Bjørlykke
a48abd8b33 Removed a unused preference setting, some unused includes and
some unused code.

svn path=/trunk/; revision=28598
2009-06-02 15:22:33 +00:00
Stig Bjørlykke
7bdb23ed67 From Samu Varjonen via bug 3378:
Added support for Host Identity Protocol (HIP).

From me:
- Adjusted location of "Checksum" and "HIP Controls", as they seems to have
  switched place in the bytes window
- Rewrote some proto_tree_add_uint -> proto_tree_add_item (some still remain)
- Rewrote to not use tvb_memcpy()
- Corrected some proto_tree_add_item's as the format seems to be big-endian
- Terminate ALL value_string's with { 0, NULL }
- No need to zero-terminate value_string strings.
- Removed call to check_col()
- Removed some prototypes
- Removed unused hf_hip_tlv_id, hf_hip_res and hf_hip_tlv_enc_iv (please check)
- Rewrote some C++ comments

svn path=/trunk/; revision=28596
2009-06-02 15:10:04 +00:00
Graeme Lunt
57d4cea4d5 Update to:
* support the P3 protocol in addition to the P1 protocol; and 
* reduce the number of changes to the ASN.1 modules (as asn2wrs now handles more of the ASN.1 constructs).
P3 is currently only supported over ROS (and not RTSE)


svn path=/trunk/; revision=28593
2009-06-02 11:04:14 +00:00
Graeme Lunt
4251c11a35 Support for the Entrust VersionInfo certificate extension
svn path=/trunk/; revision=28590
2009-06-02 09:46:03 +00:00
Graeme Lunt
f10d978b33 Restore the generation and display of LDAP DNs from RDN components
svn path=/trunk/; revision=28589
2009-06-02 09:44:52 +00:00
Graeme Lunt
24187e9c4d Correct LDAP certificate attribute name
svn path=/trunk/; revision=28587
2009-06-02 09:20:10 +00:00
Graeme Lunt
f9218e245e Added support for the UserNotice certificate extension.
svn path=/trunk/; revision=28586
2009-06-02 09:17:16 +00:00
Jaap Keuter
38638f9fb1 From Matt Deckard:
Add support for the DIS protocol dissector to more fully interpret the PDU
types "Data Query", "Data", and "Set Data". It should interpret the
originating and receiving entity IDs, request ID, number of fixed and variable
datum fields, and the ID and values of each datum field in the PDU.

svn path=/trunk/; revision=28583
2009-06-02 06:37:21 +00:00
Balint Reczey
ab57f8da5d Unescape telnet suboption data if needed.
This fixes bug 191.

svn path=/trunk/; revision=28582
2009-06-02 00:04:55 +00:00
Balint Reczey
8b7993180b Revert 28580.
svn path=/trunk/; revision=28581
2009-06-01 22:41:48 +00:00
Balint Reczey
4d55fdb51c Fix dissection of telnet window size suboption.
This fixes bug 191.

svn path=/trunk/; revision=28580
2009-06-01 22:27:00 +00:00
Stig Bjørlykke
01c61d3ecb Removed some unused hf_ entries.
Renamed filter abbrev from ns. to nstrace.

svn path=/trunk/; revision=28571
2009-06-01 18:17:52 +00:00
Stig Bjørlykke
c9b492a422 From Ravi Kondamuru via bug 3457:
Add support to read citrix netscaler capture file format.

From me:
- Renamed packet-ns.c to packet-nstrace.c
- Rewrote to not use "goto" in netscaler.c
- Moved dissecting of coreid

svn path=/trunk/; revision=28564
2009-06-01 17:23:38 +00:00
Martin Mathieson
3f416f98ee For DL-SCH/UL-SCH, show subframe number in info column.
svn path=/trunk/; revision=28561
2009-06-01 16:50:27 +00:00
Michael Tüxen
246d8f9c6c Bring cipher suites in sync.
svn path=/trunk/; revision=28542
2009-05-31 15:25:38 +00:00
Martin Mathieson
4e6962056a Don't dissect IP-ID and UDP checksum for IR, IR-DYN frames.
Name hf items and filter strings to consistently include "rohc"

svn path=/trunk/; revision=28539
2009-05-31 12:11:44 +00:00
Stephen Fisher
c4680240d9 Change my e-mail address
svn path=/trunk/; revision=28537
2009-05-31 05:55:15 +00:00
Michael Tüxen
c69b435205 Add cipher suites defined in RFC 4279.
svn path=/trunk/; revision=28535
2009-05-30 19:52:41 +00:00
Martin Mathieson
c5c563d38b Tidy up comments.
svn path=/trunk/; revision=28531
2009-05-30 12:54:08 +00:00
Martin Mathieson
63504714a0 Dual-license this header file.
svn path=/trunk/; revision=28530
2009-05-30 11:57:39 +00:00
Anders Broman
b4aeb97ed5 tvb_new_real_data -> tvb_new_child_real_data
svn path=/trunk/; revision=28517
2009-05-29 06:16:43 +00:00