aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2014-06-21Move get_copyright_info() to wsutil.Guy Harris2-0/+2
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Fix build without pcap.Guy Harris1-5/+0
The files that use LONGOPT_CAPTURE_COMMON and OPTSTRING_CAPTURE_COMMON include capture_opts.h unconditionally, so there's no need to define them if we don't have pcap. In addition, we want the capture options "available" even if we don't have pcap, so we can tell the user "you're using a version of *shark without pcap, but you gave a capture option". Change-Id: I0bd3893b73d3d903610d0bc6cacb60bfb37096f4 Reviewed-on: https://code.wireshark.org/review/2503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Fix builds without pcap.Guy Harris1-1/+1
Change-Id: I6c67f9ea9d115a8396af0904ef9a73d2c528dcaa Reviewed-on: https://code.wireshark.org/review/2498 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Also define LONGOPT_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris1-0/+1
While we're at it, simplify the #ifdefs and #defines in capture_opts.h - don't do the same tests twice. Change-Id: I2079167f31789470ef77120054d769d5914745e3 Reviewed-on: https://code.wireshark.org/review/2496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris1-14/+2
No capturing, no capture options. Change-Id: I0023184b9c358d5876f19a098590f34d641c8649 Reviewed-on: https://code.wireshark.org/review/2493 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add some long options for capture short options.Guy Harris1-1/+2
The names match tcpdump trunk's names for the corresponding options. Also have capture_opts.h provide a #define for the part of the short option string that corresponds to the capture short options that all our programs that take capture short options take (those are largely the ones we have in common with tcpdump). Change-Id: Ia209425959c801725850b56a7d63441ee99b5001 Reviewed-on: https://code.wireshark.org/review/2492 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add --help and --version long options.Guy Harris1-2/+4
Also, make the convention for long-only options be that their case-statement values start at 128, so they avoid colliding with any ASCII code points, including control characters. Make the tables of long options "static const" while we're at it, and get rid of unnecessary casts. Change-Id: I55702a85e9bc078b1cd0f2803ebb68a710405bab Reviewed-on: https://code.wireshark.org/review/2491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19Add the ability to dynamically add a new protocol to export PDU dialog boxPascal Quantin1-4/+5
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e Reviewed-on: https://code.wireshark.org/review/2423 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Make sure we hide columns for live captures as well.Gerald Combs2-18/+11
Remove some dependencies on having an open capture file. Change-Id: Iad5d03e0a45ed31c83781861ef1ed7fdeb92e4a5 Reviewed-on: https://code.wireshark.org/review/2352 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-17Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.Tim Furlong6-6/+6
Several header file references in .ui files needed to be changed to not be global, and the path to stats_tree_dialog.ui needed a "../qt" path prepended to be found from the build...-Release directory. Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95 Reviewed-on: https://code.wireshark.org/review/2281 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Qt: fix loading of language translationAlexis La Goutte2-0/+21
But need always restart to apply change... Based on http://qt-project.org/wiki/How_to_create_a_multi_language_application Change-Id: I0f95afb68aa5b125e0707b0af1ce096dab9c29e4 Reviewed-on: https://code.wireshark.org/review/2286 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-16Column visibility fixups.Gerald Combs2-5/+15
Move visibility to its own method and call it when we show ourselves and when we thaw. Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87 Reviewed-on: https://code.wireshark.org/review/2289 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16More Python-bindings removal.Jeff Morriss2-8/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16Hide hidden columns in Qt.Gerald Combs1-1/+5
Change-Id: I1da0d95c606eb2f17c03874f20d38b9a7ba9e8ee Reviewed-on: https://code.wireshark.org/review/2278 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+1
Change-Id: I781c7eec381d3296d15e666385f549e44f62e3f1 Reviewed-on: https://code.wireshark.org/review/2226 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-14Define INET6 for all platforms.Irene Ruengeler1-0/+4
Show the addresses as a tooltip in capture interfaces. Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224 Reviewed-on: https://code.wireshark.org/review/2155 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-12Try to fix a used-but-not-set warning.Guy Harris1-1/+3
I'm guessing that GCC is complaining because "device" isn't guaranteed to be set (if there are no interfaces, the body of the loop will never be executed), so do with the list of link-layer header types what's done for the buffer size and snapshot length. But should the column-setting code be executed if the interface isn't found? Change-Id: I8c365a482b8af44cdd1c1a7f41ca611141387c86 Reviewed-on: https://code.wireshark.org/review/2180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-12Capture Interfaces Dialog:Irene Ruengeler15-149/+924
- allow to change the interface options in the table - save the options to preferences when the dialog is left - add a field for setting a capture filter for all selected interfaces - add a "Compile BPF" button and a window to show the compiled filter output - try to address Alexis' and Evan's comments Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f Reviewed-on: https://code.wireshark.org/review/1946 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-06Add TFTP export for Qt tooAlexis La Goutte5-14/+22
Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245 Reviewed-on: https://code.wireshark.org/review/1916 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-2/+5
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-03Qt: Export ObjectAlexis La Goutte1-1/+3
* Fix indent (remove tabs) * Add title to the window Change-Id: I454046e47fa17969c710fa8dec4fac8cb7dbf22f Reviewed-on: https://code.wireshark.org/review/1917 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-28Use Q_UNUSED instead of _U_ruengeler1-1/+2
Change-Id: I19732f097b1238159b634e32ee13fe6ae3f1883d Reviewed-on: https://code.wireshark.org/review/1849 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-05-28QIcon is not needed.ruengeler1-1/+0
Change-Id: I07207177e97e22bb8810226818b2280db5f5055e Reviewed-on: https://code.wireshark.org/review/1836 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-25Add support for dissecting non-packet records.Guy Harris2-2/+2
Add a dissector table indexed by the file type, and, for the file-type-specific records, have the frame dissector skip the usual pseudo-header processing, as the pseudo-header has a file-type-specific record subtype in it, and call the dissector for that file type's records. Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9 Reviewed-on: https://code.wireshark.org/review/1782 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-24Allow wtap_read() and wtap_seek_read() to return records other than packets.Guy Harris3-8/+8
Add a "record type" field to "struct wtap_pkthdr"; currently, it can be REC_TYPE_PACKET, for a record containing a packet, or REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific data. Modify code that reads packets to be able to handle non-packet records, even if that just means ignoring them. Rename some routines to indicate that they handle more than just packets. We don't yet have any libwiretap code that supplies records other than REC_TYPE_PACKET or that supporting writing records other than REC_TYPE_PACKET, or any code to support plugins for handling REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug 8590. Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813 Reviewed-on: https://code.wireshark.org/review/1773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."Guy Harris3-22/+17
This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4. A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress. Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6 Reviewed-on: https://code.wireshark.org/review/1741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23Allow wtap_read() and wtap_seek_read() to return non-packet records.Guy Harris3-17/+22
This is the first step towards implementing the mechanisms requestd in bug 8590; currently, we don't return any records other than packet records from libwiretap, and just ignore non-packet records in the rest of Wireshark, but this at least gets the ball rolling. Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574 Reviewed-on: https://code.wireshark.org/review/1736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-19Use g_ alloced memory (instead of emem) when printing fields. emem ↵Michael Mann1-1/+3
shouldn't be used for GUI functions anyway. emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. When converting from proto_construct_match_selected_string to fvalue_to_string_repr remember proto_construct_match_selected_string includes fieldname + value, not just value bug:10081 Change-Id: I4fc6ea7fd1f63cff410207c8b30562771af40ada Reviewed-on: https://code.wireshark.org/review/1578 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-17Guard closing capture window with ifdef.Evan Huus1-0/+2
That variable is only defined if we HAVE_LIBPCAP. Should fix OSX10.5 buildbot. Change-Id: I0bafc48955ef4af3c0b8d9d7a35b1e8b27577d31 Reviewed-on: https://code.wireshark.org/review/1669 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-15Do not leave the Options Interfaces Dialog open, when the Main Window is closed.ruengeler1-0/+1
Change-Id: Ifd4fb88ceff24561131fad1d72531889e323f5ac Reviewed-on: https://code.wireshark.org/review/1651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14The filter string can only be valid, if an interface is selected.ruengeler1-1/+1
Change-Id: I578f6b46d5e2631c6315eb0a8b6141ba93ee21bb Reviewed-on: https://code.wireshark.org/review/1631 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13Use pre-scan command line parameters with double while(opt=getopt...)Alexis La Goutte1-68/+141
Don't need launch "Qt" for some console only parameters (-h -v ...) Based on GTK+ code Change-Id: I1a810e394088959aefbbb39fb88836591a8b2367 Reviewed-on: https://code.wireshark.org/review/1311 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13isprint() -> g_ascii_isprint()AndersBroman1-2/+2
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41 Reviewed-on: https://code.wireshark.org/review/1624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12Ignore SIGPIPE on systems that have it.Gerald Combs1-0/+7
According to the GTK+ docs, gtk_init calls "signal(SIGPIPE, SIG_IGN)" at startup. Replicate that behavior here, otherwise we tend to terminate unexpectedly. Change-Id: Ia017402755d647e6050af40deacef6765eea8694 Reviewed-on: https://code.wireshark.org/review/1614 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-11Identify client/server by their IP address and port number in follow streams ↵Pascal Quantin1-3/+9
dialog box This allows to properly identify hosts that use the same port number Change-Id: I93bf5b53e4df1d339fb06b372b90f88fce6785a0 Reviewed-on: https://code.wireshark.org/review/1588 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-11Small fixes to Follow Streams dialog box:Pascal Quantin1-5/+5
- get the right IPv6 client address - display the right client to server string for UDP/SSL in Qt port Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db Reviewed-on: https://code.wireshark.org/review/1586 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-09Revert "Use g_ alloced memory (instead of emem) when printing fields. emem ↵Evan Huus1-3/+1
shouldn't be used for GUI functions." It's causing a few different test failures - I've tracked down at least one of them, but the others are weirder and will require more digging. This reverts commit 9edba650d11776fa1d5aefe4820890898380c1c2. Change-Id: I897f8cf1cfbb2a189b2054e5002f59757befa47f Reviewed-on: https://code.wireshark.org/review/1575 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-09Revert "Refactor Wiretap"Guy Harris3-4/+4
This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a. This isn't building, and looks as if it requires significant work to fix. Change-Id: I622b1bb243e353e874883a302ab419532b7601f2 Reviewed-on: https://code.wireshark.org/review/1568 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-09Use g_ alloced memory (instead of emem) when printing fields. emem ↵Michael Mann1-1/+3
shouldn't be used for GUI functions. emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. bug:10081 Change-Id: I6346dfdfb5f6381e16761a99291c4be7851185d9 Reviewed-on: https://code.wireshark.org/review/1566 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-09Refactor WiretapMichael Mann3-4/+4
Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality. The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes. bug:9607 Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae Reviewed-on: https://code.wireshark.org/review/1485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04GUI modules for LBM aka 29West dissectors.David Ameiss19-1/+8422
bug:9718 Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39 Reviewed-on: https://code.wireshark.org/review/1041 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix warning: extra ‘;’ [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: Ib2f52d28dce0f64bf56ff0df7b4ed7d091670620 Reviewed-on: https://code.wireshark.org/review/1319 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-23Fix typo in comment (parameterts => parameter)Alexis La Goutte1-1/+1
Change-Id: Ie1fefc27d249929f0f5108b0757768e7e23a9dbe Reviewed-on: https://code.wireshark.org/review/1310 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-19More name changes.Guy Harris1-6/+6
Add ep_ to routines that may return ephemeral strings. Change "get_XXX" to "XXX_to_display" if the routine returns a formatted string if it can't get a name. Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 Reviewed-on: https://code.wireshark.org/review/1217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19Some routine name changes.Guy Harris2-2/+2
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-15Update French translationAlexis La Goutte2-726/+771
Change-Id: If552907a2eb0828198e912fa5c2628efa7190f20 Reviewed-on: https://code.wireshark.org/review/1119 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Adjust path width for OS X & Linux.Gerald Combs1-1/+1
Change-Id: Icc51e8c3c93f78cbfa0a0aeda3552ceb4c82803d Reviewed-on: https://code.wireshark.org/review/1122 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-14lrelease / lupdate translation filesAlexis La Goutte4-154/+51
Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c Reviewed-on: https://code.wireshark.org/review/1110 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo (double at...)Alexis La Goutte1-1/+1
Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0 Reviewed-on: https://code.wireshark.org/review/1109 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 22:40:42 +0000