Commit Graph

47785 Commits

Author SHA1 Message Date
Evan Huus 828eae73ce Document that pinfo-scoped memory is also needed for anything passed to
add_new_data_source().

svn path=/trunk/; revision=50911
2013-07-26 13:06:50 +00:00
Pascal Quantin 53ddabfe2e Align info column for AM/UM/TM PDUs
svn path=/trunk/; revision=50910
2013-07-26 10:39:23 +00:00
Pascal Quantin 373fde85bd Add Channel ID to MTCH PDUs
svn path=/trunk/; revision=50909
2013-07-26 10:21:05 +00:00
Alexis La Goutte 5988d137d8 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8972 ieee80211: Dissect QoS Mapping information
This patch adds support for dissecting QoS Map Configure frame and QoS Map Set element per Interworking functionality that was added in IEEE 802.11u

svn path=/trunk/; revision=50908
2013-07-26 08:51:59 +00:00
Alexis La Goutte 09dd131320 Oups... Revert my change (See revision 50905)
svn path=/trunk/; revision=50907
2013-07-26 07:02:12 +00:00
Alexis La Goutte 6e5d6b84b9 Fix compilation of qtshark
ui/qt/uat_dialog.cpp: In member function ‘void UatDialog::stringPrefTextChanged(const QString&)’:
ui/qt/uat_dialog.cpp:371:10: error: variable ‘enable_ok’ set but not used [-Werror=unused-but-set-variable]

And remove a tabs

svn path=/trunk/; revision=50906
2013-07-26 06:54:11 +00:00
Guy Harris bab7316bf2 Guess what the intent of the enable_ok Boolean was.
svn path=/trunk/; revision=50905
2013-07-26 06:51:59 +00:00
Gerald Combs ec23a1003c Call on_uatTreeWidget_itemActivated directly. Fixes compilation on
older versions of Qt.

svn path=/trunk/; revision=50904
2013-07-26 01:48:05 +00:00
Jeff Morriss 5c6e1d5d40 From Cal Turney and Jiří Engelthaler via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :

The fix for bug 5585 (r35583) is no longer necessary (thanks to r50516) and it
causes the screen to flicker when clicking on bytes in the bytes pane.

svn path=/trunk/; revision=50903
2013-07-26 01:45:48 +00:00
Jeff Morriss 588bc03a5b From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8977 :
In SSH, the protocol version message is terminated by CR LF. Wireshark, in the
info column, strips out the LF, but not the CR.

Attaching a patch to rectify that.

Also, as requested, update the contributor's email address in AUTHORS.

svn path=/trunk/; revision=50902
2013-07-26 01:35:44 +00:00
Jeff Morriss 26197c1693 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8952 :
Microsoft describes a feature called Bind Time Feature Negotiation used in
DCE/RPC Bind/BindAck PDUs. See http://msdn.microsoft.com/en-us/library/cc243715.aspx

In the Bind PDU they encode 2 bits into the Transfer Syntax UUID. In the
BindAck PDU they encode 2 bits into the result code. The attached patch
dissects these two special bits. For the UUID I've simply added 4 UUIDs each
with the same name; this works best with the DCE/RPC UUID lookup code. If
Microsoft would ever introduce more bits we could change this to a better
handling, since the current solution obviously doesn't scale.

Apart from adding new hf_ and ett_ variables and using them, I've also renamed
"Transport Syntax" to "Transfer Syntax", since the specifications only use
"Transfer".

svn path=/trunk/; revision=50901
2013-07-26 01:18:34 +00:00
Jeff Morriss 1b278a3db0 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8951 :
Currently, the only attribute that is dissected is attribute 82 in page 1.

The approach for dissecting an attribute requires defining a function that
processes the attribute-specific fields. However, most attributes consists of
a single field, and the only difference between attributes is because of their
length and format (that is already defined for the header field). The current
code also assumes that the attribute length is always correct (e.g. the
attribute has 8 bytes if the field is registered as FT_UINT64).

As a proof of concept, this patch adds support for 3 attributes in the Current
Command attributes page (see OSD2r4 section 7.1.3.31) and prepares a framework
for dissecting additional attributes (dissection of additional attributes will
be delivered in a separate patch).


From me:

Move the new length checking up to the caller rather than repeating it in
every attribute dissector.

Use proto_tree_add_expert_format() instead of proto_tree_add_text() plus
expert_add_info().

Fix checkfiltername.pl error:

    scsi_osd.scsi_osd_attribute_length.invalid duplicates PROTOABBREV of scsi_osd

Remove trailing white space and fix up some indentation.

svn path=/trunk/; revision=50900
2013-07-26 01:09:41 +00:00
Jeff Morriss effa86350a From Chen Li via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8949 :
Fix the dissection of the port number in announce_peers request in BTDHT.

