Commit Graph

92 Commits

Author SHA1 Message Date
Evan Huus c7909c4195 Fix one small leak in xml dissector registration.
svn path=/trunk/; revision=50564
2013-07-14 00:54:02 +00:00
Evan Huus 2626f96901 Use epan-scoped memory for XML field strings. Another ~35KB leaks fixed.
Running `tshark -v` (which has the happy effect of doing
  epan_init();
  epan_cleanup();
with no practical work in-between), now leaks a hair less than 2KB of memory on
my machine. It was over 500KB earlier today :)

svn path=/trunk/; revision=50416
2013-07-06 18:31:35 +00:00
Evan Huus 42ce3fe364 Convert xml's dynamic hf array from a garray to a wmem_array. Cleans up another
~200KB of leaks in epan library.

svn path=/trunk/; revision=50408
2013-07-06 16:08:12 +00:00
Jeff Morriss c2ced4a2ab Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702.  I think it's now safe
to remove that backwards compatibility.

This eliminates the last argument of get_persconffile_path().

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437

svn path=/trunk/; revision=48797
2013-04-09 02:48:03 +00:00
Anders Broman 8dbab6179d From beroset:
remove C++ incompatibilities from packet-xml.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=47988
2013-03-01 20:36:59 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Bill Meier a8112e6529 Fix [-Wshadow] warnings;
Also (for one or more of the files):
 - create/use one or more extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - convert apparent 4-space tabs to spaces;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46265
