Commit Graph

40552 Commits

Author SHA1 Message Date
Michael Tüxen 6526ea3751 Add support for specifying an SCTP port number.
svn path=/trunk/; revision=42677
2012-05-17 14:34:09 +00:00
Jakub Zawadzki 91690d8a28 Fix string buffer overflow (bug #7029)
g_strlcpy() always return the size of strlen(src), so in case of truncation it could happen that offset_r > size or offset_e > size.
Fix it by adding new function protoo_strlcpy() which returns how many bytes was copied to dest buffer.


svn path=/trunk/; revision=42676
2012-05-17 10:18:53 +00:00
pascal b607964f1f Fix spice.common_cap_byte1 filter I changed by mistake in r42664
svn path=/trunk/; revision=42675
2012-05-17 08:22:34 +00:00
Gerald Combs 9e3487a953 Use BASE_DEC for spice.common_cap_byte1. (Hopefully that's correct.)
svn path=/trunk/; revision=42668
2012-05-16 22:05:47 +00:00
pascal 4a1de290f8 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7264 :
Enhance the Spice dissector to deal with sized data streams and playback data
From me: fix a few hf entries

svn path=/trunk/; revision=42664
2012-05-16 21:20:16 +00:00
pascal f400e647b8 From Pontus Andersson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7259 :
GTP Extension headers are dissected incorrectly

svn path=/trunk/; revision=42663
2012-05-16 20:59:56 +00:00
Chris Maynard ff667657e8 Largely, whitespace and formatting changes. Added modelines to match.
Other misc. changes:
-> Delete useless, duplicate assignment of offset to 0 in dissect_vsnp().
-> Change short seq # display filter so it's not the same as the seq # filter.
-> pppoe.dump.gz looks to be malformed, so remove unnecessary "remlen" code in
   dissect_cp() and let the packets be displayed as malformed since they are.
-> Remove if (check_col()) checks.
-> Fix copy-and-paste of filter name for ipcp.opt.max_header.

svn path=/trunk/; revision=42661
2012-05-16 19:55:49 +00:00
Gerald Combs 805c4779fa Update INSTALL_DIR to match r42659.
svn path=/trunk/; revision=42660
2012-05-16 17:57:12 +00:00
Jeff Morriss ef756b397c Fix the *test_install targets so they put the test tools in the right directory (wireshark-gtk2 is one dir up from here).
svn path=/trunk/; revision=42659
2012-05-16 16:36:32 +00:00
Gerald Combs bdb614e264 Fix a bunch of uninitialized variables found by Coverity Scan. CIDs
702403, 702404, 702405, 702406, 702407, 702408, 702409, 702410, 702411,
and 702412.

svn path=/trunk/; revision=42658
2012-05-16 16:29:12 +00:00
Anders Broman 46e202503a se_allocate and store per packet data.
svn path=/trunk/; revision=42657
2012-05-16 14:56:34 +00:00
pascal e5f3a74723 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7186 :
Link together access-request and access-challenge messages

svn path=/trunk/; revision=42656
2012-05-16 13:24:10 +00:00
Anders Broman 3e2ea7b812 Handle DCH information in RadioLinkReconfigurationPrepareFDD
svn path=/trunk/; revision=42655
2012-05-16 13:05:27 +00:00
Jakub Zawadzki e8c69cef7e Free memory when create_tempfile() failed.
svn path=/trunk/; revision=42654
2012-05-16 09:07:19 +00:00
Anders Broman dc8224653e Only do HS-DSCH Control frames for now as something is broken.
svn path=/trunk/; revision=42653
2012-05-16 08:35:53 +00:00
Anders Broman e65a6548bf From David Wei:
Corrected info column for piggybacked GTPv2 messages.

svn path=/trunk/; revision=42652
2012-05-16 07:47:15 +00:00
Anders Broman 18c5ec235c Setup frame for HSDSCH
svn path=/trunk/; revision=42651
2012-05-16 06:03:06 +00:00
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