Commit Graph

47904 Commits

Author SHA1 Message Date
Evan Huus 0e90cd8f80 As noticed by Anders: move a wmem include outside of the #ifdef, we want it
regardless of whether or not we have GnuTLS.

svn path=/trunk/; revision=51067
2013-07-31 15:32:42 +00:00
Jeff Morriss fbbeebe054 From Richard Sharpe:
It's not Command Sequence Number but Message ID.

https://www.wireshark.org/lists/wireshark-dev/201307/msg00242.html

svn path=/trunk/; revision=51066
2013-07-31 13:30:29 +00:00
Evan Huus 5b485c3c0a Don't use emem or wmem in base_custom functions, just use a buffer on the stack,
since it's not needed after we write it into the output field. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8996 which was introduced by
the wmem conversion.

svn path=/trunk/; revision=51065
2013-07-31 12:15:34 +00:00
Guy Harris a6abba0bcf Add the URL of a document from VSS Monitoring that gives details of the
trailer.

svn path=/trunk/; revision=51064
2013-07-31 10:59:38 +00:00
Guy Harris b8bc01c74f Set the minimum OS X version in the installer package based on the
deployment target; if --disable-osx-deploy-target was specified, set it
to the OS version on which we're building - minor/dot-dot version and
all - as there's no guarantee that it'll work on *any* version earlier
than that.

svn path=/trunk/; revision=51060
2013-07-31 07:39:11 +00:00
Guy Harris 5593058825 If you use --enable-osx-deploy-target or --disable-osx-deploy-target on
anything other than OS X, fail; whatever it is you're trying to do won't
work (unless and until there exists a platform that fully supports
cross-development for OS X, *including* building against SDKs and
building with -mmacosx-version-min).

If you use neither on OS X, default to the OS major version on which
you're building.  If you use --disable-osx-deploy-target, don't build
against an SDK and don't use -mmacosx-version-min.

svn path=/trunk/; revision=51057
2013-07-31 07:17:45 +00:00
Guy Harris 53bec490e7 Put the GTK2 vs. GTK3 and autofoo vs. CMake options at the beginning,
before either of them are tested.

Put the code to get the OS major version number just before we first use
it.

Fix indentation.

svn path=/trunk/; revision=51054
2013-07-31 06:25:40 +00:00
Guy Harris 365188e9a4 Back out previous checkin, which wasn't intended (and which had the
wrong checking message - wrong source tree...).

svn path=/trunk/; revision=51051
2013-07-31 05:04:20 +00:00
Guy Harris d5a2958b56 Copy over r51049 from trunk:
------------------------------------------------------------------------
  r51049 | guy | 2013-07-30 22:00:28 -0700 (Tue, 30 Jul 2013) | 5 lines

  If no target OS version was specified, default to the major version on
  which we're running, so we *always* build against an SDK.  (The "10" in
  "10.x.y" is not *really* part of the version number, so the "major
  version" includes the "10" and the major version number following it.)

svn path=/trunk/; revision=51050
2013-07-31 05:01:58 +00:00
Guy Harris dfce6feb08 If no target OS version was specified, default to the major version on
which we're running, so we *always* build against an SDK.  (The "10" in
"10.x.y" is not *really* part of the version number, so the "major
version" includes the "10" and the major version number following it.)

svn path=/trunk/; revision=51049
2013-07-31 05:00:28 +00:00
Michael Mann 5047c5fcd5 Some cleanup prepping for convert_proto_tree_add_text.pl. Major issue was making value_strings global for the file (and adjusting their "namespace"), so they can be used in the hf array.
svn path=/trunk/; revision=51048
2013-07-31 02:14:50 +00:00
Evan Huus 615687f4c0 Fix the most egregious of the newly exposed leaks, about 28KB.
svn path=/trunk/; revision=51047
2013-07-31 01:55:20 +00:00
Evan Huus 999c603027 Convert preferences to wmem. Exposes some more memory leaks that didn't show up
before.

svn path=/trunk/; revision=51046
2013-07-31 01:49:57 +00:00
Evan Huus 8fafa9b758 Add wmem_tree_is_empty(). Also permit lookups on a NULL tree for compatibility
with emem.