2012-11-28 22:41:07 +00:00
Anders Broman 2c38e9b1dc Add application/ccmp+xml
svn path=/trunk/; revision=45782
2012-10-25 10:16:09 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Jakub Zawadzki a920dbe177 Fix memory leak of errors GString
Valgrind log:
  = 308 (264 direct, 44 indirect) bytes in 11 blocks are definitely lost in loss record 39,914 of 41,651
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xC5B0574: g_malloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5C94DF: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5CEC52: g_string_sized_new (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0x6A723C5: proto_register_xml (packet-xml.c:1249)

svn path=/trunk/; revision=44064
2012-07-27 08:45:53 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Guy Harris d46a8a2506 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42565
2012-05-11 07:44:43 +00:00
Jakub Zawadzki c67d24077e Allow loading xml files (file MUST start with <?xml).
I needed it for testing (bug #7028)
if you feel like it's stupid idea give me nfo :)

svn path=/trunk/; revision=41944
2012-04-04 20:52:52 +00:00
Jakub Zawadzki 80445e5a99 Fix off by one shift errors introduced in r39530 where it seemed proper[1]
[1] I'm unsure of packet-dtpt, so I haven't patch it.

svn path=/trunk/; revision=41873
2012-03-31 20:57:15 +00:00
Anders Broman ab692eb7d4 Add an 3gpp xml entry.
svn path=/trunk/; revision=40731
2012-01-26 17:51:19 +00:00
Bill Meier 1311b2ab83 Fix tvb memory leak; Fix hex byte display for Unicode XML.
svn path=/trunk/; revision=40187
2011-12-13 22:49:59 +00:00
Bill Meier d7a1840204 Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.

svn path=/trunk/; revision=39530
2011-10-23 22:58:45 +00:00
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Anders Broman e9edaef048 application/simservs+xml
svn path=/trunk/; revision=38235
2011-07-28 10:04:12 +00:00
Stephen Fisher 6ad633b043 Fix various warnings found by clang 3.0 (trunk 129935) complier:
- Extraneous parentheses

- Use _U_ for unused function parameters instead of assigning the variable
  to itself 


svn path=/trunk/; revision=36826
2011-04-22 18:04:26 +00:00
Alexis La Goutte 65ff056f37 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36766
2011-04-21 13:45:37 +00:00
Alexis La Goutte d555a8eb6d Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36762
2011-04-21 13:35:09 +00:00
Anders Broman b321c5d5ea Add application/vnd.3gpp.cw+xml
svn path=/trunk/; revision=35450
2011-01-10 12:28:56 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Bill Meier 209109c2fd Define some fcns & vars as static ...
svn path=/trunk/; revision=34458
2010-10-10 20:07:06 +00:00
Anders Broman 7f90713b6e from Tarjei Knapstad.
Minor cleanups in packet-xml dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4987

svn path=/trunk/; revision=33475
2010-07-08 12:55:03 +00:00
Jaap Keuter ee66e776f8 Allow for heuristic dissection of Unicode XML.
svn path=/trunk/; revision=32757
2010-05-11 19:01:56 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Stig Bjørlykke 011aa07154 From LEGO via bug 4395:
Have the current_frame's last_item actually point to the last item.

svn path=/trunk/; revision=32069
2010-03-01 22:12:38 +00:00
Stig Bjørlykke aa6b8e1347 From LEGO via bug 4405:
Add the dot ('.') to the characters that can compose a name.

svn path=/trunk/; revision=32068
2010-03-01 22:11:20 +00:00
Anders Broman 440c3f9261 From Didier Gautheron:
check_col.diff
Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31519
2010-01-13 20:32:01 +00:00
Anders Broman 7a4ae2c3b5 Add ETSI Applications.
svn path=/trunk/; revision=31266
2009-12-14 16:49:35 +00:00
Bill Meier bf85ecb308 Rename hfinfo.ref_count to hfinfo.ref_type since that's now how it's used.
svn path=/trunk/; revision=30216
2009-09-30 14:02:49 +00:00
Stig Bjørlykke 221225e0f3 From Kovarththanan Rajaratnam via bug 3719:
This patch optimizes proto_tree_prime_hfid() + friends and
plugs a memleak in the process.

From me:
Removed unused hfindex in proto_tree_new_item()
Fixed ref_count entry in struct header_field_info.

svn path=/trunk/; revision=29137
2009-07-18 20:10:14 +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
Anders Broman 8e7599022d More size_t casts.
svn path=/trunk/; revision=27882
2009-03-29 14:37:57 +00:00
Stig Bjørlykke 62f60df6b4 From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.

svn path=/trunk/; revision=27718
2009-03-13 22:06:48 +00:00
Tomas Kukosa 5b96cb0506 - add attributes and CDATA into XML structure
- implement functions for searching in XML structure

svn path=/trunk/; revision=27316
2009-01-28 11:25:39 +00:00
Bill Meier 7280c469a3 Fix some spelling/typos
svn path=/trunk/; revision=27024
2008-12-16 14:18:55 +00:00
Stig Bjørlykke 58e2d7a0d6 Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26649
2008-10-31 15:47:47 +00:00
Tomas Kukosa 1e9ab739c3 put original tag name (not lowercase) into dissected xml structure too
dissect xml even if tree is null

svn path=/trunk/; revision=26261
2008-09-24 10:42:24 +00:00
Bill Meier 82affdc4df Fix indentation to be consistent
svn path=/trunk/; revision=26194
2008-09-15 02:05:26 +00:00
Guy Harris 9d1b5335ac g_ascii_strdown() and g_ascii_strup(), unlike g_strdown() and g_strup(),
do *not* modify the string handed to them - they g_mallocate a new
string and return it.

Create routines that *do* ASCII-only case mapping in place, and use them
instead.

Clean up indentation.

svn path=/trunk/; revision=26131
2008-09-03 19:14:52 +00:00
Tomas Kukosa 39515048dc supply dissected XML structure to caller dissector
svn path=/trunk/; revision=26005
2008-08-13 15:19:08 +00:00
Stig Bjørlykke 22ff43e0bd Fix a typo: strl -> strlen
svn path=/trunk/; revision=25263
2008-05-09 12:55:37 +00:00
Anders Broman 1cc7c72db6 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25261
2008-05-09 11:59:44 +00:00
Anders Broman 45b8ffd1ec Remove depreciated functions g_string_sprint, g_string_sprintfa.
svn path=/trunk/; revision=25238
2008-05-05 19:52:59 +00:00
Anders Broman 63c5c71cf8 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24859
2008-04-09 05:36:08 +00:00