Commit Graph

129 Commits

Author SHA1 Message Date
Gerald Combs 3f08a85819 1.99.1 → 1.99.2.
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
Reviewed-on: https://code.wireshark.org/review/5705
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 19:17:18 +00:00
Michael Mann a971768530 Refactor "color" conversation filters
Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list.  GUI actually using API will come in a separate commit.

Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a
Reviewed-on: https://code.wireshark.org/review/5658
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 09:04:00 +00:00
Balint Reczey 8a446e9b7a Add missing build-dependencies for the Debian package
They are libparse-yapp-perl and libsbc-dev.

Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69
Reviewed-on: https://code.wireshark.org/review/5322
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-12-08 23:21:32 +00:00
Michael Mann e172ebb3b4 Add proto_tree_add_bitmask_with_flags.
It's proto_tree_add_bitmask with the ability to control the data appended to header.

Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
Reviewed-on: https://code.wireshark.org/review/5533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:13:02 +00:00
Alexis La Goutte 58b7277cb4 802.11: Add ieee80211_supported_rates_vals_ext to be exported
It will be reused by CAPWAP dissector (* Rates Message Element)

Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
Reviewed-on: https://code.wireshark.org/review/5640
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:48:53 +00:00
Guy Harris 090a0466b5 Update to reflect current reality.
Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846
Reviewed-on: https://code.wireshark.org/review/5538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-30 00:57:48 +00:00
Maarten Bezemer 159626c282 Update debian symbols
* register_tap_ui is removed in a21436eaed
 * wtap_read_bytes(_or_eof) are introduced in 670ebda4a6

Change-Id: If815c686d57310f0d87f965b5b5c2a71b651cbad
Reviewed-on: https://code.wireshark.org/review/5465
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-25 02:31:19 +00:00
Guy Harris e908804776 Update symbol list.
Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196
Reviewed-on: https://code.wireshark.org/review/5444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 20:20:39 +00:00
Guy Harris 355458061a It's not missing, it's passed on.
Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
Reviewed-on: https://code.wireshark.org/review/5314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:29:31 +00:00
Guy Harris 1b4d51e9a7 Update Debian symbol files.
Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
Reviewed-on: https://code.wireshark.org/review/5310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:25:20 +00:00
Stig Bjørlykke ea167053ff Improved deregistering fields.
This improvement avoids use of deallocated memory (crash) if using a
deregistered field in display filter, color filter, custom column and
other cases when the field is used as "interesting field".

This functionality is currently used in http, imf and ldap preferences.

Also removed unused proto_registrar_n() as this does not work correctly
after deregistering fields.

Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
Reviewed-on: https://code.wireshark.org/review/5161
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 08:01:12 +00:00
Balint Reczey 250c1ecb35 Fix typo: Intrustion -> Intrusion
Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a
Reviewed-on: https://code.wireshark.org/review/5082
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-02 19:36:37 +00:00
Michael Mann 47ff5bb1e3 Sync debian symbol files to current API.
Change-Id: I64b18ac20401f93b6162ecc7ec4935f8b78508f7
Reviewed-on: https://code.wireshark.org/review/5009
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-31 05:23:09 +00:00
Michael Mann f5ed47dbbc Eliminate proto_tree_add_text from packet-q933.c
Change-Id: If5b85609d3daaf66cbcc15e3127af4e7f5736e52
Reviewed-on: https://code.wireshark.org/review/4995
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 20:53:52 +00:00
Guy Harris a307ed66cc Robopatch and remove #MISSING comments.
Change-Id: I611882a8b268046665488381be64aca89cdf3194
Reviewed-on: https://code.wireshark.org/review/4563
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:54:40 +00:00
Gerald Combs d98debe6d0 1.99.0 → 1.99.1.
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 19:41:19 +00:00
Evan Huus 26e72012f6 Update debian symbol files to satisfy the buildbot
Why is this necessary again?

Change-Id: Idf8981a00636b16ac06b5af5962131d29d88dfad
Reviewed-on: https://code.wireshark.org/review/4360
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 02:08:10 +00:00
Guy Harris 99f5c507d2 The Ubuntu build says to do this, so I'll believe it so it stops failing.
We get rid of the exports file with ws_symbol_export.h, and then we
bring it back with this.

Change-Id: Ic689d20ec8ca5806677e1b52018c8c79b381508f
Reviewed-on: https://code.wireshark.org/review/4335
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 19:40:04 +00:00
Gerald Combs b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Gerald Combs d31011572d Convert admon graphics to SVG.
Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.

Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.

Try to update Debian rules to reflect ga92c3fb.

Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 02:56:35 +00:00
Guy Harris bb15274a4a Update symbol lists.
Change-Id: I55ce6396b943ce9376649a9a8973a6e1cadcced7
Reviewed-on: https://code.wireshark.org/review/3518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-09 01:16:00 +00:00
Guy Harris b273563aa5 Fix Debian package build complaints.
Apply the patches printed out when the Debian package build complains,
and then remove the #MISSING indications that correspond to routines we
don't export outside the library (either because we don't declare them
as exported outside the library, because they've been removed, or
because they've been moved to another library).

Change-Id: Iba2d5c5436dabd31d7f84fd400bb78afcb5ee69f
Reviewed-on: https://code.wireshark.org/review/3367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 21:18:02 +00:00
Guy Harris 7f937c9bf7 Add tvb_ensure_bytes_exist64 to the API list.
I thought ws_symbol_export.h was supposed to eliminate API list files.
Apparently it didn't, so we have to update this file every time we add a
new API.

