Commit Graph

46234 Commits

Author SHA1 Message Date
Guy Harris d3dc1bfd43 Check, for each of the standard handles, whether they need to be
redirected to a console.  Only if at least one of them needs to be
redirected to we create a console, and don't redirect them if they don't
need to be redirected.

This makes redirection of the standard output of, for example,
"wireshark -D" work; we don't redirect it out from under the shell.

svn path=/trunk/; revision=49044
2013-04-26 00:50:21 +00:00
Gerald Combs e6434ae19e Update the main, epan, and ui Doxygen configuration files. Change the
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each doxygen.cfg.in move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.

svn path=/trunk/; revision=49043
2013-04-26 00:07:42 +00:00
Jörg Mayer c3d7f57f58 Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
svn path=/trunk/; revision=49042
2013-04-25 23:04:19 +00:00
Evan Huus 7d2c6f3000 Annotate wmem functions for better compiler warnings and optimization.
svn path=/trunk/; revision=49041
2013-04-25 22:54:36 +00:00
Evan Huus e8fc503c21 Summarize the API listing in the wmem README. Doxygen in the header files will
be much easier to keep in sync with the actual code.

svn path=/trunk/; revision=49040
2013-04-25 22:29:48 +00:00
Jörg Mayer 9b87dc0afc Fix a warning: sparkline_delegate.h does not contain a Q_OBJECT
svn path=/trunk/; revision=49039
2013-04-25 22:11:40 +00:00
Jörg Mayer 52965244cd Add GTK3_DEFINITIONS to the compiler flag when building with gtk3
svn path=/trunk/; revision=49038
2013-04-25 21:35:54 +00:00
Jörg Mayer 540b4d5f2d Generating the realease notes is not yet done.
svn path=/trunk/; revision=49037
2013-04-25 21:34:22 +00:00
Gerald Combs d83d4accb0 Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
startup blur on OS X for Qt >= 5.

svn path=/trunk/; revision=49036
2013-04-25 21:08:56 +00:00
Martin Mathieson 74e15c70cc Flag as malformed expert info if we see padding subheaders at start and
end of subheader list.

svn path=/trunk/; revision=49035
2013-04-25 21:07:32 +00:00
Martin Kaiser 9264cc1137 From Mathias Guettler
correct value for "ATN Systems Management No Preference"

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

svn path=/trunk/; revision=49034
2013-04-25 20:54:56 +00:00
Anders Broman 54aa5c072f Add an AVP.
svn path=/trunk/; revision=49033
2013-04-25 17:21:34 +00:00
Pascal Quantin b3da159427 Enhance dissection of feedback
svn path=/trunk/; revision=49032
2013-04-25 15:21:48 +00:00
Evan Huus df0bbb4ffc Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8611
svn path=/trunk/; revision=49030
2013-04-25 13:57:02 +00:00
Jörg Mayer 557e7723e0 Note the removal of the left-handed settings and how to get the
behavior back via gtk-settings.

svn path=/trunk/; revision=49026
2013-04-25 08:15:22 +00:00
Guy Harris 39779a7bee Send the output of the -D and -L options to the standard output rather
than the standard error.

In Wireshark on Windows, create a console before doing so and destroy it
before exiting.  Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.

This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.

svn path=/trunk/; revision=49025
2013-04-25 05:47:11 +00:00
Pascal Quantin 35d3fa75be Try to please the OSX buildbots
svn path=/trunk/; revision=49024
2013-04-25 05:24:07 +00:00
Michael Mann eba34e00e7 Convert a few proto_tree_add_text to proto_tree_add_items. The dissector was originally under the 50% mark that checkAPIs.pl like, but subsequent patches pushed it over the limit, so I thought I'd knock it back down.
svn path=/trunk/; revision=49023
2013-04-24 23:20:24 +00:00
Michael Mann a18e128b44 convert some proto_tree_add_texts into expert_add_info_format. Didn't quite make checkAPIs.pl happy, but given the nature of the dissector (mostly raw text), I'm not sure it can hit the 50% ratio.
svn path=/trunk/; revision=49022
2013-04-24 23:17:44 +00:00
Michael Mann 2d9a44e0fa Add a few IP filterable fields to make checkAPIs.pl happy. It appears that "enumerated filter fields" are necessary, but that allows them to shirk the check* tools to possibly find unused hfs.
svn path=/trunk/; revision=49021
2013-04-24 23:15:38 +00:00
Pascal Quantin 2dc27b8b85 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8610 :
Ensure that tap is called after full dissection, even in case of exception

svn path=/trunk/; revision=49019
2013-04-24 21:25:30 +00:00
Pascal Quantin fd13812247 Add China Telecom AVP:s to Windows installer
svn path=/trunk/; revision=49018
2013-04-24 18:04:33 +00:00
Anders Broman 393ea67924 Add a basic file for China Telecom AVP:s.
svn path=/trunk/; revision=49017
2013-04-24 16:51:57 +00:00
Evan Huus e9f9ca4298 Fix format string typo causing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8607

svn path=/trunk/; revision=49015
2013-04-24 14:05:30 +00:00
Jörg Mayer 7e51c9713b dumpabi: This would create the directories in the sourcedir instead
of the binary dir. Fixed that.
  NOTE: It fails with and without this patch for out of tree builds:

jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi
[  1%] Built target wsutil
[  1%] Generating libwsutil.abi.tar.gz
ERROR: can't find modules
cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory
make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1
make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2
make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2
make: *** [dumpabi] Error 2
jmayer@egg:~/work/wireshark/svn/build/qt-gtk3>


svn path=/trunk/; revision=49014
2013-04-24 12:57:56 +00:00
Jörg Mayer 9db6d700cd The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html

svn path=/trunk/; revision=49013
2013-04-24 11:07:25 +00:00
Evan Huus 2616e09140 Add truncate function to wmem strbuf.
svn path=/trunk/; revision=49010
2013-04-24 00:11:57 +00:00
Evan Huus 1b13606b6f Now that the test suite is done and most of the common functions are
implemented, start replacing emem with wmem in dissectors.

Also remove emem.h include from a few files that didn't actually need it.

More to come once in hopefully large batches once I figure out the
appropriate regexes.

svn path=/trunk/; revision=49009
2013-04-24 00:01:45 +00:00
Jörg Mayer 28adc0dee1 Revert commits
------------------------------------------------------------------------
r47064 | cmaynard | 2013-01-14 16:39:38 +0100 (Mo, 14 Jan 2013) | 2 lines

packet-ncp2222.c -> dissectors/packet-ncp2222.c

------------------------------------------------------------------------
r47078 | gerald | 2013-01-14 21:05:24 +0100 (Mo, 14 Jan 2013) | 2 lines

Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.

------------------------------------------------------------------------

The first commit tried to make cmake behavior mimic autofoo behavior while
it should be the other way round: out of tree builds fail with packet-ncp2222.c
generation with autofoo.

The second commit just fixed the first one.


svn path=/trunk/; revision=49008
2013-04-23 23:09:34 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Martin Mathieson 4ef8ba6324 Add a quick check for a first printable character to avoid a more expensive
check of the whole first line. This gets called a lot as a heuristic
dissector.

svn path=/trunk/; revision=49006
2013-04-23 22:44:23 +00:00
Martin Mathieson 94d2036ad0 Turn some preferences on by default. Won't affect info column.
svn path=/trunk/; revision=49005
2013-04-23 22:33:53 +00:00
Gerald Combs 8ea3f82021 Add two tools useful for package maintainers:
backport-rev attempts to merge a revision from the trunk in the current
directory (presumably one of the release branches).

gen-bugnote fetches a bug title from bugs.wireshark.org and formats it
for inclusion in the release notes.

svn path=/trunk/; revision=49004
2013-04-23 19:21:18 +00:00
Martin Kaiser b9ec495a10 oops, missed a linebreak
svn path=/trunk/; revision=49003
2013-04-23 18:53:07 +00:00
Martin Kaiser 4324eeb254 From Mathias Guettler
dissector for ISO 10747 Inter Domain Routing Protocol
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8562

from me:
check for negative return value of tvb_reported_length_remaining()
remove unused hf entries
add modelines
don't initialise variables unless it's necessary
make idrp a new-style dissector


svn path=/trunk/; revision=49002
2013-04-23 18:46:08 +00:00
Gerald Combs d18230de70 Install QtShark by default.
svn path=/trunk/; revision=49001
2013-04-23 18:32:11 +00:00
Gerald Combs c0a41bb182 Add a link to the latest CRT redistributables.
svn path=/trunk/; revision=49000
2013-04-23 17:40:27 +00:00
Martin Kaiser 23856212d5 reformat, add editor modelines
svn path=/trunk/; revision=48998
2013-04-23 17:19:51 +00:00
Anders Broman 319bf24566 Add curr_layer_num which can be used to keep track of multiple occurances of the same protocol in a frame.
svn path=/trunk/; revision=48997
2013-04-23 17:17:56 +00:00
Martin Kaiser c9ac7ec169 nlpid.h requires value_string.h
svn path=/trunk/; revision=48996
2013-04-23 16:59:09 +00:00
Anders Broman 5d52a9c80f Restore a lost hf def.
svn path=/trunk/; revision=48995
2013-04-23 16:59:07 +00:00
Martin Mathieson f78d7ed4d7 When calling IP and Ipv6 dissectors, they may reduce the new tvb we pass in.
MPLS needs to similarly shrink its own tvb so its caller can tell that
there were bytes left over (e.g. ethernet trailer).

svn path=/trunk/; revision=48994
2013-04-23 02:55:44 +00:00
Jörg Mayer 048b751c21 tiny whitespace change
svn path=/trunk/; revision=48993
2013-04-22 23:04:22 +00:00
Jörg Mayer 4f8cb5fdc3 Mimic autoconf behavior and enable -Wc++-compat by default.
svn path=/trunk/; revision=48992
2013-04-22 22:32:03 +00:00
Evan Huus 2a50c31800 Add a section to the wmem README about testing.
svn path=/trunk/; revision=48990
2013-04-22 21:29:57 +00:00
Alexis La Goutte 63f51ce4e6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48989
2013-04-22 21:26:24 +00:00
Alexis La Goutte 3f5c5aad62 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48988
2013-04-22 21:26:09 +00:00
Alexis La Goutte 76ef1e0acc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48987
2013-04-22 21:25:59 +00:00
Alexis La Goutte 13d677e8be Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48986
2013-04-22 21:25:50 +00:00
Alexis La Goutte 9d6a6d7bbd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48985
2013-04-22 21:25:39 +00:00