svn path=/trunk/; revision=50899
2013-07-26 00:24:54 +00:00
Evan Huus a934ff953f Add missing ui_uat_dialog.h dependency.
The fact that we're listing these manually is kind of ugly...

svn path=/trunk/; revision=50898
2013-07-26 00:23:09 +00:00
Evan Huus 8441fff193 Use the pinfo pool for adding data sources in the h245 dissector. The packet
pool is freed before the packet is displayed or otherwise processed, so adding
data sources from it leads to use-after-free errors.

Not sure why this wasn't showing up in the fuzz-bot valgrind step, there
are lots of h245 captures in the menagerie...

svn path=/trunk/; revision=50897
2013-07-25 23:58:49 +00:00
Gerald Combs a05f55bffc Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.

Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.

Update the Qt README.

svn path=/trunk/; revision=50896
2013-07-25 23:49:47 +00:00
Evan Huus 7d73903af6 Multiple improvements and bug-fixes for the fuzz-test script:
- fix a few pieces of bad indentation
- exit cleanly in all cases where we receive a SIGINT or other signal
- check for valgrind bugs and dissector errors with every set of arguments (-nr
  vs -nVxr etc) not just the last
- consider it an error if valgrind reports more than 500KB of leaked memory

For the last point, 500KB is hopefully a safe choice for now since we only leak
about 2KB "by default" and I have no idea what the state of most "non-default"
code is with respect to memory leaks. I would like to eventually work this
down to 0 of course :)

svn path=/trunk/; revision=50895
2013-07-25 23:28:38 +00:00
Evan Huus 7b1aa04181 Fix a bug in the Kafka dissector handling PRODUCE requests with a RequiredAcks
field of 0 - we don't expect a response to them.

svn path=/trunk/; revision=50894
2013-07-25 22:45:02 +00:00
Michael Mann c1e75c8ff3 Add a few filters to keep checkAPIs.pl happy.
svn path=/trunk/; revision=50893
2013-07-25 19:11:31 +00:00
Jeff Morriss d58c13c363 As pointed out in https://www.wireshark.org/lists/wireshark-dev/201307/msg00153.html :
The fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290 needs
to allow for giving a length of -1 for FT_STRINGZ's.

This is another fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8960
(in addition to r50836).  There's no point in reverting that revision, though,
since there was no need to use a length of -1 in that case.

svn path=/trunk/; revision=50892
2013-07-25 18:37:18 +00:00
Pascal Quantin a92ee76d3e Add a smarter UM analysis for MCCH/MTCH channels
svn path=/trunk/; revision=50891
2013-07-25 17:33:57 +00:00
Jakub Zawadzki 696a79707b Optimize proto_item_append_string()
- When old string empty just pass new one (like: frame.protocols)
- if not, use ep_strconcat()

svn path=/trunk/; revision=50890
2013-07-25 17:19:17 +00:00
Jeff Morriss 35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Guy Harris cb12fbb78c Fix some warnings that show up on OS X.
Clean up indentation (use 4-space indentation, and no tabs).

svn path=/trunk/; revision=50888
2013-07-25 10:05:41 +00:00
Guy Harris 629ee9ed81 Fix some more bugs that caused compiler warnings.
svn path=/trunk/; revision=50887
2013-07-25 09:53:28 +00:00
Guy Harris 166eb4f53d Get rid of an unused variable (set, but not used).
Get rid of extra arguments to expert_add_info_format_text() - as with
any other printf-like routine, if the format string has no % items, you
don't need to pass any additional arguments after that - you don't have
to tack on a BASE_NONE just for the lulz.

svn path=/trunk/; revision=50886
2013-07-25 09:03:02 +00:00
Anders Broman b2ba9d676e Commiting Jakub Zawadzkis memory_dlg even if he does not think it's ready yet so others can add to it if they like. Fixed it to work on Windows too. It can always be removed if nothing comes of it.
svn path=/trunk/; revision=50885
2013-07-25 04:40:37 +00:00
Michael Mann 3b3ff69af7 1. MASSIVE conversion of proto_tree_add_text to proto_tree_add_item with the help of (and a few passes of) convert_proto_tree_add_text.pl. Tried to keep display filter names in line with existing filters.
2. Cleaned up a bunch of proto_tree_add_xxx that could really be proto_tree_add_item so "useless" local variables could be removed.

3. Bugfixed a few bitmask (probably) copy/pasteos.

4. Better standardized whitespace and added modelines.

5. Still think some of the "object" filters (with BASE_NONE) could be removed in favor of a single filter (value_string) with object ID number (BASE_DEC), but I'll leave that to someone more familiar with the protocol.

svn path=/trunk/; revision=50884
2013-07-25 03:16:43 +00:00
Jeff Morriss 285a439021 Reinstate r47243 (i.e., revert r50869): with the old way "make distcheck"
fails.