svn path=/trunk/; revision=51045
2013-07-31 01:48:47 +00:00
Evan Huus f9d7a5ee47 Revert one tiny bit of r51043 where UAT code got wmemed by accident.
svn path=/trunk/; revision=51044
2013-07-31 01:47:00 +00:00
Evan Huus 960a461c8a Convert SSL and TCP dissectors to wmem (with the exception of UAT).
svn path=/trunk/; revision=51043
2013-07-31 01:26:05 +00:00
Evan Huus bc7c14a2a1 Convert the USB dissectors to wmem.
svn path=/trunk/; revision=51042
2013-07-31 01:06:50 +00:00
Jakub Zawadzki 9bb17b7b2b Remove interface_id, pack_flags from frame_data structure.
This patch assumes that wtap_phdr interface_id, pack_flags both from initial read and seek read will contain same values.
Please fix if it's not.

svn path=/trunk/; revision=51041
2013-07-30 23:14:09 +00:00
Pascal Quantin 564c6234fc Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8883 :
Add support for FemtoInterfaceMsg media type

svn path=/trunk/; revision=51040
2013-07-30 21:27:01 +00:00
Jakub Zawadzki 3f9b7e36e9 Reorder field_info structure to remove paddings on 64 bits (8B less).
svn path=/trunk/; revision=51039
2013-07-30 21:09:03 +00:00
Martin Kaiser 2f91dd8bfc From Roman Dontschenko
VNC: Add Apple Remote Desktop authentication support

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

svn path=/trunk/; revision=51038
2013-07-30 20:36:05 +00:00
Martin Kaiser 2f42b3b031 provide a mechnism to exclude some CI+ SAC messages from being
exported in the clear by the export PDU mechanism

use this mechanism to exclude SAC messages that contain CCK precursor data
(Exporting this is not a security issue, but people should be aware of what
 they're doing. It's safer to exlude those messages and prevent people from
 exporting them accidentially.)

svn path=/trunk/; revision=51037
2013-07-30 20:05:49 +00:00
Jakub Zawadzki 430bd9eacc Optimize marking label as truncated in proto_tree_set_representation_*()
svn path=/trunk/; revision=51036
2013-07-30 20:02:24 +00:00
Jakub Zawadzki e5997ef390 Remove dirty (and not compiling) code from app_mem_usage.c, need rewrite if really needed.
svn path=/trunk/; revision=51035
2013-07-30 19:47:51 +00:00
Guy Harris e6e28655e7 Add app_mem_usage.h.
Sort the headers while we're at it.

svn path=/trunk/; revision=51034
2013-07-30 18:59:19 +00:00
Guy Harris 97223504ed Add a newline to the end of the file.
svn path=/trunk/; revision=51033
2013-07-30 18:57:32 +00:00
Gerald Combs e9d8fb754d Have docbook/Makefile.nmake use index.html similar to r51021. Make some
target names less confusing.

svn path=/trunk/; revision=51032
2013-07-30 17:57:20 +00:00
Pascal Quantin 5806f31bd6 Remove useless include
svn path=/trunk/; revision=51031
2013-07-30 17:50:05 +00:00
Evan Huus 1a28f66086 Dissect more of the Kafka protocol.
svn path=/trunk/; revision=51030
2013-07-30 17:13:57 +00:00
Evan Huus 338701e9fd Move a few variables inside the appropriate ifdefs.
svn path=/trunk/; revision=51029
2013-07-30 16:50:31 +00:00
Anders Broman d0c26ae7ca Add missing includes.
svn path=/trunk/; revision=51028
2013-07-30 16:21:15 +00:00
Jörg Mayer b0dc68d8e4 Mimic commit http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51021
svn path=/trunk/; revision=51027
2013-07-30 14:37:43 +00:00
Michael Mann bf2b413ac7 Add request/response tracking to COPS dissector. Bug 8947 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8947).
From Simon Zhong

svn path=/trunk/; revision=51026
2013-07-30 13:15:25 +00:00
Stig Bjørlykke 9c58664956 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8994

Adjusts field lengths to display values properly.

svn path=/trunk/; revision=51025
2013-07-30 08:49:32 +00:00
Anders Broman 6e3a7ddddb Building app_mem_usage fails on *nix, missing include(s)?
Don't have the time to fix it at the moment.

