aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-07-01Drop privileges even earlier.Guy Harris2-47/+47
Do it at the same point at which Wireshark does so. Do some other things in the same order as well. Change-Id: I2925366d49d14271ceffa1a938b5e3450337c772 Reviewed-on: https://code.wireshark.org/review/2743 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Add a comment that appears in other programs.Guy Harris2-0/+2
Change-Id: Ife885779d339fbb706c9d6cfd931833afba25277 Reviewed-on: https://code.wireshark.org/review/2742 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Squelch some warnings.Guy Harris2-5/+5
Make some arguments and structure members gsize, as that's what stored into them or passed to them. (And move a newly-widened-on-LP64 item, to avoid extra structure padding.) Add a cast, which also appears necessary to squelch a warning. Clean up indentation while we're at it. Change-Id: I0cc92e7d2904c5af1f3f3d93f51b6ecb3aed464d Reviewed-on: https://code.wireshark.org/review/2741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Increase space allocated for IO Graph slower after 1 million itemsBalint Reczey1-1/+3
Change-Id: I691070b572e519f412a80db5d7415331f07e8e50 Reviewed-on: https://code.wireshark.org/review/2689 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-07-01GTK: Unlimited, dynamically allocated IO GraphBalint Reczey1-58/+44
Bug: 8460 Change-Id: Id9aad3f5f69bee9e5a62601ecac28a6a7019e623 Reviewed-on: https://code.wireshark.org/review/2672 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-07-01Generate version.h before adding subdirs (especially wsutil). OtherwiseJoerg Mayer1-19/+19
build could fail in wsutil because of missing version.h Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8 Reviewed-on: https://code.wireshark.org/review/2740 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-01Optimize epan_new/init_dissectionEvan Huus3-43/+41
As Anders correctly pointed out in I7d8f84b2e, constantly resetting state will turn init_dissection into a bit of a hot path. Especially as we will already bear the overhead of switching files, we don't want to fall any further behind than we have to. This change includes three unrelated optimizations that reduce the cost of init_dissection by about 40% as measured by callgrind: - only initialize ares/ADNS if that preference is enabled (this of course only applies if you specify -n to tshark or otherwise disable the preference) - use memcpy instead of a loop in sigcomp UDVM init - use memcpy instead of a loop in bootp dissector The only remaining obvious hot spot in this path is reassembly_table_init since it is called by so many dissectors. Suggestions (perhaps to get rid of the GPtrArray) welcome. Oh, and one other change to use g_strerror instead of strerror as insisted upon by the API pre-commit hook. Change-Id: I18a74f2b64b25498116079bd4e7fc2b335c7703a Reviewed-on: https://code.wireshark.org/review/2738 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01sip optimization: avoid calling tvb_get_guint8.Jakub Zawadzki1-56/+83
Use tvb_pbrk_guint8, tvb_find_guint8 when possible. Change-Id: If8090d9b9b92146e9c216f139c056130d6b04e78 Reviewed-on: https://code.wireshark.org/review/2569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Put each option on a line of its own.Joerg Mayer1-1/+2
Change-Id: Ibec60300306e8af7ee230080b113111f93d850dc Reviewed-on: https://code.wireshark.org/review/2739 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-01Init session id to avoid warning using GCC 4.9Balint Reczey1-0/+1
Change-Id: I2091f7eb86c64fd086f44a7cf15e7c5483f9b44c Reviewed-on: https://code.wireshark.org/review/2716 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-01Fix access to uninitialised valueBalint Reczey1-1/+1
Change-Id: I4c8a15fce631051edd39e7d29c8f0a5e00fcde26 Reviewed-on: https://code.wireshark.org/review/2724 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-01Fix access to uninitialised valuesBalint Reczey1-0/+2
Change-Id: Id3592fed0cca5133d493f26d3b8ce27a3cf8505c Reviewed-on: https://code.wireshark.org/review/2723 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30Reflect the move of filters.c to libui.Guy Harris2-1/+1
Change-Id: Ic1099927e3fb63c020c622e0a92e99a376908f4e Reviewed-on: https://code.wireshark.org/review/2737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Drop privileges very early on.Guy Harris2-43/+10
TShark relies on dumpcap to capture packets, and TFShark doesn't even do packet capturing (it dissects files, not network traffic), so neither of them need, or should run with, special privileges. If you *must* run with special privileges in order to capture, grant those privileges to dumpcap, which has a *lot* fewer lines of code than libwireshark and TShark/TFShark. Change-Id: I8f8fedead355ca163895e025df37240d2f232ba4 Reviewed-on: https://code.wireshark.org/review/2736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Clean up a comment.Guy Harris1-1/+1
SetProcessDEPPolicy() is the API; PSetProcessDEPPolicy is just a local pointer variable that either points to that API's implementation (if it's available) or is null (if it isn't). Change-Id: I676fbb75019e32af511cefa6f1c7b7124ac9d8e8 Reviewed-on: https://code.wireshark.org/review/2735 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Do startup things in an order more like that of gtkshark.Guy Harris1-47/+48
Get credential information and drop privileges *very* early on. Get the pathname of the executable right after that, then initialize the 802.11 decryption, then, on Windows, load WinPcap and, if available, AirPcap. *Then* we can get the version information and set the crash information. We should drop privileges as early as possible. We have to load WinPcap and AirPcap before getting the run-time information, as the run-time information includes the *pcap versions. Change-Id: Ib40e5a848cc7f42fcb424faa15a91868eaa0b9a4 Reviewed-on: https://code.wireshark.org/review/2733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Always set the crash information.Guy Harris1-1/+1
There's no reason to do it only on Windows - and, in fact, the only platform where we currently do anything with the information is OS X. Every other program in the Wireshark suite that does it at all does it on all platforms. Change-Id: I8ab29fd86656dd44322991d0d7263c6bb4fcd425 Reviewed-on: https://code.wireshark.org/review/2730 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Add echld_test to the list of files we ignore (built with --enable-echld).Guy Harris1-0/+1
Change-Id: Idca036db408e4caf6c84a67b4c36145568921ca5 Reviewed-on: https://code.wireshark.org/review/2729 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Get rid of trailing blank line.Guy Harris1-1/+0
Change-Id: Id7d134b1d217ef319e3162ae007432fdbe87d0c1 Reviewed-on: https://code.wireshark.org/review/2728 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move filters.[ch] to libui.Guy Harris8-13/+11
Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f Reviewed-on: https://code.wireshark.org/review/2727 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move stat_menu.h to libui.Guy Harris93-93/+93
Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d Reviewed-on: https://code.wireshark.org/review/2726 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Warn about unencrypted HTTP traffic over port 443Evan Huus2-9/+36
At the suggestion of Toralf Förster. This includes an expert info, as well as making SSL a new-style dissector and rejecting traffic that looks like unencrypted text. Change-Id: Ib09ea0d97952330f092590ff3fc6488807cdbb81 Reviewed-on: https://code.wireshark.org/review/2693 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30Move proto_hier_stats.[ch] to libui.Guy Harris8-10/+9
Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8 Reviewed-on: https://code.wireshark.org/review/2725 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30From Johan Whahl:AndersBroman1-0/+49
Added dissection of the SIP Service-Route header. Change-Id: Ic4523edb374ae03492af5853863dde501a0c30e0 Reviewed-on: https://code.wireshark.org/review/2721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-30Fix the display of AVP:s that are not fully dissectedAndersBroman1-15/+16
fixes Bug #10237 Change-Id: I3c38bb4af4440f1e5087f21ef022bf2cd3a66002 Reviewed-on: https://code.wireshark.org/review/2720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-30Logcat: Remove commented codeMichal Labedzki1-8/+3
"g_strlcpy" guarante that "dest" to be null-terminated. Also cosmetic change from file_subtype to encap. Change-Id: If188a08cf34dd9def4203404962571c273740636 Reviewed-on: https://code.wireshark.org/review/2718 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-30Bluetooth: Add missing connection_handleMichal Labedzki1-0/+1
This initialize previously uninitialized variable (and nice fixing everything) Change-Id: I943102510fc45735f40db7899884d2c0fe6ffb40 Reviewed-on: https://code.wireshark.org/review/2717 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-30Fix Bug #10238: Display filter expression dialog items do not expand/display ↵Bill Meier1-3/+10
properly. Unfortunately, certain proto_hier_tree_model.c functions assume/require that a cookie generated by proto_(first|next)_protocol_field() will never have a NULL value. Bug introduced in gd47ae54. Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9 Reviewed-on: https://code.wireshark.org/review/2712 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30Get rid of another unused routine.Guy Harris1-20/+0
Change-Id: I58943faaf6e77023ab1fb7bd7a22324a713659da Reviewed-on: https://code.wireshark.org/review/2714 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Get rid of unused routine.Guy Harris1-33/+0
Change-Id: Iaf12ba7f13804a6d351ea85c0daa52d4489e8c57 Reviewed-on: https://code.wireshark.org/review/2713 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture.[ch] to libui.Guy Harris24-22/+21
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Make a routine unused outside capture_ui_utils.c static.Guy Harris2-10/+1
Change-Id: I63f1e5fb119a44edf4ee489683e79cb39a746c08 Reviewed-on: https://code.wireshark.org/review/2710 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Windows: fix update of version information in wireshark and tsharkPascal Quantin2-1/+7
Broken since gc46329c Change-Id: I00146675d16db021e2cbb7b16841ea9ecb1439b9 Reviewed-on: https://code.wireshark.org/review/2703 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-30Move capture_session.h to capchild; what it declares is defined there.Guy Harris16-27/+17
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002 Reviewed-on: https://code.wireshark.org/review/2709 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_ui_utils.[ch] to libui.Guy Harris27-29/+39
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30clopts_common.c is now part of wsutil.Guy Harris1-1/+0
Change-Id: I474443567e83cab83e4859a4d89a19a8904e08f8 Reviewed-on: https://code.wireshark.org/review/2707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29clopts_common.c is now part of wsutil.Guy Harris1-1/+0
Change-Id: I0fa773bfc6364689d6e4f97ee89a6508622d2b2a Reviewed-on: https://code.wireshark.org/review/2706 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29Put in missing forward declaration.Guy Harris1-0/+1
Change-Id: I734b07beaecf0c180f4423a6e59c8040207e0c31 Reviewed-on: https://code.wireshark.org/review/2705 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29Move some more stuff into wsutil.Guy Harris15-131/+166
Move the routines to parse numerical command-line arguments there. Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just call routines specified by a call to cmdarg_err_init(), and have programs supply the appropriate routines to it. Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01 Reviewed-on: https://code.wireshark.org/review/2704 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29proto_tree_add_subtree[_format]Michael Mann18-625/+367
Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0 Reviewed-on: https://code.wireshark.org/review/2702 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS ↵Pascal Quantin2-29/+79
dissector Bug: 10234 Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4 Reviewed-on: https://code.wireshark.org/review/2695 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-29Fix compile error when building w/o GNUTLSBill Meier1-1/+1
Specifically: <wsutil/file_util.h> is aleays needed (for create_app_running_mutex()) Change-Id: I78e5a767f62bc2af67b6407539742dc245259f56 Reviewed-on: https://code.wireshark.org/review/2699 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-29[Automatic manuf, services and enterprise-numbers update for 2014-06-29]Gerald Combs5-22/+254
Change-Id: Ife61b2e2c53f1faba34940035ac84a2b5ced3b71 Reviewed-on: https://code.wireshark.org/review/2696 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-29proto_tree_add_subtree[_format]Michael Mann40-825/+505
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29convert to proto_tree_add_subtree[_format]Michael Mann23-1130/+812
Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29Standardize the names of, and document, the taps and heuristic dissector ↵David Ameiss7-17/+28
tables made avaialble by these dissectors. Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93 Reviewed-on: https://code.wireshark.org/review/2688 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28Fix missing g_list_next() with GLib < 2.32Balint Reczey1-0/+1
Change-Id: I825e74de378acc9d35e4b620a3eeb4807fe7accd Reviewed-on: https://code.wireshark.org/review/2690 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-28Remove unused variables post commit 7bf6862ecf0d0a508bf097f3b52d07bd19128272Graham Bloice2-5/+0
Change-Id: Id583ab1742241deb9325dcb1dbba8a8cb3df3b90 Reviewed-on: https://code.wireshark.org/review/2691 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-28convert to proto_tree_add_subtree[_format]Michael Mann26-399/+223
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b Reviewed-on: https://code.wireshark.org/review/2676 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28Fix several GTK warnings in Windows.Irene Ruengeler2-32/+24
Change-Id: I300137319129c3e188884e1240c025d92e34e410 Reviewed-on: https://code.wireshark.org/review/2687 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>