aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2014-12-21Replace ether_to_str with either address_to_str or tvb_ether_to_str.Michael Mann1-1/+0
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 Reviewed-on: https://code.wireshark.org/review/5933 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-19Use new color_dissector_filters.[ch] to refactor (color) conversation ↵Michael Mann1-0/+1
generation in GTK menus. Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf Reviewed-on: https://code.wireshark.org/review/5828 Reviewed-by: Michael Mann <mmann78@netscape.net> 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-12-18Use LocatePythonModule to find make-dissector-reg.py in order to make ↵Maarten Bezemer2-2/+4
UseMakeDissectorReg.cmake more generally (out-of-source) usable. Add make-dissector-reg.py to the Debian packages. Making it possible to generate out-of-source wireshark plugins. Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 Reviewed-on: https://code.wireshark.org/review/5802 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Resync Debian symbolsMaarten Bezemer2-1/+8
Fix wrong symbol for proto_tree_add_bitmask_with_flags Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e Reviewed-on: https://code.wireshark.org/review/5803 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-16Add cmake helper files for finding wiresharkMaarten Bezemer1-0/+1
These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-15Enable case-insensitive string dissector tablesEvan Huus1-1/+1
Permit passing TRUE as the parameter during table registration to achieve that effect. Use it in RTP media type table. Bug: 10708 Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97 Reviewed-on: https://code.wireshark.org/review/5695 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs3-50/+1
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-101.99.1 → 1.99.2.Gerald Combs1-1/+1
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 Reviewed-on: https://code.wireshark.org/review/5705 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10Refactor "color" conversation filtersMichael Mann1-0/+3
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-08Add missing build-dependencies for the Debian packageBalint Reczey1-2/+3
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-08Add proto_tree_add_bitmask_with_flags.Michael Mann1-0/+1
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-08802.11: Add ieee80211_supported_rates_vals_ext to be exportedAlexis La Goutte1-0/+1
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-11-30Update to reflect current reality.Guy Harris1-9/+7
Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846 Reviewed-on: https://code.wireshark.org/review/5538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-25Update debian symbolsMaarten Bezemer2-1/+2
* 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-22Update symbol list.Guy Harris1-1/+2
Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196 Reviewed-on: https://code.wireshark.org/review/5444 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14It's not missing, it's passed on.Guy Harris1-1/+0
Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3 Reviewed-on: https://code.wireshark.org/review/5314 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14Update Debian symbol files.Guy Harris1-1/+4
Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142 Reviewed-on: https://code.wireshark.org/review/5310 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-10Improved deregistering fields.Stig Bjørlykke1-1/+2
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-02Fix typo: Intrustion -> IntrusionBalint Reczey1-2/+2
Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a Reviewed-on: https://code.wireshark.org/review/5082 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-31Sync debian symbol files to current API.Michael Mann2-2/+6
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-30Eliminate proto_tree_add_text from packet-q933.cMichael Mann1-0/+3
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-08Robopatch and remove #MISSING comments.Guy Harris2-4/+3
Change-Id: I611882a8b268046665488381be64aca89cdf3194 Reviewed-on: https://code.wireshark.org/review/4563 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-071.99.0 → 1.99.1.Gerald Combs1-1/+1
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-29Update debian symbol files to satisfy the buildbotEvan Huus2-1/+3
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-27The Ubuntu build says to do this, so I'll believe it so it stops failing.Guy Harris1-1/+12
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-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs5-8/+20
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-08-24Convert admon graphics to SVG.Gerald Combs1-1/+1
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-09Update symbol lists.Guy Harris2-1/+7
Change-Id: I55ce6396b943ce9376649a9a8973a6e1cadcced7 Reviewed-on: https://code.wireshark.org/review/3518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02Fix Debian package build complaints.Guy Harris2-8/+41
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-02Add tvb_ensure_bytes_exist64 to the API list.Guy Harris1-0/+1
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-07-16Reflect the move of the buffer_ routines to libwsutil.Guy Harris2-5/+5
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-03Rename and move ui/stat_menu.h to epan/stat_groups.h.Guy Harris1-1/+1
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-01Remove executable bit, from not executable files.Jakub Zawadzki2-0/+0
Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06 Reviewed-on: https://code.wireshark.org/review/2757 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-20One more change to dissector_add_for_decode_as.Guy Harris1-1/+1
Change-Id: Icd272fc9ae749728a601966de573843390e278ab Reviewed-on: https://code.wireshark.org/review/2484 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Update debian/symbols for the changed library ABIsBalint Reczey2-13/+8
Change-Id: I942a92569472e3cecfaee004778561986aee3e69 Reviewed-on: https://code.wireshark.org/review/2357 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-15Depend on docbook-xml and drop obsoleted 0005-...patchBalint Reczey3-42/+1
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-08Fix Wireshark's name in Vietnamese translationBalint Reczey1-1/+1
Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043 Reviewed-on: https://code.wireshark.org/review/2043 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-08Add GPLv2+ license header to headers-check.c as per private email from theEvan Huus1-0/+24
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.deb package format is 'native'Balint Reczey4-5/+3
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-08Don't ship libfiletap in the .deb packages yetBalint Reczey3-54/+0
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-08Sync .deb packaging from DebianBalint Reczey84-496/+3833
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-05-231.11.4 → 1.99.0.Gerald Combs1-1/+1
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte2-3/+0
(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-01-08Add libfiletap.Guy Harris1-0/+1
svn path=/trunk/; revision=54673
2014-01-08Add libfiletap.Guy Harris2-0/+5
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
2013-12-23Add GPLv2+ license header to headers-check.c as per private email from theEvan Huus1-0/+24
author. svn path=/trunk/; revision=54384
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 03:52:45 +0000