svn path=/trunk/; revision=51024
2013-07-30 06:10:35 +00:00
Anders Broman 78afe3fa82 Add a routine to get application memory usage to epan.
svn path=/trunk/; revision=51023
2013-07-30 05:49:58 +00:00
Gerald Combs eb94380646 asciidoc.conf: Have sort-and-group remove commas.
gen-bugnote: Create proper bug links.

svn path=/trunk/; revision=51022
2013-07-29 21:14:13 +00:00
Gerald Combs 58ee866ec8 Name our index pages "index.html". This is follows a well-established
convention and lets us avoid a bit of juggling on the server side.

svn path=/trunk/; revision=51021
2013-07-29 21:12:05 +00:00
Martin Kaiser 3b92f760ed add a NULL check to report_type_length_mismatch()
this might be called via proto_tree_add_item() with tree==NULL
which results in a crash

svn path=/trunk/; revision=51020
2013-07-29 21:10:13 +00:00
Martin Kaiser 174fa28a31 support exporting decrypted DVB-CI/CI+ SAC messages
using the new export PDU mechanism

svn path=/trunk/; revision=51019
2013-07-29 20:38:20 +00:00
Evan Huus 56bf58dce3 Add license header to script after emailing author to verify that GPL 2+ was the
intended license.

svn path=/trunk/; revision=51018
2013-07-29 20:24:02 +00:00
Anders Broman 82569132d9 Add the forgotten makefile updates.
svn path=/trunk/; revision=51017
2013-07-29 18:19:59 +00:00
Balint Reczey 8ec086a613 Use wildcards for referring to library files in debian/wireshark-common.files
This makes updating debian/wireshark-common.files obsolete when bumping
library versions.

svn path=/trunk/; revision=51016
2013-07-29 17:27:16 +00:00
Evan Huus 44d53b4042 More little optimizations.
svn path=/trunk/; revision=51014
2013-07-29 16:55:02 +00:00
Evan Huus 0fb6d96507 Another little optimization.
Removes one branch from the hot path, deduplicates one function call in the cold
path by effectively falling through, and makes it more obvious what the code is
actually trying to do.

svn path=/trunk/; revision=51013
2013-07-29 16:47:30 +00:00
Chris Maynard 1a0b16d176 Trivial: Wrap text at column 80.
svn path=/trunk/; revision=51012
2013-07-29 15:45:36 +00:00
Chris Maynard a4595812f9 Trivial: Fix typo.
svn path=/trunk/; revision=51011
2013-07-29 15:43:37 +00:00
Guy Harris 2bf78ceca9 In the comments for pcap_link_type, point to
http://www.tcpdump.org/linktypes.html for the details, rather than to
some particular OS's net/bpf.h (assuming it even has one), and speak of
it as a LINKTYPE_ value rather than a DLT_ value (in those cases where
the LINKTYPE_ value for a given link-layer header type is different from
the DLT_ value, it's the LINKTYPE_ value that should be passed to
text2pcap, as it's what gets written to the file, and those should be
the always-platform-independent LINKTYPE_ values rather than the
possibly-platform-dependent DLT_ values).

svn path=/trunk/; revision=51008
2013-07-29 08:37:18 +00:00
Guy Harris 7c3e7c9506 The argument to the -l flag to text2pcap is a LINKTYPE_ value, not a
DLT_ value, which is good because it's a numerical value and the
numerical values for some link-layer header types are OS-dependent, but
the numerical values for all LINKTYPE_ values are OS-independent.  Use
LINKTYPE_RAW, not the value for the DLT_RAW on some but not all OSes,
for raw IP.

Also, 7 is LINKTYPE_ARCNET_BSD, emphasis on the "_BSD"; there's also a
Linux encapsulation for ARCNet that is different.  Note that it's the
BSD flavor.

svn path=/trunk/; revision=51005
2013-07-29 08:30:42 +00:00
Pascal Quantin 3e4e1448d2 Try to fix error: uninitialized const 'zeroes' is invalid in C++ [-Werror=c++-compat]
svn path=/trunk/; revision=51004
2013-07-29 07:54:24 +00:00