Commit Graph

48036 Commits

Author SHA1 Message Date
Gerald Combs 45589bf41d TShark links with libui so we should always build it.
svn path=/trunk/; revision=51101
2013-08-01 23:40:06 +00:00
Jeff Morriss 2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
Martin Kaiser 6ae3372687 fix buildbot error on OSX-10.6-x64
include capture_opts.h

svn path=/trunk/; revision=51099
2013-08-01 22:21:53 +00:00
Jeff Morriss b05d5554ed As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8816 :
Enable TSN analysis by default.

svn path=/trunk/; revision=51098
2013-08-01 21:46:38 +00:00
Jakub Zawadzki b5c43d0cf9 Use opt_comment only when has_phdr_comment is set.
svn path=/trunk/; revision=51097
2013-08-01 21:24:54 +00:00
Martin Kaiser 11643ecc83 add --capture-comment to tshark's manpage
fix a typo in the dumpcap manpage

svn path=/trunk/; revision=51096
2013-08-01 21:21:35 +00:00
Jeff Morriss 7cbe100f22 Initialize fdata->flags.has_user_comment too.
svn path=/trunk/; revision=51095
2013-08-01 21:20:31 +00:00
Martin Kaiser 24c88b8007 pass --capture-comment from tshark to dumpcap
handle error cases in tshark

svn path=/trunk/; revision=51094
2013-08-01 21:09:19 +00:00
Martin Kaiser bee464590b use explicit cast to squelch compiler warning
svn path=/trunk/; revision=51093
2013-08-01 21:06:34 +00:00
Jeff Morriss 1dc3a29474 From Dominique Martinet via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8787 :
Follow-up on 9P dissector enhancement ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8589 )

"fid"s, 9P file descriptors, are valid from the moment it's allocated until
when it's freed. My original patch kept a fid hashtable updated everytime a
packet was dissected in full-view (with a non-null tree)

Attached is a patch that builds a tree for each 9P fid and stores the
corresponding path when it becomes valid/marks it as invalid when it no longer
is.

svn path=/trunk/; revision=51092
2013-08-01 21:04:32 +00:00
Martin Kaiser 5863aaa51b add --capture-comment to tshark's print_usage() function
make it clear that a capture comment can only be added when we
create a new file

svn path=/trunk/; revision=51091
2013-08-01 21:04:28 +00:00
Jakub Zawadzki 08eb36b5af Remove fdata->opt_comment, add pkt_comment to pinfo
Original (read from file) comments can be accessed by pkthdr->opt_comment
Keep user comments in seperated BST, add new method for epan session to get it.

svn path=/trunk/; revision=51090
2013-08-01 20:59:38 +00:00
Martin Kaiser 6c5e16185d add --capture-comment to tshark
make sure that getopt() does not permute tshark's argv[] array

svn path=/trunk/; revision=51089
2013-08-01 20:57:47 +00:00
Guy Harris 91382394d6 Squelch a warning by explicitly casting to throw away the upper 32 bits
of a result.

svn path=/trunk/; revision=51088
2013-08-01 20:46:49 +00:00
Martin Kaiser 7cdd97b089 use getopt_long() in tshark
svn path=/trunk/; revision=51087
2013-08-01 20:45:59 +00:00
Martin Kaiser 0cbe856098 simplify argument checking for tshark
if a capture file is read, do all corresponding checks in one place

svn path=/trunk/; revision=51086
2013-08-01 20:44:50 +00:00
Martin Kaiser 73444a24e0 remove unused function hash_eth_wka()
in order to fix the compile error
addr_resolv.c:1250:1: error: 'hash_eth_wka' defined but not used
[-Werror=unused-function]

svn path=/trunk/; revision=51085
2013-08-01 20:31:09 +00:00
Anders Broman 0105d538d2 Use glibs hastables rather than home grown variants for manuf an wka(well known addresses).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9000

svn path=/trunk/; revision=51084
2013-08-01 20:11:13 +00:00
Jeff Morriss 490f48044c From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9001 :
Some small improvements to the Modbus Dissector:
- Better detection of query/response w/ serial line Modbus RTU
- Smallest Modbus RTU message can actually be 6 bytes, not 8.
- Only check 16/32-bit register decoding options with appropriate function codes

svn path=/trunk/; revision=51083
2013-08-01 19:32:24 +00:00
Jakub Zawadzki d0cb52d0b7 Move some asserts to be triggered sooner.
svn path=/trunk/; revision=51082
2013-08-01 17:19:20 +00:00
Jakub Zawadzki 10e40c1638 tvb: check_offset_length() can calculate remaining length, use it.
svn path=/trunk/; revision=51081
2013-08-01 16:54:22 +00:00
Jeff Morriss 565211c938 As pointed out in https://www.wireshark.org/lists/wireshark-dev/201307/msg00250.html :
r51066 should have also updated the hf_ variable name, comments, and a couple
of data structures.

(I don't know this protocol so these changes are basically a half-educated
global search-n-replace.)

svn path=/trunk/; revision=51080
2013-08-01 16:03:55 +00:00
Gerald Combs 4111941a75 Fix compatibility with older versions of Python. Tested with 2.5, 2.6,
and 3.3.

svn path=/trunk/; revision=51079
2013-07-31 23:32:45 +00:00
Jakub Zawadzki 3d975361a2 From r50772 we don't need first_packet in modify_time_perform(), so we can remove whole initialization op.
svn path=/trunk/; revision=51078
2013-07-31 22:07:05 +00:00
Guy Harris b7cf00c657 Check the Python major version number in a way that works in Python 2
and Python 3.

svn path=/trunk/; revision=51077
2013-07-31 21:10:50 +00:00
Guy Harris 3ba7057528 Get rid of extra comment line.
svn path=/trunk/; revision=51075
2013-07-31 20:41:56 +00:00
Guy Harris 7bad1f75da Only use sw_vers if we're on OS X.
svn path=/trunk/; revision=51074
2013-07-31 20:40:19 +00:00
Gerald Combs ee9c3082a8 Add support for Python 3. Make sure we pass bytes to hashlib.sha1 as
suggested in bug 8995. Call print as a function instead of a builtin as
suggested by 2to3.

svn path=/trunk/; revision=51073
2013-07-31 20:14:35 +00:00
Jakub Zawadzki a2a20ed62a Move tvbuff composite structure to their own file.
svn path=/trunk/; revision=51072
2013-07-31 20:01:53 +00:00
Jakub Zawadzki 9d519b5659 Move composite tvbuff to seperate file (with some subtle changes).
svn path=/trunk/; revision=51071
2013-07-31 19:58:13 +00:00
Jakub Zawadzki a9b8779fb9 Linux: add support for getting total/rss from /proc/self/statm
svn path=/trunk/; revision=51070
2013-07-31 19:02:56 +00:00
Jakub Zawadzki 1cabad610b Add some very basic framework to fetch statistics of memory usage per component.
Use it in memory_dlg.

svn path=/trunk/; revision=51069
2013-07-31 18:26:14 +00:00
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