Commit Graph

18167 Commits

Author SHA1 Message Date
pascal d5aa739fd0 From Alexander Lüders & Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7254 :
Enhancements for FPSpotlightRPC AFP function

svn path=/trunk/; revision=42633
2012-05-15 19:25:33 +00:00
Bill Meier d53320919a Remove unneeded #includes (stdlib, stdio, ctypes, time);
In a few cases: do some whitespace, indentation cleanup & reformatting.

svn path=/trunk/; revision=42632
2012-05-15 19:23:35 +00:00
Gerald Combs 3e4b3756fd From Evan Huus via bug 6805:
Look before we loop

Check the value of various key count parameters against the size of their
parent tag *before* we start looping on them.

Stick an expert error on the field and bound the loop at a sane point if the
count is bogus.

svn path=/trunk/; revision=42631
2012-05-15 19:13:10 +00:00
Gerald Combs 691ea690c8 Fix a few scan-build warnings along with some whitespace.
svn path=/trunk/; revision=42630
2012-05-15 19:11:08 +00:00
Anders Broman ba39b783d8 Remove more unfinished code.
svn path=/trunk/; revision=42629
2012-05-15 15:46:15 +00:00
Anders Broman e134cca032 Use converstaion info to dissect FP DCH flows. Revert unfinished code.
svn path=/trunk/; revision=42628
2012-05-15 15:00:52 +00:00
Guy Harris 1c2a67f348 Make the encoding argument uniformly guint rather than gint.
Put the code that's currently common to the ENC_ASCII and ENC_UTF_8
cases in tvb_get_ephemeral_string_enc() into tvb_get_ephemeral_string(),
and call tvb_get_ephemeral_string() in those cases.  Skip the
tvb_ensure_bytes_exist() and ensure_contiguous() calls in the ENC_UTF_16
and ENC_UCS_2 cases, as they're unnecessary there.

Update the comment for tvb_get_ephemeral_string_enc().

Make tvb_get_ephemeral_stringz_enc() handle the encodings that
tvb_get_ephemeral_string_enc() does.

