Commit graph

40535 commits

Author SHA1 Message Date
Anders Broman
7918984efc Bug fixes and add HSDSCH
svn path=/trunk/; revision=42650
2012-05-16 05:58:30 +00:00
Anders Broman
ce6e224b5b Bug fixes and add HSDSCH
svn path=/trunk/; revision=42649
2012-05-16 05:57:41 +00:00
Jeff Morriss
6a4b07bb55 Store a copy of the default preferences (e_prefs; the dissectors' default
preference values have been stored for a while now).

If a preference has not been changed from its default value, comment it out
when writing the preferences file.  That way you won't get warnings about
some new "gui.*" (or other non-dissector) preference when switching between
SVN Wireshark and some older version.


Also fix some ommissions in copy_prefs() (preferences that were not copied).


(All these non-dissector preferences seem to require an awful lot of code;
it would be very nice to have a non-dissector preference registration API that
the GUI and core could use so we could eliminate a lot of this code.)

svn path=/trunk/; revision=42648
2012-05-16 03:06:08 +00:00
Bill Meier
2ed4baea4f all:
Merge .h files into .c files since .h files unused elsewhere;
     Do whitespace, indentation & formatting cleanup.
packet-acn.c:
     Fix 2 minor bugs wherein subtree not displayed in packet-details
     because tree variable used in proto_tree_add_text() always NULL.

svn path=/trunk/; revision=42647
2012-05-16 01:41:03 +00:00
Jeff Morriss
2071275974 Most dissectors don't register their preferences in subtrees, so don't allocate the submodules pe_tree until it's needed.
svn path=/trunk/; revision=42646
2012-05-16 01:20:55 +00:00
Gerald Combs
09487194e4 Check the return value of create_tempfile. Fixes CIDs 280527 and 280528.
svn path=/trunk/; revision=42645
2012-05-16 00:27:26 +00:00
Chris Maynard
bf0f73f6be Call dissect_osinlcp_opt_type_len() to dissect the OSINLCP option type and length, unintentionally omitted. I guess this is what happens without enough packet captures to test against and a compiler that doesn't warn enough about unused functions. Anyone know how to get MSVC compilers to complain about such things like the other compilers do?
svn path=/trunk/; revision=42644
2012-05-15 23:44:23 +00:00
Jeff Morriss
6f2b6538eb ifdef out dissect_osinlcp_opt_type_len since it's not used--should it be?
svn path=/trunk/; revision=42643
2012-05-15 23:39:06 +00:00
Gerald Combs
9d9aa0f241 Don't leak an open file handle (CID 702423).
svn path=/trunk/; revision=42642
2012-05-15 22:25:35 +00:00
Gerald Combs
63a5845486 Remove a bonus semicolon (CID 702424).
svn path=/trunk/; revision=42641
2012-05-15 22:19:51 +00:00
Bill Meier
a4e0dee6db Merge packet-cimd.h into packet-cimd.c (packet-cimd.h not used elsewhere);
Remove unneeded #includes;
Reformat hf[] entries;
Do minor code rework & whitespace cleanup.

svn path=/trunk/; revision=42640
2012-05-15 22:07:00 +00:00
Chris Maynard
4d7b302a6c PPP OSINLCP improvements. Note that the protocol name has been changed from OSICP to OSINLCP, which matches RFC1377 and IANA terminology from http://www.iana.org/assignments/ppp-numbers
svn path=/trunk/; revision=42639
2012-05-15 22:02:57 +00:00
Gerald Combs
21b3256918 Assign some variables that scan-build was complaining about.
svn path=/trunk/; revision=42638
2012-05-15 21:56:02 +00:00
pascal
101e304d4e Spaces -> tabs
svn path=/trunk/; revision=42637
2012-05-15 21:18:39 +00:00
pascal
96e21ee3f7 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7261 :
Add some sanity checks when dissecting SQ_TYPE_NULL

svn path=/trunk/; revision=42636
2012-05-15 21:16:06 +00:00
Chris Maynard
cf5eae2806 PPP IPCP improvements.
svn path=/trunk/; revision=42635
2012-05-15 21:01:52 +00:00
Bill Meier
b869cb0bc5 Remove unneeded includes (ctype.h, stdio.h);
In one case, define our own size for a string buffer
 (instead of using a magic constant 'BUFSIZ');
In a few cases: do some whitespace, indentation & reformatting cleanup.

svn path=/trunk/; revision=42634
2012-05-15 20:57:21 +00:00
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
Gerald Combs
992587c3bf Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +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
1c7269a6d1 Mention ENC_UCS_2 and ENC_UTF_16.
svn path=/trunk/; revision=42602
2012-05-12 20:10:18 +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
Jakub Zawadzki
57e6b25735 From r37696 default file format for dumpcap is pcap-ng. Fix manuals.
svn path=/trunk/; revision=42600
2012-05-12 19:49:49 +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