Change-Id: I93dda6ccc992c79d52d2b460e818995e6332f1be
Reviewed-on: https://code.wireshark.org/review/3363
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 18:55:30 +00:00
Guy Harris 2dad30897b Reflect the move of the buffer_ routines to libwsutil.
We went with the whole WS_DLL_EXPORT thing so that we don't *have* to
maintain lists of exported symbols; is there truly no way to automate
the generation of *these* files?

Change-Id: I77f240c77782ed634e4620833f951c4a02fb4390
Reviewed-on: https://code.wireshark.org/review/3083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-16 03:41:29 +00:00
Guy Harris 1c297771c3 Rename and move ui/stat_menu.h to epan/stat_groups.h.
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-03 20:30:42 +00:00
Guy Harris 7dd27dbff8 stat_menu.h moved to libui.
Change-Id: I09227699afa8306d4a699dad5e12efc11f6597ea
Reviewed-on: https://code.wireshark.org/review/2827
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03 19:19:45 +00:00
Jakub Zawadzki 852d5dac9c Remove executable bit, from not executable files.
Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06
Reviewed-on: https://code.wireshark.org/review/2757
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-01 20:37:09 +00:00
Guy Harris e9424fa107 One more change to dissector_add_for_decode_as.
Change-Id: Icd272fc9ae749728a601966de573843390e278ab
Reviewed-on: https://code.wireshark.org/review/2484
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20 16:48:39 +00:00
Balint Reczey 237669a35d Update debian/symbols for the changed library ABIs
Change-Id: I942a92569472e3cecfaee004778561986aee3e69
Reviewed-on: https://code.wireshark.org/review/2357
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 03:58:30 +00:00
Balint Reczey 14903d65c3 Depend on docbook-xml and drop obsoleted 0005-...patch
Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c
Reviewed-on: https://code.wireshark.org/review/2137
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-15 16:33:08 +00:00
Balint Reczey 7de3d23229 Fix Wireshark's name in Vietnamese translation
Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043
Reviewed-on: https://code.wireshark.org/review/2043
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-08 19:19:48 +00:00
Evan Huus 4f6e021646 Add GPLv2+ license header to headers-check.c as per private email from the
author.

svn path=/trunk/; revision=54384

Change-Id: I464197c19316700457a5575b370600db38ce4962
Reviewed-on: https://code.wireshark.org/review/2041
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 17:51:58 +00:00
Balint Reczey cb4ec166d8 .deb package format is 'native'
Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf
Reviewed-on: https://code.wireshark.org/review/2001
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:29 +00:00
Balint Reczey 6d783f228c Don't ship libfiletap in the .deb packages yet
Change-Id: I5b179d2b84bc95e540def544a8b710f81fb0fccb
Reviewed-on: https://code.wireshark.org/review/2000
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:05 +00:00
Balint Reczey 97e1491aa8 Sync .deb packaging from Debian
The sync makes CMake the build system for the .deb package
and starts providing wireshark-qt in the wireshark-qt package.
The package structure, i.e. the libraries are shipped in separate
packages is also sync-ed.

Wireshark-qt uses the Qt 4 libraries, but it is easy to switch
it to Qt 5.

Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2
Reviewed-on: https://code.wireshark.org/review/1986
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:32:10 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0.
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-23 20:57:42 +00:00
Gerald Combs d73d1f14b3 1.11.3 → 1.11.4.
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 17:29:19 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Guy Harris 0cde948e34 Add libfiletap.
svn path=/trunk/; revision=54673
2014-01-08 21:27:44 +00:00
Guy Harris be9d2e6f3b Add libfiletap.
Add libwsutil to wireshark-dev.files - I'm not sure it's necessary, but
code added to Wireshark has to be able to call routines from libwsutil.

svn path=/trunk/; revision=54655
2014-01-08 10:34:00 +00:00
Evan Huus 00048cf418 Add GPLv2+ license header to headers-check.c as per private email from the
author.

svn path=/trunk/; revision=54384
2013-12-23 15:19:25 +00:00
Gerald Combs 16e27047d0 1.11.2 → 1.11.3.
svn path=/trunk/; revision=53412
2013-11-18 17:41:00 +00:00
Gerald Combs f772a268db 1.11.1 → 1.11.2.
svn path=/trunk/; revision=53346
2013-11-15 22:34:31 +00:00
Balint Reczey 02a8e72b43 Generate wsicon32.xpm during building Debian package
svn path=/trunk/; revision=52773
2013-10-22 22:33:05 +00:00
Pascal Quantin 7c2219f301 1.11.0 -> 1.11.1
svn path=/trunk/; revision=52647
2013-10-16 17:32:45 +00:00
Evan Huus e7a0c26bec Subsume README.binarytrees into wmem doxygen. The README was out of date
anyways, since Michael made key operations non-destructive in r44380.

svn path=/trunk/; revision=52583
2013-10-13 13:13:24 +00:00
Balint Reczey 8ec086a613 Use wildcards for referring to library files in debian/wireshark-common.files
This makes updating debian/wireshark-common.files obsolete when bumping
library versions.

svn path=/trunk/; revision=51016
2013-07-29 17:27:16 +00:00
Balint Reczey 928080f536 Make Debian package build depend on xdg-utils to let configure detect xdg-open
svn path=/trunk/; revision=50614
2013-07-15 17:53:24 +00:00
Jeff Morriss 891854ca7a As suggest by Balint:
Remove the 03-preferences patch: there's an ongoing discussion over at Debian
about using xdg-open to open URLs[1] (instead of sensible-browser as this
patch was doing) and anyway xdg-open behaves better for Balint.

Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested
by Balint).

Both changes are untested.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436

svn path=/trunk/; revision=50611
2013-07-15 14:31:35 +00:00
Jeff Morriss 3c76662814 Try 2 at fixing the Debian package.
svn path=/trunk/; revision=50601
2013-07-15 03:19:32 +00:00