svn path=/trunk/; revision=42627
2012-05-15 05:42:58 +00:00
Guy Harris 1ec0629c1b Make the "idl-light"-to-dissector generator handle hex (and octal)
values in enums (and, while we're at it, add some error checking for
valid values).  (The regenerated dissectors don't differ usefully from
the fixed dissectors, so we don't check them in.)

svn path=/trunk/; revision=42626
2012-05-14 23:19:13 +00:00
Guy Harris 953a5c3fff Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Change the "idl-light"-to-dissector generator to use ENC_NA for
structures and ENC_LITTLE_ENDIAN for bitmasks (are they always
little-endian, or should they check the data representation?).  Also
change it to properly set the display format for FT_ABSOLUTE_TIME fields
(it now specifies whether to show local time, UTC, or UTC with a
1-origin day-of-year).

Change one routine in the template for the DRSUAPI dissector to use
ENC_UTF_16|ENC_LITTLE_ENDIAN with proto_tree_add_item() (the field it
dissects is known to be a string, so there's no need to check its data
type).

Regenerate the BUDB, BUTC, and DRSUAPI dissectors.  (The generated BUTC
dissector handles pointers differently - either the old dissector was
wrong, or the generator is wrong, or the IDL for the protocol is wrong,
or the difference doesn't actually affect dissection.)

The generator doesn't currently handle hex values in enums correctly;
manually fix packet-dcerpc-drsuapi.h.

svn path=/trunk/; revision=42625
2012-05-14 23:05:28 +00:00
pascal 05cfd1c391 From Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7256 :
Fix subquery_count loop variable updating

svn path=/trunk/; revision=42624
2012-05-14 21:46:02 +00:00
Jakub Zawadzki 0f1a21aaa9 tvb_unicode_strsize() returns number of bytes, NOT number of UCS-2 characters.
svn path=/trunk/; revision=42622
2012-05-14 06:32:16 +00:00
Guy Harris 14b616c35d Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Add new "add_packet_field" method to the TreeItem class, taking a
protocol field (*not* a protocol), TvbRange, and encoding value as
arguments.

Add the ENC_ values to init.lua.  Make them all hex #defines so
make-init-lua.pl can easily extract them.

Export tvb_unicode_strsize() for use by Lua (and elsewhere as desired). 
Note that it handles UTF-16 and UTF-8, and fix the comment to note that
its count of hexadectets *does* include the null terminator (that's what
the code does).

svn path=/trunk/; revision=42621
2012-05-14 00:49:05 +00:00
pascal 723b213c89 From Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7246 :
Patch adding dissection of time data

svn path=/trunk/; revision=42620
2012-05-13 21:02:42 +00:00
pascal 2845705252 Revert 42618 (in 3GPP vocabulary multirat means multi radio access technology)
svn path=/trunk/; revision=42619
2012-05-13 19:03:48 +00:00
Chris Maynard 7cd17ae0b3 More typos: Multirat -> Multirate.
svn path=/trunk/; revision=42618
2012-05-13 18:01:35 +00:00
Chris Maynard 21863ad163 Convert tabs to spaces. Fix some typos.
svn path=/trunk/; revision=42617
2012-05-13 17:55:06 +00:00
Anders Broman 82ba410214 Tabs spelling
svn path=/trunk/; revision=42616
2012-05-13 16:34:53 +00:00
Bill Meier f9a08c84d5 General cleanup:
- whitespace;
- formatting (including long lines & hf[] entries).

svn path=/trunk/; revision=42614
2012-05-13 14:53:26 +00:00
Gerald Combs 6c1dd6f0de [Automatic manuf, services and enterprise-numbers update for 2012-05-13]
svn path=/trunk/; revision=42612
2012-05-13 14:03:29 +00:00
Anders Broman 6d757a2083 Renove redundant code
svn path=/trunk/; revision=42611
2012-05-13 14:00:10 +00:00
Anders Broman 09c5089ebc Fix de_rr_cell_opt_sacch decoding the DTX cell options wrongly, by using proto_tree_add_split_bits_item_ret_val https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7253
svn path=/trunk/; revision=42610
2012-05-13 13:58:10 +00:00
Guy Harris f354e31304 A routine that processes a struct_XXX() won't necessarily use its
encoding argument; mark it as (potentially) unused.

svn path=/trunk/; revision=42609
2012-05-12 23:00:15 +00:00
Guy Harris 13095234ad "byte_order" is an encoding value, so it should be guint.
svn path=/trunk/; revision=42608
2012-05-12 22:56:46 +00:00
Guy Harris 268f5c9f51 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Replaced the "little_endian" Boolean value with an "byte_order" value
containing the setting of the byte-order ENC_ bit. 

svn path=/trunk/; revision=42607
2012-05-12 22:25:29 +00:00
Bill Meier f2cd5350f6 Fix a compile error
svn path=/trunk/; revision=42606
2012-05-12 22:19:02 +00:00
Bill Meier b8712813cc General cleanup:
- Fix two minor bugs which resulted in missing entries in packet details pane;
- Remove packet-rdp.h: It's not used elsewhere;
- Define 3 global fcns as static: they're only referenced within packet-rdp.c;;
- Localize some variable definitions & remove uneeded variable initializations;
- ...
- Fix whitespace and indentation.


svn path=/trunk/; revision=42605
2012-05-12 22:14:02 +00:00
Guy Harris e4b688d5dc Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Replaced the "little_endian" Boolean value with an "byte_order" value
containing the setting of the byte-order ENC_ bit. 

svn path=/trunk/; revision=42604
2012-05-12 20:27:35 +00:00
Chris Maynard 82fa509542 Fix display filter prefix from "ntpctrl." to "ntp.ctrl." Part of a patch submitted by Michael Mann in bug 2794, but for some reason the patch specified the filter prefix as "nap.ctrl.", which I don't think is right.
svn path=/trunk/; revision=42603
2012-05-12 20:26:42 +00:00
Guy Harris 3896fea6c0 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Updated tools/process-x11-xcb.pl to support different encoding values
for different fields.  Replaced the "little_endian" Boolean value with a
"byte_order" value containing the setting of the byte-order ENC_ bit. 
Regenerated X11 fields from current x.org git.

svn path=/trunk/; revision=42601
2012-05-12 20:07:08 +00:00
Chris Maynard da5ea5a8dd From Evan Huus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7239
Make inputint and outputint fields UINT32s instead of UINT16s.

svn path=/trunk/; revision=42599
2012-05-12 17:55:09 +00:00
Alexis La Goutte 466988126d From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7252
Add wlan.ra field value to wlan.addr

The (hidden) field wlan.addr==xx:xx:xx:xx:xx:xx currently matches wlan.da,
wlan.bssid, wlan.sa and wlan.da fields but not wlan.ra field.

svn path=/trunk/; revision=42597
2012-05-12 13:12:01 +00:00
Guy Harris bd42162bfe hf_x11_keycodes is an FT_NONE; use ENC_NA with it.
svn path=/trunk/; revision=42595
2012-05-12 01:59:00 +00:00
Guy Harris 675416c0de string16_with_buffer_preallocated() takes a byte-order gboolean as its
argument.

svn path=/trunk/; revision=42594
2012-05-12 01:54:49 +00:00
Guy Harris f1020435f8 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42593
2012-05-12 00:43:46 +00:00
Guy Harris 7a87d7b6a3 Add ENC_UTF_16 and ENC_UCS_2. Note that UTF-16 and UCS-2 are not the
same, and that the routines to get "Unicode" strings are really doing
UCS-2 (and not doing anything about code values that aren't valid in
UCS-2 strings).

Have tvb_get_ephemeral_string_enc() separate cases for ASCII and UTF-8,
even though they're *currently* treated the same.

For FT_UINT_STRING, treat an encoding value of TRUE as meaning
"little-endian ASCII"; pass all other encodings through to
tvb_get_ephemeral_string_enc().

svn path=/trunk/; revision=42592
2012-05-11 23:55:54 +00:00
Chris Maynard bb524c6b64 Despite the OSX-10.5-x86 buildbot insisting that they are, neither 'flags' nor 'fh_tree' were used uninitialized, but make a change to shut it up.
svn path=/trunk/; revision=42591
2012-05-11 20:24:27 +00:00
Chris Maynard 7748862a65 Further LCP improvements:
-> Support RFC 2153's Vendor Specific decode
-> Make more fields filterable by converting some add_text()'s to add_xyz().
-> Don't wrap call_dissector_only() within an if(tree){} block.

svn path=/trunk/; revision=42581
2012-05-11 18:01:51 +00:00
Guy Harris f1b11f62f8 proto_registrar_get_ftype() returns an FT_ value; make its return type
"enum ftenum" to reflect that, and fix the "switch doesn't handle XXX"
warnings that provokes.

svn path=/trunk/; revision=42579
2012-05-11 17:29:56 +00:00
Guy Harris f42de82580 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_bitmask() calls.

svn path=/trunk/; revision=42577
2012-05-11 16:38:08 +00:00
Anders Broman dfadac5d9a Make it possible to add "dirty" custom dissectors.
svn path=/trunk/; revision=42576
2012-05-11 12:14:29 +00:00
pascal 633a538cdb Commit forgotten file in revision 42573
svn path=/trunk/; revision=42575
2012-05-11 10:22:32 +00:00
pascal 079f737508 Remove useless '+0' in proto_tree_add_* function calls
svn path=/trunk/; revision=42574
2012-05-11 09:50:28 +00:00
pascal 0264b67ed7 From Niels de Vos:
Add dissection of AUTH_GLUSTERFS as used in GlusterFS-3.3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7244

svn path=/trunk/; revision=42573
2012-05-11 09:44:55 +00:00
pascal f982541723 From Niels de Vos:
Add a helper function to dissect AUTH_UNIX groups
Fix hf_rpc_auth_lk_owner entry
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7244

svn path=/trunk/; revision=42572
2012-05-11 09:38:49 +00:00
pascal b42423a8dc From Frank Lahm:
In FPSpotlightRPC packets, check for elements with 0 childs (denoted by L in TLV is sizeof(TLV tag))
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7245

svn path=/trunk/; revision=42571
2012-05-11 09:03:22 +00:00
Anders Broman 1fe00a4c44 Make it possible to dissect private IE's
svn path=/trunk/; revision=42570
2012-05-11 08:42:23 +00:00
Guy Harris 6a92b2a472 Get rid of non-ASCII character.
svn path=/trunk/; revision=42569
2012-05-11 08:29:40 +00:00
Guy Harris 25917db46e Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_bitmask() calls.

svn path=/trunk/; revision=42568
2012-05-11 08:10:42 +00:00
Guy Harris 32ec3275bd Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_bits_item() calls.

svn path=/trunk/; revision=42567
2012-05-11 08:05:35 +00:00
Guy Harris fde0260bee Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42566
2012-05-11 07:49:27 +00:00