aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-11-13Qt: Coloring Rules dialog fixups.Gerald Combs4-9/+22
Insert new rules at the top. This matches the GTK+ UI behavior. Recolor the packet list when we press "OK". Add a "to do" item about setting the filter column width. Change-Id: I2a9e58fe8642a89f12e1c34622b96613f3ec4c05 Reviewed-on: https://code.wireshark.org/review/11781 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-13Qt: fix UI artifacts seen in UAT window on Linux or OSXPascal Quantin1-0/+3
The QLabel::clear() method call does not seem to repaint the area on those platforms. Let's force an update of the widget. Bug: 11695 Change-Id: I9c708c8537140b26582e4365ceee3271eac23259 Reviewed-on: https://code.wireshark.org/review/11782 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-12Developer guide: add docbook-xml45 to the list of required Cygwin packagesPascal Quantin1-1/+3
Change-Id: Id0a241361160b03c16a6a9152c8f1a86f87b9db1 Reviewed-on: https://code.wireshark.org/review/11784 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-12Fix installation of desktop files.Guy Harris1-1/+1
Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15 Reviewed-on: https://code.wireshark.org/review/11772 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12[configure.ac] Update gtk+ and glib release date listsBill Meier1-0/+2
Change-Id: I79f063fece531ae5e75b0c2a96682827f74489bf Reviewed-on: https://code.wireshark.org/review/11770 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-11-12Qt: initialize all remote interface optionsPascal Quantin1-0/+8
Bug: 11699 Bug: 11701 Change-Id: Ib470e69bba015a006f9360cfdb429a816b80e37c Reviewed-on: https://code.wireshark.org/review/11767 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-12[IMF] Add bounds checks to avoid buffer overruns,DiablosOffens1-4/+13
also sets the last_field flag to true if it's the end of the buffer. Change-Id: I135d052fce04807ce61b5feb9af121ff4528f595 Reviewed-on: https://code.wireshark.org/review/11731 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Put back ' in user guide namePascal Quantin1-1/+1
CMake generated CHM supports it properly, contrary to NMake. As this is the future, let's put it back! Change-Id: Ifc5ea84942043c04808546df75ae956effa16747 Reviewed-on: https://code.wireshark.org/review/11763 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-12Squelch a compiler warning.Guy Harris1-1/+1
Change-Id: I9e9746dc5f17daea7830ddc37f5df0ba16def397 Reviewed-on: https://code.wireshark.org/review/11762 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde33-11052/+11389
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Fix up documentation of RPM packages.Jeff Morriss3-12/+43
Specify which ./configure options are passed into the RPM. Describe the 3 package RPM package names and their contents. Describe how to enable parallel builds when making RPMs. RPM now stands for "RPM Package Manager." Fix some markup problems. Change-Id: I1664aa0956719e872d302a4af2c092318f5eea6d Reviewed-on: https://code.wireshark.org/review/11737 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Qt: save preferences after creating a filter from expression framePascal Quantin1-0/+2
Bug: 11690 Change-Id: Ice6a2341d3f39c107a3c9d6a0e23fd98312b48a8 Reviewed-on: https://code.wireshark.org/review/11748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Qt: Added IO Graph save to clipboard button.Stig Bjørlykke2-5/+72
Also added save as CSV file. Do not add double quotes for values as we do in GTK. Change-Id: I8576a73e10b71cdba0c8c80db8b21927d19528da Reviewed-on: https://code.wireshark.org/review/11732 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12dissector for ISO14443 protocolsMartin Kaiser4-0/+596
This is a dissector for the ISO14443 protocols between a contactless smartcard and a card reader. The overall approach is similar to DVB-CI. We have a pseudo-header in front of the captured data that has information about the type of the captured data and the direction. For now, the dissector registers itself by name so it can be linked to a user-DLT. I am applying for an official DLT. Change-Id: I9c4a28ef5b220f205baf58381bf1962996887a9d Reviewed-on: https://code.wireshark.org/review/11663 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Use format_text() when displaying, not when handing to AirPDcap.Guy Harris1-16/+56
format_text() is specifically intended to handle strings when displaying them to the user; code such as AirPDCap, which doesn't display strings to the user, should be handed the raw SSID. Put in a comment indicating what we probably *should* be doing here. Bug: 11685 Change-Id: Ic30114c35d1d8f3d791ae904e33a4d81ddc215ec Reviewed-on: https://code.wireshark.org/review/11757 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12IPv6: Register extension header fields under the appropriate protocolJoão Valverde1-53/+73
Fixes Qt GUI supported protocols display. Change-Id: If51aae0f6cb2a7d182aa1c40bd827e09bbddbb09 Reviewed-on: https://code.wireshark.org/review/11536 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> 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>
2015-11-12802.11: avoid multi return on SSID or MESHIDAlexis La Goutte1-5/+5
Bug:11685 Change-Id: Ibe7a2909f0aed33fa35685ac5c8e0e1a8a626742 Reviewed-on: https://code.wireshark.org/review/11652 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-12Make it possible to set an environment variable to do debug builds.DiablosOffens1-1/+7
Change-Id: I236db01194803474d63fa3d5869f7e80585bce0e Reviewed-on: https://code.wireshark.org/review/11730 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> 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>
2015-11-12Export functions str_to_ip() and str_to_ip6() to pluginsJo Rueschel1-0/+3
The functions str_to_ip() and str_to_ip6() are not yet exposed to plugins so they cannot be used there. Now they are added to the plugin API. Change-Id: I9df267934ad43887a6326c8c9a1a666f263c08a2 Reviewed-on: https://code.wireshark.org/review/11728 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-11-12Plug file descriptor leak.Guy Harris1-0/+1
Change-Id: I882cc5c264fdf97452c84bd5cea0e5d56bd6eb45 Reviewed-on: https://code.wireshark.org/review/11753 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12Add wtap_dump_open_tempfile routines, to write to a temporary file.Guy Harris5-25/+106
It includes the temporary-file generation, so you don't have to do it yourself. Change-Id: I0798df95a5c5646224ec49612f50b423ed78547a Reviewed-on: https://code.wireshark.org/review/11751 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12Add $(randpkt_INCLUDES) to $(noinst_HEADERS) so they're distributed.Guy Harris1-1/+2
Change-Id: Ib81233c5292d5a81bca7fa6a382d4dad20997330 Reviewed-on: https://code.wireshark.org/review/11749 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Qt: fix cursor position when editing coloring rules names or filtersPascal Quantin2-12/+0
A call to setText will set the cursor to the end of the box. As far as I can tell, this call is useless so let's remove it. Bug: 11689 Change-Id: I40aee48745a9107331a017070a715a075106974a Reviewed-on: https://code.wireshark.org/review/11727 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11Put wtap_dump_open() right before wtap_dump_open_ng().Guy Harris1-7/+7
That matches what we do with the other two pairs of dump opening routines. Change-Id: I0e6e475573c3a8d4ab6cf991d0aadc14150af233 Reviewed-on: https://code.wireshark.org/review/11744 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Fixup a couple of stdout checks.Gerald Combs1-2/+2
Change-Id: I942cd9010901d7b6c4f5b390fb23f79d72fb05d0 Reviewed-on: https://code.wireshark.org/review/11740 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Update user guide for upcoming 2.0 releasePascal Quantin3-7/+7
Change-Id: Id27365d6bd7085f498edd78111d85de0fbd0abd3 Reviewed-on: https://code.wireshark.org/review/11738 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11CMake: set WinPcap version in top CMakeLists.txt file like for NMakePascal Quantin2-2/+2
This allows displaying the WinPcap version in about dialog Change-Id: Ic3f4256d81db68314a158fc55682dfd9dbf799a0 Reviewed-on: https://code.wireshark.org/review/11726 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-11Put randpkt-core.h into the release tarball.Guy Harris1-0/+4
Change-Id: I9c887b3e683ecd035fb3d16d64c5ce1285b97865 Reviewed-on: https://code.wireshark.org/review/11736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Rename the wireshark-gnome RPM package wireshark-gtk.Jeff Morriss1-5/+13
This was mentioned a while ago in another change but I forgot about it until seeing Gerald's recent release-notes change (which indicates that the RPM and Debian package names for the old GUI are wireshark-gtk). Change-Id: I2a39fce38086d3716c8ef2a07eb8f23bb91a25fa Reviewed-on: https://code.wireshark.org/review/11709 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-11-11Update user guide for development releasePascal Quantin13-61/+76
Change-Id: I9b4c5ab2e98ad6daa618bcda20b53a23467e16e0 Reviewed-on: https://code.wireshark.org/review/11734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11randpkt: split into a core and an app.Dario Lombardo5-805/+905
This will allow other apps to use the random packet generation features. Change-Id: I7e9af58cbe39da4908242b5fbb292f473e03b4f2 Reviewed-on: https://code.wireshark.org/review/11579 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-11Qt: fix profile renamePascal Quantin1-0/+1
Bug: 11658 Change-Id: I271863557d13137d168e12d3c393de49823f288a Reviewed-on: https://code.wireshark.org/review/11708 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11Qt: fixes to 'Edit Column' dialogPascal Quantin2-11/+34
- set field name and occurrence when editing a custom column - convert occurrence number to a QString - disable OK button when syntax is incorrect or empty for a custom column - update syntax state when opening the edit dialog or when switching between custom and normal column Bug: 11433 Change-Id: Ia8424474dd250c78a0b503e0e9d89c322f4f86a9 Reviewed-on: https://code.wireshark.org/review/11705 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris3-120/+46
We just export some UI helpers and the Big Merge Engine. Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda Reviewed-on: https://code.wireshark.org/review/11689 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Qt: Freeze+thaw the main window during nested operations.Gerald Combs3-14/+75
As noted in main_window.cpp: // Our event loop becomes nested whenever we call update_progress_dlg, which // includes several places in file.c. The GTK+ UI stays out of trouble by // showing a modal progress dialog. We attempt to do the equivalent below by // disabling parts of the main window. At a minumum the ProgressFrame in the // main status bar must remain accessible. Move the freeze+thaw code from captureFileRetapStarted and captureFileRetapFinished to its own set of member functions. Call them when we {,un}mark and {,un}ignore packets and note that we should probably call them elsewhere. Disable mark and ignore actions when we freeze and restore their states when we thaw. Bug: 11681 Change-Id: I6f015f7f5f6c98cd48ace2c87f43f48efe51a88b Reviewed-on: https://code.wireshark.org/review/11690 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-11debian: Make make dist know about moving wireshark.1 to wireshark-qt and ↵Balint Reczey1-2/+1
removal of wireshark.menu Change-Id: I81b95e43beae7ca85bff9b2d5b4a6f498252f2b3 Reviewed-on: https://code.wireshark.org/review/11720 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Move icon and mime info file to wireshark-commonBalint Reczey3-5/+3
Change-Id: I4d8660b36810baa95f8b300af9790778dcba83a8 Reviewed-on: https://code.wireshark.org/review/11697 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11GTK: Add separate working desktop file for GTK+ Wireshark GUIBalint Reczey4-3/+119
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6 Reviewed-on: https://code.wireshark.org/review/11696 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Ship wireshark.desktop file in wireshark-qtBalint Reczey1-1/+4
Change-Id: Idbf77e6a613c79e267f41d3e9d3c05617e9c6d99 Reviewed-on: https://code.wireshark.org/review/11695 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Ship wireshark.1 in the package we ship /usr/bin/wiresharkBalint Reczey1-0/+0
Change-Id: I7935f412092d6dbb0f545803d82d9b42dfe5a638 Reviewed-on: https://code.wireshark.org/review/11694 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Finish postinst of wireshark-common even when wireshark group is a ↵Balint Reczey1-5/+8
user group Failing postinst has been reported several times under LP#1447893 Change-Id: I196f246b34aa3be9d53f02b4e0092c802effc42a Reviewed-on: https://code.wireshark.org/review/11693 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Add note to README.Debian to log in again to be able to capture packetsBalint Reczey1-1/+3
Change-Id: Ifae1223d34f7ae071484fe47d1c88de166ed84ca Reviewed-on: https://code.wireshark.org/review/11692 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Drop menu supportBalint Reczey3-8/+0
Debian is migrating away from the Debian Menu system to adopt Freedesktop Desktop Entry Specification instead. (.desktop files) Packages providing .desktop files should not provide menu files. https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html Change-Id: I862deee870e9697c590a8323ba8ae2da892b7bb1 Reviewed-on: https://code.wireshark.org/review/11691 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11ISI: Add Modelines infoAlexis La Goutte1-0/+13
Change-Id: I758c39698847d65447e0a7490104a9369c85f6cd Reviewed-on: https://code.wireshark.org/review/11684 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-11UDP: Don't throw malformed errors for empty UDP payloadJoão Valverde1-0/+5
Change-Id: I7f5724e263ab81d42421d0cfcb1fc4b63a55d79e Reviewed-on: https://code.wireshark.org/review/11590 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-11Change prototype of callbacks passed to wmem_tree_foreach so that theyMatthieu Coudron7-11/+11
accept the node key as a first parameter. wmem_tree accepts all sort of keys (strings, integers, soon ranges), thus it is of interest for various purposes (testing, greedy search) to know the key of the node. Change-Id: Ie748b917bef91f0b1ba8cce15bd1b471922641dc Reviewed-on: https://code.wireshark.org/review/11683 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-11ISI: fix code will never be executed [-Wunreachable-code]Alexis La Goutte1-1/+1
Change-Id: I24185128e664a0f7cc2b59d5d653582cddd04df1 Reviewed-on: https://code.wireshark.org/review/11686 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>
2015-11-11Additional 2.1 symbols.Guy Harris1-0/+8
Change-Id: Icf5d218e3e0a3336c80e04ed51a1ef5262cc9f28 Reviewed-on: https://code.wireshark.org/review/11711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10New 2.0 symbols.Guy Harris3-0/+6
Change-Id: Ie85ac43891c5587b0998e26da683ef275b631657 Reviewed-on: https://code.wireshark.org/review/11706 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Add CMakeLists.txt.user* to .gitignore.Gerald Combs1-0/+1
Qt Creator uses CMakeLists.txt.user to store CMake build settings. Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e Reviewed-on: https://code.wireshark.org/review/11700 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 16:06:16 +0000