Commit Graph

47576 Commits

Author SHA1 Message Date
Guy Harris c5ca0c8b16 Download, build, and install pkg-config before GLib, courtesy of the
"use your internal version of GLib" flag for pkg-config's configure
script.  This simplifies things a little bit.

Fix an indentation error while we're at it.

svn path=/trunk/; revision=50453
2013-07-08 22:56:55 +00:00
Jeff Morriss 5541c28ae6 Fix the very long loop reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8911 :
In parseFields() ensure that we have at least one byte so that callers
don't have to protect against it returning an offset which hasn't incremented.

Remove a couple of now-unnecessary length-remaining (aka "will the offset
move?") checks.

In some other checks, use tvb_ensure_length_remaining() rather than calling
tvb_length_remaining() and (potentially) THROWing an exception.  I'm not sure
if these are really necessary now or not...

svn path=/trunk/; revision=50450
2013-07-08 21:12:06 +00:00
Jeff Morriss 2a62d8e8e6 Include the output (fuzz'd) file name in the output when fuzz (or randpkt)
testing fails.

Useful for when you want to use up a few spare CPU cores running multiple
simultaneous fuzz tests...

svn path=/trunk/; revision=50449
2013-07-08 19:49:17 +00:00
Pascal Quantin 3db06ae582 Fix "Could not compile color filter "Checksum Errors" from saved filters: eth.fcs_bad (type=Label) cannot participate in '==' comparison" warning
svn path=/trunk/; revision=50448
2013-07-08 18:49:42 +00:00
Gerald Combs 59644b3899 New Qt feature: Show related packet list items in the frame number
column. Conversation spans (setup frame to last frame) are shown with a
square bracket. Linked frames are shown with a circle.

Use correct column justifications in Qt. Move common
justification-related packet list code to ui/packet_list_utils.[ch].

Add a last_frame element to conversation_t.

svn path=/trunk/; revision=50447
2013-07-08 16:54:18 +00:00
Alexis La Goutte 5b7c3b3105 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50446
2013-07-08 16:37:47 +00:00
Jeff Morriss 36d3734dcb From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8906 :
This patch augments Wireshark's and tshark's augument usage reports (-? and
-t?) and the Wireshark and tshark man pages to list all available timestamp
options available for the -t option.

svn path=/trunk/; revision=50445
2013-07-08 16:25:13 +00:00
Jakub Zawadzki 87646b1126 Fixes for tmp_fld_check_value():
- FT_FRAMENUM can't have strings
- mask hfinfo->display to compare with valid BASE_ value

svn path=/trunk/; revision=50444
2013-07-08 05:59:07 +00:00
Guy Harris 2cc0fb0917 Clean up comments.
svn path=/trunk/; revision=50440
2013-07-07 21:38:04 +00:00
Jakub Zawadzki ed4622dc7f ups? first add + 1, then multiply.
svn path=/trunk/; revision=50438
2013-07-07 21:32:12 +00:00
Martin Kaiser bf6b5d74d6 fixed a typo in the expert infos
svn path=/trunk/; revision=50435
2013-07-07 19:03:03 +00:00
Jakub Zawadzki d4f1a2c599 tree_is_expanded: make it bit array.
Right now we have about 36K of ett items, and tree_is_expanded takes: 144K of memory (36K*sizeof(gboolean))
By making tree_is_expanded bit array, it reduce size to 4.5K (36K/8)

svn path=/trunk/; revision=50434
2013-07-07 17:13:17 +00:00
Jakub Zawadzki 792f35a28c Make tree_is_expanded array static, add setter/getter function.
svn path=/trunk/; revision=50433
2013-07-07 16:33:49 +00:00
Evan Huus cd7712fd2f A bit more of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828
svn path=/trunk/; revision=50432
2013-07-07 16:18:18 +00:00
Gerald Combs ebf30a7a5d [Automatic manuf, services and enterprise-numbers update for 2013-07-07]
svn path=/trunk/; revision=50429
2013-07-07 14:03:38 +00:00
Evan Huus afa7538f12 Revert part of r50415. As pointed out by Jakub, some of the value_string
functions are called when no dissection is going on, and so can't use
wmem_packet_scope().

svn path=/trunk/; revision=50428
2013-07-06 23:53:09 +00:00
Jakub Zawadzki 5ef777c80b proto.c: add few more cases when oct/hex can show up with signed number
remove invalid comment about HEX/OCT print not supported for signed numbers.

svn path=/trunk/; revision=50427
2013-07-06 23:46:31 +00:00
Guy Harris a39004e4aa Check for an OS X deployment target early, so that as many
tests using the compiler are done using the flags that
we'll be using when building.

Add a -mmacosx-version-min flag to CFLAGS/CPPFLAGS/LDFLAGS so that the
compiler tests use them.  This may, or may not, obviate the need to set
MACOSX_DEPLOYMENT_TARGET in OSX_DEPLOY_TARGET.

svn path=/trunk/; revision=50426
2013-07-06 23:29:50 +00:00
Guy Harris 455f10f4c4 We need Cairo if we're building on 10.5 *or* if we're building *for*
10.5 on a later OS.

Fix the download path for libpng, and update the version to the
currently-available version.

svn path=/trunk/; revision=50425
2013-07-06 23:00:56 +00:00
Evan Huus 5633f7ffd5 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8886

Fix an error in the scaling factor of field I062/380 subfield #28 in the Asterix
dissector.

svn path=/trunk/; revision=50424
2013-07-06 22:03:52 +00:00
Evan Huus 337ad423c1 From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8888
We're allocating an array of pointers, not an array of objects, so make the
sizeof() reflect that to avoid over-allocating.

svn path=/trunk/; revision=50423
2013-07-06 21:55:10 +00:00
Pascal Quantin 67e4c15d4e Add UE Id to UDP framing protocol
svn path=/trunk/; revision=50422
2013-07-06 21:43:44 +00:00
Guy Harris 10b4dc9f4a Use consistent 4-space no-tab indentation.
svn path=/trunk/; revision=50421
2013-07-06 21:21:54 +00:00
Pascal Quantin 218608f1a2 Count SDUs even when dumping only the MAC header
svn path=/trunk/; revision=50420
2013-07-06 21:07:42 +00:00
Guy Harris b2475c1c29 Squelch some warnings that show up with, for example, the GCC 4.2.1 that
comes with Xcode 3.2.6 (it's not a real problem, but that requires more
flow analysis than that version of the compiler does, apparently).

svn path=/trunk/; revision=50419
2013-07-06 19:34:21 +00:00
Guy Harris e02563ceae Don't install the GNU autotools on Snow Leopard and earlier; they were
shipped with those versions of OS X, and I had some problems with the
newer versions on Snow Leopard (the Makefile was doing weird stuff that
caused build failures in wsutil, moving .Tlo files to .Plo files; I
didn't investigate futher).

svn path=/trunk/; revision=50418
2013-07-06 19:32:07 +00:00
Evan Huus bd52515b06 Use epan-scoped memory for 6lowpan preference names. Another ~300 bytes gone.
svn path=/trunk/; revision=50417
2013-07-06 18:40:56 +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 bae9597ca7 Wmem-ify value-strings. Another ~10KB gone.
svn path=/trunk/; revision=50415
2013-07-06 18:25:27 +00:00
Evan Huus 74e1b830a9 Use epan-scoped memory for h248 packages. Fixes another ~24KB of leaks.
svn path=/trunk/; revision=50414
2013-07-06 18:14:04 +00:00
Evan Huus 32088c9e6e Regenerate p1 dissector.
svn path=/trunk/; revision=50413
2013-07-06 18:06:56 +00:00
Evan Huus b4df55d204 Build dynamic diameter value_string arrays with wmem arrays not garrays.
Fixes another ~60KB of leaks.

svn path=/trunk/; revision=50412
2013-07-06 18:01:57 +00:00
Evan Huus e1268955c7 Add wmem_array_sort() which just hands off to the standard library's qsort().
svn path=/trunk/; revision=50411
2013-07-06 17:47:32 +00:00
Guy Harris 519c5affa2 Add a --enable-osx-deploy-target option to set the deployment target
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET
environment variable to be set when building (so that, for example, we
don't use linker features available on the version on which we're
building but not on the minimum OS version for which we're building),
and causes the SDK for that version to be used (so that, for example, we
don't link with libraries with later version numbers than the ones
provided with the OS version for which we're building).

svn path=/trunk/; revision=50410
2013-07-06 16:42:30 +00:00
Evan Huus 5a744f4afa Remove unused data structures from new expert code. Cleans up another ~17KB
of leaks, and I suspect they won't be necessary (we can always add them back
using wmem if they do turn out to be needed).

svn path=/trunk/; revision=50409
2013-07-06 16:11:36 +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
Evan Huus 53c6595bd9 Add our license header to plugin moduleinfo.h files. Cleans up a batch of
licensecheck warnings.

svn path=/trunk/; revision=50407
2013-07-06 13:31:31 +00:00
Evan Huus 0bc2afcd06 Allocate expert protocol structs with wmem, cleans up a few KB of leaks in
epan_cleanup().

svn path=/trunk/; revision=50406
2013-07-06 12:54:13 +00:00
Evan Huus 260369a45d Build diameter's hf array in a wmem array instead of a garray. Fixes ~270KB of
leak when running epan_cleanup().

svn path=/trunk/; revision=50405
2013-07-06 12:45:33 +00:00
Guy Harris 24142c4ee4 In some versions of some OSes, even <string.h> declares index() under
some circumstances.  Use array_index as a variable name instead, to
avoid warnings.

svn path=/trunk/; revision=50404
2013-07-06 08:33:07 +00:00
Guy Harris 3376be17a7 For C string functions, the header to include is <string.h>, not
<strings.h>.

svn path=/trunk/; revision=50403
2013-07-06 08:29:01 +00:00
Guy Harris 8e4a60214a Add a "-t <target>" flag to set the deployment target OS version; that
causes a -mmacosx-version-min flag to be used, to keep the compiler and
linker from using features not supported by that OS version, and causes
the support libraries to be built against the SDK for that OS version,
so they don't request library versions later than the one shipped with
that version.

svn path=/trunk/; revision=50402
2013-07-06 06:16:06 +00:00
Evan Huus 777f060f01 Trivial code style: use wmem_new in a few places, and remove extraneous
whitespace.

svn path=/trunk/; revision=50401
2013-07-06 04:08:07 +00:00
Evan Huus c574f7d1ea Simple growable array implementation for wmem.
svn path=/trunk/; revision=50400
2013-07-06 04:02:08 +00:00
Michael Mann 225698ef0b Fix display filter errors caught by checkfiltername.pl
svn path=/trunk/; revision=50399
2013-07-06 02:53:45 +00:00
Michael Mann 9822a1f00a Add support for filterable expert info fields. Statistics don't separate out the expert info fields from the hf_ fields because we're really just looking for display filter name errors, regardless of source.
svn path=/trunk/; revision=50398
2013-07-06 02:52:16 +00:00
Evan Huus 56db3a238e Fix the last remnant of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8160
Correctly calculate delta-displayed time when using two-pass dissection with a
display filter.

svn path=/trunk/; revision=50397
2013-07-06 02:49:57 +00:00
Michael Mann eec311ef39 Fix duplicate diplay filter names found by checkfiltername.pl
svn path=/trunk/; revision=50396
2013-07-06 01:20:38 +00:00
Evan Huus 6de3257a6c From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Zigbee messaging cluster dissector.

svn path=/trunk/; revision=50395
2013-07-06 00:44:10 +00:00
Evan Huus 599d994938 From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8860
Numerous changes and fixes to the selfm dissector. Too many to bother listing
here, see the bug for full details.

svn path=/trunk/; revision=50394
2013-07-06 00:01:59 +00:00