Fix radius/Custom.make so that automake likes it (remove the \ followed by
nothing).  Once that's done, make the inclusion of that file mandatory so
that it actually (as I supposed--incorrectly--would happen in r47243) gets
distributed in the source tarball.

svn path=/trunk/; revision=50883
2013-07-25 01:01:58 +00:00
Guy Harris 05a7ab12c1 Add a AC_WIRESHARK_QT_MODULE_CHECK that checks for a particular Qt
module, and use that in AC_WIRESHARK_QT_CHECK.

svn path=/trunk/; revision=50882
2013-07-24 23:44:56 +00:00
Guy Harris f317c7821d The files in aclocal-fallback are copies of .m4 files from various
packages, providing macros that we use in our configure script in case
somebody building from SVN doesn't happen to have the package installed
and thus doesn't happen to have those macros defined.

In the case of Qt, there *isn't* such a .m4 file, so we had to create
the macro.  Move it to acinclude.m4, and rename it to
AC_WIRESHARK_QT_CHECK to indicate that it's our own check.

svn path=/trunk/; revision=50881
2013-07-24 22:34:44 +00:00
Guy Harris 9c5b6c76a6 Check for QtMacExtras, and use it if we have it.
svn path=/trunk/; revision=50880
2013-07-24 22:14:50 +00:00
Guy Harris 8fa093daa5 Add a comment.
svn path=/trunk/; revision=50879
2013-07-24 22:08:42 +00:00
Jeff Morriss 0e60bd6e40 Use the dist_ prefix for the _DATA variables. That way we don't have to
explicitly add them to the distribution (via EXTRA_DIST).

svn path=/trunk/; revision=50878
2013-07-24 20:54:15 +00:00
Martin Kaiser 14c82477bf use getopt_long() in dumpcap
for now, there's no long options, this is just a first test to see if
things compile everywhere...

svn path=/trunk/; revision=50877
2013-07-24 20:42:39 +00:00
Jörg Mayer 7a324cfcd6 Fix a bug that will prevent the extra flags from being honored.
svn path=/trunk/; revision=50876
2013-07-24 20:42:11 +00:00
Jörg Mayer ae6007ab11 Copy over from cmake git head as it fixes a bug:
The detection will not work if the locale is non-English

svn path=/trunk/; revision=50875
2013-07-24 20:40:40 +00:00
Michael Mann c5ab45f678 fix "compile" error
svn path=/trunk/; revision=50874
2013-07-24 20:16:44 +00:00
Martin Kaiser e8d6b0581b we have to make the manual change for *gtk2* now
svn path=/trunk/; revision=50873
2013-07-24 18:48:25 +00:00
Guy Harris 1cd5695ebd If none of --with-gtk2, --with-gtk3, or --with-qt are specified, and
--disable-wireshark was not specified, build with GTK+ 3.

If any of --with-gtk2 or --with-qt are specified, and --with-gtk3 wasn't
specified, *don't* look for GTK+ 3 and don't build with it.

If *both* --with-gtk2 and --with-gtk3, fail.

svn path=/trunk/; revision=50872
2013-07-24 18:36:02 +00:00
Anders Broman b5167576d3 Revert http://anonsvn.wireshark.org/viewvc/trunk/Makefile.am?r1=47243&r2=47242&pathrev=47243
Config.nmake is needed when doing "make install" on a build from a tarball.

svn path=/trunk/; revision=50869
2013-07-24 17:34:09 +00:00
Anders Broman 1c92cbf702 Don't enable GTK3 build on win32 - it's not working.
svn path=/trunk/; revision=50868
2013-07-24 17:29:52 +00:00
Gerald Combs 4c45973d75 Add a note about possible improvements.
svn path=/trunk/; revision=50867
2013-07-24 17:05:20 +00:00
Anders Broman 61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows.
svn path=/trunk/; revision=50865
2013-07-24 15:54:55 +00:00
Michael Mann 4795803614 Add "usage" for expert option
svn path=/trunk/; revision=50864
2013-07-24 15:44:49 +00:00
Jörg Mayer 18155bd148 Change default gtk build from version 2 to version 3 for
autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863
2013-07-24 11:51:10 +00:00
Jörg Mayer 957436d5b8 Add a paragraph what to try if installation of the SDK fails.
svn path=/trunk/; revision=50862
2013-07-24 01:54:22 +00:00
Guy Harris 9551f67595 The current version of Qt is 5.1.
Note that Qt Mac Extras won't necessarily build.

svn path=/trunk/; revision=50861
2013-07-24 00:51:09 +00:00
Guy Harris 045638fc9b Don't cast away constness, and constify a function parameter.
svn path=/trunk/; revision=50860
2013-07-24 00:12:41 +00:00
Guy Harris d8022e7c5e Make some routines not used outside rawshark.c static.
svn path=/trunk/; revision=50859
2013-07-24 00:09:16 +00:00