aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-07-04Reflect the rename of get_XXX_pcap_version() to get_XXX_caplibs_version().Guy Harris1-4/+4
Change-Id: I55108e39d9d5a3fc5e1e3e0ec0040c08c92cc576 Reviewed-on: https://code.wireshark.org/review/2844 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Fix the no-libpcap build.Guy Harris1-3/+1
Change-Id: I2443ab22d423508641ac199262238e5fbafc95df Reviewed-on: https://code.wireshark.org/review/2843 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04wmemify some nfs functions, fixing much leaked memoryEvan Huus2-63/+45
Bug: 10257 Change-Id: Ia36c03b2be727a37f91eca38af4faf48d1d65436 Reviewed-on: https://code.wireshark.org/review/2840 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-04capture_ifinfo.h moved to caputils.Guy Harris1-1/+1
Change-Id: Id313fa6d0510ece7d13c6ffe941374ba0873e574 Reviewed-on: https://code.wireshark.org/review/2842 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris55-291/+538
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Remove accidental trailing \Evan Huus1-1/+1
Change-Id: I84e6aa71e31528b2949e68f0f07778fb9e26379e Reviewed-on: https://code.wireshark.org/review/2839 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Sort by name list of fileAlexis La Goutte1-15/+16
fix also indent (use spaces) Change-Id: I06234936c3128f7aa21a345415d7e420135dd601 Reviewed-on: https://code.wireshark.org/review/2824 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Fix infinite loop in RTCP dissectorEvan Huus1-0/+3
Bug: 10248 Change-Id: I630bc1ab2520c2861b817ba5813f5f7680e96056 Reviewed-on: https://code.wireshark.org/review/2820 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Add Bus ID to USB Address ColumnSean O. Stalley4-8/+21
USB Addresses are now in the format of: bus_id.device_address.endpoint This makes it much easier to read traces that captured traffic on more than one bus. Change-Id: I264db2ceea712d94632d5d08d05d3af22a4a03fe Reviewed-on: https://code.wireshark.org/review/2833 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04(trivial) moved 'is request' comment in dissect_usb_common()Sean O. Stalley1-1/+2
Change-Id: I759f64920284a35ea55bc68624570def51dfd72a Reviewed-on: https://code.wireshark.org/review/2832 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-03packet-vnc.c: Fix a bug in displaying a set of FT_BOOLEAN bit fields (found ↵Bill Meier1-4/+4
by checkAPIs). Change-Id: Ie5252d20db5826f3e48aba11da1bf85d00630db2 Reviewed-on: https://code.wireshark.org/review/2838 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-03packet-vnc.c: Restore tvb_get_string() --> tvb_get_string_enc() changes lost ↵Bill Meier1-6/+6
in gdf6bdcc These changes were originally done in g971ffd6 Change-Id: I9de28ba7089f99e8058207f3b6d34de931decf76 Reviewed-on: https://code.wireshark.org/review/2835 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-03packet-vnc.c: Improve dissectionBill Meier1-54/+266
- Properly dissect multiple VNC PDUs in one (or more) TCP segment(s). - Dissect additional message types ('Fence' and 'Enable Continuous Updates'). - Handle "num_rects" field = 0xFFFF (TightVNC). - Add some more info as to sources of information about the VNC protocol. - Add an XXX note as to the (incorrect) reassembly method being used. - Add some notes as to possible ToDo's. Change-Id: Id4942c50b3d1373bd2e72c0131614835dc39ba90 Reviewed-on: https://code.wireshark.org/review/2834 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-03Manually revert "Make COMPUTE_OFFSET and COMPUTE_OFFSET_AND_REMAINING macros."Jakub Zawadzki1-85/+79
This reverts commit b136182ad41b0552421992f36f3b70fa497fd658 This function are already marked inline, and profiler don't show much difference in performance, revert as previous version is cleaner. Change-Id: I1ac2c30a91b46278730ceee127efa086c7fbc6d6 Reviewed-on: https://code.wireshark.org/review/2828 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03Sometimes Git can be a real pain.Guy Harris1-0/+76
Change-Id: Ib93575d9977162b468f171038915c1eb8a612660 Reviewed-on: https://code.wireshark.org/review/2831 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Rename and move ui/stat_menu.h to epan/stat_groups.h.Guy Harris94-171/+95
The groups are, technically, independent of the notion of a menu, and, if we have mechanisms by which taps that are not only GUI toolkit-independent but independent of the *existence* of a GUI can be registered, they might want to register themselves in a group just in case they're running in a program that has a GUI. Also, this might fix the Debian package build. Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172 Reviewed-on: https://code.wireshark.org/review/2830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03stat_menu.h moved to libui.Guy Harris1-1/+1
Change-Id: I09227699afa8306d4a699dad5e12efc11f6597ea Reviewed-on: https://code.wireshark.org/review/2827 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make wsutil depend on gitversion.Guy Harris3-14/+2
wsutil contains the only code that uses version.h; make the dependency explicit, to see whether that fixes the current build issues with Debian packaging. Also, get rid of all *other* dependencies on gitversion. Change-Id: I89fa5e4112633b83a1a7dfa349bc337e3688575f Reviewed-on: https://code.wireshark.org/review/2823 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Include <sys/capaibility.h> to get _LINUX_CAPABILITY_VERSION defined.Guy Harris4-4/+12
It's no longer used in version_info.c, but is used in the main source files of TShark and Wireshark (it's already included in dumpcap). Change-Id: I2169a2bbed678baf26fc8711d7c13d95cce3ee2a Reviewed-on: https://code.wireshark.org/review/2819 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Move the GLib version info string stuff to get_glib_version_info().Guy Harris5-9/+90
Change-Id: I1013ad9a0a98bcbf07fe597f9e932f2ea1a5cd28 Reviewed-on: https://code.wireshark.org/review/2818 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Fix bulding of reordercapAndersBroman1-2/+3
Change-Id: I9898685d20c684c05f505275804d9c6588bba645 Reviewed-on: https://code.wireshark.org/review/2811 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03catapult,irda: Fix ASAN crashes due to buffer underrunPeter Wu2-5/+5
The catapult dissector tripped on this random file I had. A quick look at other dissectors which use a construct like "-1] *= '*\\[rn]" showed packet-irda too, so fix that as well. Change-Id: I4b5fadcacd0b09d0fb29bdefc3dd1f28aef9b593 Reviewed-on: https://code.wireshark.org/review/2802 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-03Fix type-o left over from cut-and-pasteYan Burman1-1/+1
Change-Id: I80b24cd8b75999454c1767bd3044ecc569f57d98 Signed-off-by: Yan Burman <yanb@mellanox.com> Reviewed-on: https://code.wireshark.org/review/2805 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03Try to fix the build by adding version_info.obj to the link stage ofAndersBroman1-3/+3
text2pcap and in both lines for mergecap. Follow up of https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd Change-Id: I4b44965604eec92415b8bb6e9267dadbb2937f7a Reviewed-on: https://code.wireshark.org/review/2807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03Needs wsutil/wsgetopt.h if the platform doesn't have getopt_long().Guy Harris1-0/+4
This includes Windows (which doesn't even have getopt()). Change-Id: I01a3a9a00014176875ddad6760c387bf7aa9de84 Reviewed-on: https://code.wireshark.org/review/2804 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03We have to include version_info.obj manually in the dependencies for text2pcap.Guy Harris1-1/+5
Add a comment indicating why we're not generating text2pcap_OBJECTS from text2pcap_SOURCES and using that. Change-Id: I8235080c3ea2bb31861a9c4f5aee9e6ce6a0808c Reviewed-on: https://code.wireshark.org/review/2801 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Include "capture-pcap-util.h" even if we don't have libpcap.Guy Harris4-4/+8
The routines to get libpcap version information just say "no pcap here" if we don't have it, so they're called regardless of whether we were compiled with it. Change-Id: I4e58cce83f7c0e36aa6ef9b40ec7075732402f3b Reviewed-on: https://code.wireshark.org/review/2800 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Add --help and --version support.Guy Harris3-13/+112
Make the output for them resemble the output for other programs. Change-Id: I45dbee32ad403b8fedc2350ac9096ac1a5820cbe Reviewed-on: https://code.wireshark.org/review/2799 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Get rid of soft-deprecated API:sAndersBroman1-11/+11
Change-Id: Ieb4a3f07a7831c141ba8ce9c075e72091ef909be Reviewed-on: https://code.wireshark.org/review/2798 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03Clean up printf() argument list.Guy Harris1-2/+4
Splitting %s from \n makes it clearer that the %s's in question take arguments that already include a newline, and that the subsequent \n adds a blank line. Change-Id: I5bac8ca80b42f7de980ad29480042cae3166ff7e Reviewed-on: https://code.wireshark.org/review/2797 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Get rid of an extra blank line.Guy Harris1-1/+0
Change-Id: I321ef1404e37ebb13a456d18eeb81285b7ba477f Reviewed-on: https://code.wireshark.org/review/2796 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Use get_*_int() from wsutil, rather than defining our own.Guy Harris1-39/+25
Change-Id: I4811d87a903cc3cea93e12883edf25bcd1271a53 Reviewed-on: https://code.wireshark.org/review/2795 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make --help and --version information a bit more uniform.Guy Harris14-242/+715
Have --version print the version number, the copyright information, the "compiled with" information, the "running on/with" information, and the compiler information. Have --help print the version number, a one-line summary of what the program does, a reference to http://www.wireshark.org for more information, a Usage: line, and a list of command-line options. This means programs doing that don't need to include version.h; that's left up to get_ws_vcs_version_info() to do. Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb Reviewed-on: https://code.wireshark.org/review/2794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Revert to 3ms if we don't have the handshakeEvan Huus1-1/+1
Change-Id: I96b23677f3050e9c62edd49f26d50d8b4addcf58 Reviewed-on: https://code.wireshark.org/review/2784 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03GTP: add dissection of Extended End User AddressPascal Quantin1-1/+27
Bug: 10251 Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 Reviewed-on: https://code.wireshark.org/review/2783 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03More getopt_long(), for --help and --version.Guy Harris1-1/+6
Change-Id: Ia02d7b1fbeaa8e581e85ad8b87afabd576515434 Reviewed-on: https://code.wireshark.org/review/2792 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03More getopt_long, to add --help and --version support.Guy Harris5-5/+50
Change-Id: I946067b972a70154f02ab561bc0fd029a7a5abc4 Reviewed-on: https://code.wireshark.org/review/2791 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Add long-option support.Guy Harris1-1/+10
That way, --help and --version, as well as -h and -v, work. Change-Id: I095e0dcef9f6181d6fbe6337f9f33e80bc44f11a Reviewed-on: https://code.wireshark.org/review/2790 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Regularize the help output of programs.Guy Harris6-82/+40
Only print to the standard output, and only give the version information, if a "print help" command-line option is specified. Otherwise, leave out the version information, and print to the standard error. Leave out the copyright information; it's extra cruft, and http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html doesn't say anything about it (and bash, at least, doesn't print it). Change-Id: Ic5029ccf96e096453f3bd38383cc2dd355542e8a Reviewed-on: https://code.wireshark.org/review/2789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Regularize the first line of version output.Guy Harris6-21/+21
For Wireshark, say "Wireshark", not "wireshark". For other programs, put "(Wireshark)" after the program name, as per http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html ("If the program is a subsidiary part of a larger package, mention the package name in parentheses, like this"). Change-Id: I68558f64cfa6ee4423e42f3d6b120633ef1b2716 Reviewed-on: https://code.wireshark.org/review/2788 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Add license information to the copyright information.Guy Harris1-0/+1
See http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html Change-Id: I19c1cf560a1bb7ed7d7312bea727550977d66120 Reviewed-on: https://code.wireshark.org/review/2787 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-02Manage InterfacesIrene Ruengeler16-15/+1009
- Add dialog to manage interfaces - Add and delete pipes - Hide local interfaces Change-Id: I08323c306c2ea736f99e57c28e2fe3170a0c2216 Reviewed-on: https://code.wireshark.org/review/2613 Tested-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-07-02Fail if any of the install-exec-hook commands fails.Guy Harris1-5/+5
Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap installation as themselves rather than as root will not "succeed" but leave dumpcap installed without enhanced privileges, so the underlying problem in bugs such as bug 10247 will be more obvious. Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b Reviewed-on: https://code.wireshark.org/review/2781 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-02NDPS dissector is the poster child for proto_tree_add_subtree[_format].Michael Mann1-831/+558
NDPS dissector is also the poster child for not being considered "that naughty" by checkAPIs because most of its proto_tree_add_text calls don't have printf-style arguments (which is what checkAPIs really keys off of) Fixed both cases and removed about 370 proto_tree_add_text calls from the dissector. Change-Id: I721678c39d4a0544e5e7212e622c0c2eebfd04f7 Reviewed-on: https://code.wireshark.org/review/2775 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-02kafka: fully dissect offset request/response messagesEvan Huus1-0/+120
Change-Id: I641a3dbece6f822144f6740dde6801b1be202db5 Reviewed-on: https://code.wireshark.org/review/2777 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-02Make the flag testing logic for linker flags work like the compiler flag ↵Joerg Mayer1-1/+1
testing. Change-Id: I2478417cbcd395247215f149978c5f0c874c9b3a Reviewed-on: https://code.wireshark.org/review/2779 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-02Allow overriding C/C++ flags from CMake command lineBalint Reczey1-2/+6
Append user's flags to our flags instead of prepending them to make user flags higher priority. Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2 Reviewed-on: https://code.wireshark.org/review/2722 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-02RSVP checksum is not required if integrity object is presentEvan Huus1-22/+24
Bug: 10219 Change-Id: I2da62ee184327b2bc42a264e1782db927460f5cf Reviewed-on: https://code.wireshark.org/review/2773 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02Update WSDG win32/win64 quick start guide to include dependencies andTim Furlong1-6/+56
instructions for building QtShark; note alternate cygwin package for 'patch' utility; update example setup script to add Qt bin directory to PATH, and extract out paths as variables. Change-Id: Id404b8757dbfd0dc1119b89e01bbe2fa139e2b38 Reviewed-on: https://code.wireshark.org/review/2751 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02Optimize sip dissector: avoid calling tvb_get_string_enc()Jakub Zawadzki1-56/+90
Fetch header value, only when we need to parse it. Change-Id: I3c170ef8ab03985c8111a1b84ac1afc87bc8b5ca Reviewed-on: https://code.wireshark.org/review/2767 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 02:00:26 +0000