Commit Graph

2950 Commits

Author SHA1 Message Date
Evan Huus fafa686a68 Enable case-insensitive string dissector tables
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-15 21:09:35 +00:00
Michal Labedzki fddbbdd212 Translates: Update Polish translation
Also fix typo.

Change-Id: If494e7ae8e24cf394b4c67208799e6fb358cf8f0
Reviewed-on: https://code.wireshark.org/review/5767
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:23:58 +00:00
Gerald Combs 44e14b7805 Qt: Defer startup messages.
Wait until we've completely started up to show accumulated warnings and
errors.

Replace three periods with an ellipsis.

Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5
Reviewed-on: https://code.wireshark.org/review/5762
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-14 17:53:22 +00:00
Gerald Combs 56697c244e Qt: Add name resolution menu items.
Change the text from "Enable for" to "Resolve". Make the tooltips more
descriptive. List them in OSI model order.

Change-Id: Ie671ba9d55c609ce475f1681add0ad7d975f19cd
Reviewed-on: https://code.wireshark.org/review/5737
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-12 20:40:53 +00:00
Alexis La Goutte bd4d291d1b Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click)
Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf
Reviewed-on: https://code.wireshark.org/review/5508
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 23:15:11 +00:00
Guy Harris 339df3d96d Add a heur_dissector_table_foreach() function.
This is, for heuristic dissector tables, the equivalent of
dissector_table_foreach() for keyed dissector tables.

Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763
Reviewed-on: https://code.wireshark.org/review/5715
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 04:16:33 +00:00
Guy Harris 151164d414 Give dissector_all_heur_tables_foreach_table() a sort function.
This makes it a bit more like dissector_all_tables_foreach_table.

Improve comments and clean up whitespace while we're at it.

Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c
Reviewed-on: https://code.wireshark.org/review/5714
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 03:05:22 +00:00
Guy Harris 9855beff31 Make the type of the second argument to a DATFunc_heur_table explicit.
It's always pased a heur_dissector_list_t *, so give it that type,
rather than having it be a generic pointer.

Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f
Reviewed-on: https://code.wireshark.org/review/5713
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 01:51:07 +00:00
Gerald Combs e4b0141769 Qt: Obey main toolbar icon preferences.
Remove the preferences for the filter toolbar and mark them GTK+-only.

Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377
Reviewed-on: https://code.wireshark.org/review/5693
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-12-10 01:51:09 +00:00
Gerald Combs 4921e55990 Qt: Initial VoIP Calls dialog.
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at
the top, since that seems to be the primary item.

Add configure-time checks for QtMultimediaWidgets in anticipation of
adding a VoIP playback dialog.

Add an icon for the playback button. (Yes, I've been avoiding
GNOME-level gratuitous icons so far but this is one of the rare
occiasions where it makes sense.)

Add a help link define for the VoIP calls dialog.

Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050
Reviewed-on: https://code.wireshark.org/review/5674
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-12-09 21:25:33 +00:00
Gerald Combs bcaa5d84b1 Qt: Update and rename the summary dialog.
Go back to a single view similar to the GTK+ UI. Apply layouts using Qt
Designer.

Rename the menu item and class to "Capture File Properties". It's not
really a summary if it contains details such as "marked average bits
per second". We might want to move this to a "Properties" item under
the "File" menu similar to other applications.

Add the GTK+ summary icon (for now) to the toolbar and open the
properties dialog on clicking.

Singleton dialogs delenda est[1]. Let the user open as many summaries on
as many capture files as he or she wishes. Also, global cfile delenda
est[2].

Don't blindly include QtGui. Add specific components instead.

Use consistent method names, variable names, and patterns. Try to
document what "consistent" means.

Adjust the way we display some statistics to match the summary bar, e.g.
displayed = captured if we don't have a filter applied.

[1] Not really.
[2] Yes, really.

Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916
Reviewed-on: https://code.wireshark.org/review/5274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 19:02:41 +00:00
Irene Ruengeler e5757d1dcc Fix GTK warning in EXTCAP parts
Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759
Reviewed-on: https://code.wireshark.org/review/5628
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
2014-12-09 07:18:06 +00:00
Gerald Combs 08e624f95d Remove an unnecessary include.
Change-Id: I55332c21ea66ee7d564c2b338cba524ea774b19c
Reviewed-on: https://code.wireshark.org/review/5677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-08 21:42:51 +00:00
Maarten Bezemer f16376ed7b Fix showing error dialog when calling vsimple_error_message_box()
SimpleDialog requires a parent, when none is provided (as there is no parent available during startup), the error message is queued and displayed after MainWindow is available.
Calling SimpleDialog::exec() directly returns if no parent is set (hence the dialog is not shown)

This resulted in silently ignoring error messages that were shown using vsimple_error_message_box(), as this function did not provide a parent (and the queue messages were not dequeued anymore as the MainWindow was already available)

Change-Id: I2f4c1b4926c196ab40b035161cec530105396537
Reviewed-on: https://code.wireshark.org/review/5519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:15:22 +00:00
Peter Wu cd14ff3288 qt: use qstring_strdup
Replaces the more verbose `g_strdup(foo.toUtf8().constData())` by
`qstring_strdup(foo)`. While at it, plug a minor memleak in
MainWindow dialogs.

Change-Id: I32b53f972b4e3998ac9beabd98647a381b7b42e3
Reviewed-on: https://code.wireshark.org/review/5531
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-12-01 01:13:54 +00:00
Peter Wu 18f0109969 qt: fix use-after-free pattern
qstring.toUtf8() returns a QByteArray object and .constData() returns
a pointer inside that object. It is not safe to store this pointer as
it will become invalid after the statement. Store a const reference
instead. (Due to scoping differences, some are copy-assigned though.)

In the UAT dialog, strlen(bytes.constData()) has also been replaced by
bytes.size() as an optimization.

Caught by ASAN.

Change-Id: Ie09f999a32d0ef1abaa1e658b9403b74bedffc37
Reviewed-on: https://code.wireshark.org/review/5528
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-12-01 00:56:26 +00:00
Guy Harris 846bb53948 Add a Buffer to wtap_pkthdr to hold file-type-specific packet metadata.
For example, this can be used for pcap-ng options not mapped to
file-type-independent metadata values.

Change-Id: I398b324c62c1cc1cc61eb5e9631de00481b4aadc
Reviewed-on: https://code.wireshark.org/review/5549
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-01 00:31:03 +00:00
Pascal Quantin 35b1bc5ec6 win32: use target file format when checking if it supports comments
Bug: 10656
Change-Id: Ib74f213630d6d382118c09b3cbf998b28cbc045e
Reviewed-on: https://code.wireshark.org/review/5544
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-30 19:44:18 +00:00
Alexis La Goutte afcdff0874 Endpoint dialog (Qt): Add missing text to translate
Change-Id: I375b348b6d6e35c212f76fc73135990a93560a75
Reviewed-on: https://code.wireshark.org/review/5517
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-28 09:25:52 +00:00
Alexis La Goutte a30f3d5ebc Qt: Add long option for -R (--read-filter) and -Y (--display-filter)
Change-Id: Id535c04493f6c6df88006d922ee43cff9f4b70a1
Reviewed-on: https://code.wireshark.org/review/5507
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-27 16:24:12 +00:00
Martin Kaiser 449bc19ba9 Qt: support the -R option to set a read filter on the command line
rename display_filter to read_filter in some places to make it clear
what it's used for

modify MainWindow::openCaptureFile() so that a read filter can be set
when the file name is passed in cf_path, not only when it's chosen from
a file selection dialogue

don't display the read filter string in the filter toolbar

Change-Id: Ie8dc94cbd1ff7e61ce1e2a55518a28297daa5d51
Reviewed-on: https://code.wireshark.org/review/5446
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-26 16:01:52 +00:00
Gerald Combs 2ebaa59a3b Consolidate sequence analysis code.
Move scattered code for seq_analysis_info_t creation and destruction to
tap-sequence-analysis.[ch].

Change-Id: I87c14b1c83105a48d0ab149a3abba71e2a2fe21f
Reviewed-on: https://code.wireshark.org/review/5479
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-11-26 00:04:05 +00:00
Stephen Fisher c39776c947 Remove unused ui_simple_dialog.h from qt Makefile.common
Change-Id: I366a52a037462cb059565365ea1eec5be228078f
Reviewed-on: https://code.wireshark.org/review/5475
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25 08:59:35 +00:00
Martin Kaiser 363b87a4be Qt: support the -Y option to set an initial display filter
Change-Id: I7627265b876c6994b163df1c5b037f4dae2f6d42
Reviewed-on: https://code.wireshark.org/review/5445
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-25 02:52:16 +00:00
Alexis La Goutte d5713e2040 hostlist_table (GTK): Fix Dereference of null pointer found by Clang analyzer
Change-Id: If74dc38b2a9724b9d924092796db5b6beb97043c
Reviewed-on: https://code.wireshark.org/review/5400
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-25 02:43:45 +00:00
Stephen Fisher 059c257793 Allow html version of man pages to be found when running from build
directory (they're in doc/ of the build directory).

Change-Id: I425fa847952cf9f74a948a89c0048077dfcf0ae2
Reviewed-on: https://code.wireshark.org/review/5478
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24 23:53:12 +00:00
Alexis La Goutte 15f6f56073 Revert "Allow "(g)make tags" to work again"
This reverts commit 6b8fe87ef4.

Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f
Reviewed-on: https://code.wireshark.org/review/5472
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-24 18:36:06 +00:00
Stephen Fisher 6b8fe87ef4 Allow "(g)make tags" to work again
Change-Id: Idcff82aceedbf42652741564e06ca53984078361
Reviewed-on: https://code.wireshark.org/review/5413
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24 18:01:19 +00:00
Stephen Fisher 10803f2119 Second attempt at putting a description in the preferences page
Change-Id: I6d196486e824c82d29f1c233ef3230ad8619715d
Reviewed-on: https://code.wireshark.org/review/5434
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24 17:28:22 +00:00
Guy Harris 4d55e1f455 Presumably the intent is to dump *non*-dummy entries.
I.e., presumably the intent is to dump *resolved* hosts, rather than
*unresolved* hosts where there's no known host name and the name field
is a string form of the address (the premise being that looking the
address up in the hash table repeatedly, and using the already-generated
string, will be faster than generating the string repeatedly).

Change-Id: Iad1beb1d5f9cd9ed92bad5386111cb659614ee4d
Reviewed-on: https://code.wireshark.org/review/5455
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-23 20:53:11 +00:00
Guy Harris da5487ff49 Newlines at the ends of lines, please.
Change-Id: I7b484e3ddac7cb1330c966819514a9468ea69066
Reviewed-on: https://code.wireshark.org/review/5454
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-23 20:51:05 +00:00
Jeff Morriss e2b597a898 Fix problem where the profile bar moves further left every time Wireshark is
run.

For the saved/restored geometry to be consistently correct we need to always
show the expert info and capture file comment icons.  Disable them if no
capture file is open.

Bug: 10518
Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c
Reviewed-on: https://code.wireshark.org/review/5404
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22 13:49:57 +00:00
Alexis La Goutte fecea9745e VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d
Reviewed-on: https://code.wireshark.org/review/5401
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:57:47 +00:00
Irene Ruengeler c07e9fe450 Add minimize and maximize buttons to the SCTP analysis windows.
As suggested by Jeff Morriss.

Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64
Reviewed-on: https://code.wireshark.org/review/5361
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:52:22 +00:00
Jeff Morriss 96fb34706b Remove some leftover debug printfs.
Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
Reviewed-on: https://code.wireshark.org/review/5417
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-21 13:09:53 +00:00
Gerald Combs 06dc2a7537 voip_calls: Fix tap callbacks.
We don't need to call the VoIP tap reset and draw callbacks repeately.
Do so only once from the RTP tap. Packet callbacks should return a
gboolean.

Clean up some function names and make some static.

Change-Id: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622
Reviewed-on: https://code.wireshark.org/review/5396
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-19 17:14:52 +00:00
Bill Meier cb090e81ec [pedantic] Replace usage of 'long' and 'long long'
Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208
Reviewed-on: https://code.wireshark.org/review/5395
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-19 16:31:42 +00:00
Gerald Combs cfa0e5fd53 voip_calls: Regression fixes.
Fix struct initialization logic. Clear a GQueue instead of deleting it.
Don't crash if we have no sequence diagram items. Make sure we show all
flows and not just invites. Zero allocated memory in a couple of places.

Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28
Reviewed-on: https://code.wireshark.org/review/5390
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-18 23:37:35 +00:00
Guy Harris c2f971dd71 Fix indentation.
Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b
Reviewed-on: https://code.wireshark.org/review/5380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-18 05:17:11 +00:00
Gerald Combs 1dec509a88 voip_calls: Move to ui.
Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t.
Remove unused function definitions.

Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2
Reviewed-on: https://code.wireshark.org/review/5379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-18 00:48:34 +00:00
Gerald Combs a07f0817d7 voip_calls: Get rid of global variables.
Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a
bunch of formerly static variables there as well. Note that we might
want to make them private again at some point. Remove launch_count. It
appeared to be unused.

Wrap the individual registration routines in voip_calls_init_all_taps.
Wrap the removal routines in voip_calls_remove_all_tap_listeners.

Move voip_calls_get_info() to voip_calls_dlg.c. Make it static.

Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b
Reviewed-on: https://code.wireshark.org/review/5372
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17 21:56:00 +00:00
Jeff Morriss 14bc6d88b1 Remove some ununused/unmatched <resources/> tags.
Change-Id: I0f8e4381b27d1defeb5980692823d297d2f48bab
Reviewed-on: https://code.wireshark.org/review/5349
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-17 00:59:40 +00:00
Alexis La Goutte 05acb679aa mcast_stream: fix indent (use 4 spaces)
Add also modelines info

Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
Reviewed-on: https://code.wireshark.org/review/5344
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:23:56 +00:00
Alexis La Goutte 7213ad53f8 rtp_stream: fix indent (use 4 spaces)
Add also modelines info

Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
Reviewed-on: https://code.wireshark.org/review/5345
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:23:08 +00:00
Michael Mann f92ed4df2d Remove ipproto member of packet_info.
All situations can be handled with "shimmed" dissector functions.

Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16 13:45:18 +00:00
Gerald Combs 4960171c3a VoIP calls: Fixup whitespace.
Set modelines and reindent to match the files in the top-level ui
directory.

Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
Reviewed-on: https://code.wireshark.org/review/5325
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 18:39:11 +00:00
Gerald Combs 51c5b7a937 VoIP calls: Start separating common and GTK+-dependent code.
Remove more calls to voip_calls_get_info. Get rid of the global cfile.
Lowercase more function names.

Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
Reviewed-on: https://code.wireshark.org/review/5324
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 18:14:08 +00:00
Gerald Combs d550b17984 VoIP calls: Use our tap offsets.
Add convenience functions to convert between tap IDs and tapinfo
pointers. Use them to get rid of some calls to voip_calls_get_info().

Lowercase function names. Remove more exit()s.

Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
Reviewed-on: https://code.wireshark.org/review/5321
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 05:23:41 +00:00
Gerald Combs 3428361a26 Fix a pointer type.
Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
Reviewed-on: https://code.wireshark.org/review/5319
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 03:31:11 +00:00
Gerald Combs 1e2a3dcb94 VoIP calls: Clean up tap registration and removal.
Start moving away from a global voip_calls_tapinfo_t. Pass the
voip_calls_tapinfo_t struct address to each registration and removal
routine.

All of the tap registration and removal routines are called at the same
time. Replace the individual registration tracking booleans with a
central one.

Calling exit() from the GUI is rude. Don't do that.

Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
Reviewed-on: https://code.wireshark.org/review/5318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 01:33:41 +00:00
Gerald Combs ba3bc1e726 VoIP calls tap ID cleanup.
Remove all of the public dummy members from voip_calls_tapinfo_t. Use
pointer arithmetic to generate private, unique IDs instead.

We weren't removing the SUA listener. Do so. Use the correct M3UA ID.

Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
Reviewed-on: https://code.wireshark.org/review/5315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 00:31:19 +00:00
Guy Harris 225c86f7a2 Do the "-z help" processing separately, and do it for Wireshark as well.
Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
before printing the help, but the same is true for some command-line
error messages as well.

Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
Reviewed-on: https://code.wireshark.org/review/5317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-15 00:27:48 +00:00
Guy Harris 99b6afbc28 Add a name field to tap_param, for use in error messages.
Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
Reviewed-on: https://code.wireshark.org/review/5309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:21:57 +00:00
Guy Harris 04ab731933 The registered -z parameter string shouldn't end with a comma.
If it ends with a comma, then, if you don't provide any parameters, you
get a "no such -z statistic" message followed by a list of available
statistics.

If it doesn't end with a comma, then, if you don't provide any
parameters *and* a parameter is required, you get a usage message, which
is more useful - and, in many of those cases, a parameter *isn't*
required.

Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
Reviewed-on: https://code.wireshark.org/review/5308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:06:02 +00:00
Guy Harris 4729e13df7 Add an optional flag and a type for UUID parameters for stat taps.
For future use, with common code to parse the -z argument.

Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
Reviewed-on: https://code.wireshark.org/review/5307
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 19:25:42 +00:00
Guy Harris c3582a6945 There's nothing GTK+ about TShark.
Remove gtk from routine names in CLI taps.

Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
Reviewed-on: https://code.wireshark.org/review/5305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:56:12 +00:00
Guy Harris 4d3c4c4f12 Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].
The intent is to handle more than just command-line arguments; reflect that.

Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
Reviewed-on: https://code.wireshark.org/review/5304
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:52:06 +00:00
Irene Ruengeler 0dae81b6d5 Allow SCTP graphs to resize with the window they're in.
Bug: 10698
Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
Reviewed-on: https://code.wireshark.org/review/5284
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-14 18:51:50 +00:00
Guy Harris a21436eaed tap_ui -> stat_tap_ui.
The old routine had stat_ in the name, as the expectation was that they
were for statistics taps; that's still the expectation, so have stat_ in
the data structure and routine names.

Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
Reviewed-on: https://code.wireshark.org/review/5303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:42:50 +00:00
Guy Harris 7390516f61 For tap UIs, register a list of parameters and some menu information.
The intent here is to centralize more UI information so that we can move
more tap UI stuff to common code.  This is a beginning.

Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
Reviewed-on: https://code.wireshark.org/review/5301
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:31:34 +00:00
Michal Labedzki f1727918ab Translations: Update Polish translation
All messages are translated now.

Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
i wytykania błędów.

Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
Reviewed-on: https://code.wireshark.org/review/5293
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:29:24 +00:00
Michal Labedzki ad1977bc19 Qt: Fix non-translate-able text
Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72
Reviewed-on: https://code.wireshark.org/review/5291
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:27:34 +00:00
Michal Labedzki 6d678fffc5 Qt: Fix typo
Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070
Reviewed-on: https://code.wireshark.org/review/5292
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:27:08 +00:00
Alexis La Goutte 2788df9bb5 Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)
Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f
Reviewed-on: https://code.wireshark.org/review/5283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 09:57:43 +00:00
Gerald Combs f7d91bd29f Qt: Flatten group boxes.
As discussed in change 5185, the "big 3" HIGs discourage the use of
traditional group boxes. Flatten our existing ones.

Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
Reviewed-on: https://code.wireshark.org/review/5263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-12 22:42:46 +00:00
Dario Lombardo 2043c9d0eb Updates in it translation.
Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d
Reviewed-on: https://code.wireshark.org/review/5248
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-12 11:28:18 +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
Alexis La Goutte 502085662f Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation)
Change-Id: I5850b813989bd6ed33263c0fae3aa29e977e82ec
Reviewed-on: https://code.wireshark.org/review/5195
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-08 20:55:03 +00:00
Martin Kaiser 58447619b6 fix a crash in the endpoint dialogue
compile Wireshark with GeoIP enabled
load a USB capture
open Statistics / Endpoints
   the tree is empty, USB is not amongst the selected Enpoint Types
select USB in the Endpoint Types list
-> crash

to fix this, add a NULL check for cur_tree to EndpointDialog::tabChanged()

Change-Id: I43d963ae5cd451120ac354e89e37ccbbbc2c5910
Reviewed-on: https://code.wireshark.org/review/5192
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-08 14:19:46 +00:00
Guy Harris 72c70b6abe Call the default language preference setting "Use system setting".
That more correctly describes it - it doesn't do any form of automatic
detection of anything, it just picks up the system settings from
wherever Qt picks them up.

Change-Id: I62d40719728cc9735e3b8f3e4202b7e61fc3f43b
Reviewed-on: https://code.wireshark.org/review/5165
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-07 00:47:32 +00:00
Stephen Fisher 547323b0ba Allow the environment variable RCC to set before running configure to
allow for unusual paths for Qt's rcc program (FreeBSD ports puts it in
/usr/local/lib/qt5/bin).  This matches the existing functionality of the
MOC and UIC variables/programs.

Change-Id: I885d61bce54d9e893e0c2fc496a9ff767a096ae6
Reviewed-on: https://code.wireshark.org/review/5139
Petri-Dish: Stephen Fisher <stephenfisher@centurylink.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-11-05 19:24:30 +00:00
Michal Labedzki 1af7c2b838 Qt: Simplify disabling entries in ContextMenu
We have direct access to every entry (action) in ContextMenu.
Use it instead of storing "actions" and checking its name.

Change-Id: I97a1723898409faf13280c5655b7738661ab594b
Reviewed-on: https://code.wireshark.org/review/5135
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-05 12:58:02 +00:00
Michal Labedzki 5025bc258c Qt: Dynamic languages
- get language as soon as possible (before creating any Qt objects) to make all
  translations working
- dynamic list of supported languages
- runtime change of GUI language (no need to restart application)
- add flags icons support
- search for *.qm languages in buildin resources, then
  data dir called "languages" (main directory in sources or
  /usr/share/wireshark/languages), then user directory
  (UNIX: ~/.wireshark/languages); "languages" directory should contains
  files wireshark_xx.qm where xx is language code (en, en_GB, etc.),
  and optional xx.svg for flag icon
- try to fix some untranslated manually-created UI items
  (need manual reset text of those components)

Change-Id: I62ca8a8cddce47cec9dbcad6b0bd68b6cfd92229
Reviewed-on: https://code.wireshark.org/review/5041
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-04 08:21:55 +00:00
Pascal Quantin e4c257a169 Qt: fix what seems to be a copy/paste error in MainWindow::loadWindowGeometry() (Coverity CID 1158563)
Change-Id: Iaa2a6367fbb434514751e0ed4f273f883798ce8a
Reviewed-on: https://code.wireshark.org/review/5066
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-03 07:32:29 +00:00
Pascal Quantin 1a2fcc51c3 Qt: fix a potential memory leak FollowStreamDialog::follow() found by Coverity (CID 1159304)
Change-Id: I53709c6729c6d9156d2ba5ccd83e92bc27433e26
Reviewed-on: https://code.wireshark.org/review/5065
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-03 07:31:17 +00:00
Gerald Combs cfdd207508 Qt: Limit the amount of Follow Stream text.
QTextEdit + QTextDocument don't handle large amounts of data very well.
Truncate our displayed text after 2 MB.

Change-Id: I0b549a0b05a490272bc0d34af0f2c6661c548d0f
Reviewed-on: https://code.wireshark.org/review/5042
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-01 16:57:24 +00:00
Michal Labedzki 54ae596ed9 Translations: Update Polish translation
Still not complete, but almost complete.

Change-Id: I6e793c4f6648b423a42841347d22073c0b079767
Reviewed-on: https://code.wireshark.org/review/5040
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-01 11:24:02 +00:00
Michal Labedzki 6f3d91f27d Qt: Fix build with Qt < 4.8
Change-Id: I13d4addb16c5c2790703feb63666367d39f36682
Reviewed-on: https://code.wireshark.org/review/5039
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-01 11:23:47 +00:00
Gerald Combs 2bd1d46734 Qt: Better Follow Stream hints.
Show the client and server colors in the hint text.

Change-Id: Iddcda8c3f4f7dc0d8919749aeffc8c09c6445c17
Reviewed-on: https://code.wireshark.org/review/5035
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-31 23:13:56 +00:00
Gerald Combs 5a71cfddf3 Qt: Disable our widgets while tapping.
Prevents a crash when changing the spinbox value during the middle of a
follow.

Change-Id: I07cea883c72c5975633e4b7046155f9b6de9cc4a
Reviewed-on: https://code.wireshark.org/review/5034
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-31 22:53:53 +00:00
Stig Bjørlykke 0347ff9d06 Remove unused RA_PYTHON_REGISTER and RA_PYTHON_HANDOFF.
Change-Id: Ia2bccb46be79a934dce447ec04dd81e12df9e131
Reviewed-on: https://code.wireshark.org/review/5021
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-31 12:10:59 +00:00
Jeff Morriss 4210a8cbed Replace one more isprint() with g_ascii_isprint().
Change-Id: I7d49b0d250a5918a7437a524492e834588c6c8cf
Reviewed-on: https://code.wireshark.org/review/4999
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-30 16:56:48 +00:00
Gerald Combs 451f7f04d5 Qt: Better protocol highlight colors.
Use the "Window" palette colors for protocol-level highlighting.

Change-Id: Ife55d70041aa12110a00782d790be0d747b32562
Reviewed-on: https://code.wireshark.org/review/4979
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-29 00:16:01 +00:00
Gerald Combs c5e66b172e Qt: Add a set of 2x 24-pixel toolbar icons.
Add a script to create each PNG from its source SVG using Inkscape
(which can conveniently be run from the command line).

Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6
Reviewed-on: https://code.wireshark.org/review/4964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-28 00:40:16 +00:00
Gerald Combs 84f0ce4e23 Qt: Add bits display support to the byte view.
Add todo items for showing and hiding the offset, hex/bits, and
ASCII/EBCDIC sections and adding UTF-8 support.

Change-Id: Ia40faf3f939ef1a8fca6fac827057bd89045482a
Reviewed-on: https://code.wireshark.org/review/4949
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-27 17:33:05 +00:00
Gerald Combs 1c159818fd Qt: ByteViewText hover information.
When the user hovers over a byte view field, highlight it and show a
description in the status bar.

Add a "byte" status bar context and fix a label stack pop bug.

Keep proto_find_field_from_offset from matching generated items.
Otherwise hovering and selecting finds things like GeoIP entries and
checksum validation information. This affects the GTK+ UI as well.

Change-Id: Ic81c0d8159510a72d30c41f961807d8a48d05e16
Reviewed-on: https://code.wireshark.org/review/4943
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-27 02:05:13 +00:00
Gerald Combs 155c939bb9 Use better theme-derived colors. Switch back to AlternateBase for
protocol-level highlighting.

Change-Id: I3de3442885b93093c3a4f5341080713a2039cd4c
Reviewed-on: https://code.wireshark.org/review/4933
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-26 00:30:57 +00:00
Gerald Combs 1a45f1848f More offset color adjustments.
Change-Id: I52cf406443988624fb0e4a9e180963c599c8b91d
Reviewed-on: https://code.wireshark.org/review/4928
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-25 20:06:35 +00:00
Gerald Combs 3d2ec1613b Qt: ByteViewText fixups.
Calculate our X coordinate using floating point arithmetic. This should
hopefully fix the wierd subpixel text shifting for some font sizes.

Add alpha blending convenience routines to ColorUtils. Use them to
create the offset colors. The button color palette wasn't working very
well under Ubuntu.

Use QFontMetricsF::lineSpacing for our line height.

Note that we don't support the BOLD gui.hex_dump_highlight_style
preference. Leave a hint for anyone wishing to do so. Comment out
related code for now.

Change-Id: Ief77c9c8d00e05560cae6ecd781bd309027f6f5a
Reviewed-on: https://code.wireshark.org/review/4927
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-25 19:39:36 +00:00
Dario Lombardo 88d1bba17d Italian translation fixes
Change-Id: I1dec07f6a3e721a4f35c8cde2da136e34d8e4cb2
Reviewed-on: https://code.wireshark.org/review/4915
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-25 09:12:01 +00:00
Gerald Combs ceff4edbf0 Qt: Refactor ByteViewText.
Instead of subclassing QTextEdit and filling it with the entire contents
of our tvbuff, subclass QAbstractScrollArea and draw text by hand only
when needed. The new code should be *much* faster.

Some code based on QHexView by Even Teran
(https://code.google.com/p/qhexview/).

To do:
- Finish the bit view implementation.

Change-Id: Ie44de6870d80711cd44324521a17ab76bcefe5e5
Reviewed-on: https://code.wireshark.org/review/4922
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-24 22:58:46 +00:00
Guy Harris 97a920cb21 Don't free global_capture_opts.ifaces_err_info.
Leave it around in case InterfaceTree::display() gets invoked without an
intervening call to scan_local_interfaces() (that would cause a
double-free) or in case scan_local_interfaces() gets called afterwards
(as it frees global_capture_opts.ifaces_err_info before setting it
again, so there's no leak there, but there would be a double-free).

This should prevent at least one crash I've seen.

Change-Id: Iedd3959b420c09971557c473cc87aefd4454078c
Reviewed-on: https://code.wireshark.org/review/4917
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-23 10:27:57 +00:00
Gerald Combs e2bece7733 Qt: Show / hide main widgets.
Remove existing code which uses the visibilityChanged signal. It exists
in QToolbar but not QWidget. Use the actions to drive visibility
instead.

Update MainWindow::layoutPanes to respect "recent" settings.

Move the show / hide actions to the top of the View menu to match GTK+.

Change-Id: I670682e2a094945dbd36c80f43cd14515bbca5a6
Reviewed-on: https://code.wireshark.org/review/4911
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-10-22 17:55:18 +00:00
Michael Mann 527796b4ff Refactor pinfo->circuit_id behavior for ISUP dissector
Change-Id: Idf6e68c53a0a2126f3906bbfa16166821735fc1b
Reviewed-on: https://code.wireshark.org/review/4904
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22 04:53:49 +00:00
Gerald Combs 9ddbc8de77 Qt: Fill in time display menu items. Other fixes and updates.
Reselect the current packet when we redraw the packet list.

Don't crash if we try to mark when no frame is selected. Try to
invalidate cached packet list strings when needed. Rename
PacketList::updateAll to redrawVisiblePackets so that its purpose is
more clear. When changing the font size, call redrawVisiblePackets
instead of rebuilding the entire list of visible rows.

Change-Id: I6e7a15067e7063d0efc26082170e1795ae3c0779
Reviewed-on: https://code.wireshark.org/review/4901
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 23:32:21 +00:00
Guy Harris 7522497b67 With CMake, define WANT_PACKET_EDITOR in config.h.
Just as we do with autotools and nmake, define it in config.h, so it's
defined the same for every single file, rather than defining it in one
particular directory's Makefiles, so that it's defined for some code but
not all.

Change-Id: Ic41cd10f2b502e0be76c134cbeaad94dff7623f8
Reviewed-on: https://code.wireshark.org/review/4891
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-21 05:29:48 +00:00
Guy Harris 77f969958c Fix support for writing out edited records.
Add a cf_set_frame_edited() routine to set the record header and data
for a record; have it do all the non-GUI work, and have it set the
file's "unsaved changes" flag.

Have the GUI code just call that routine and then update the title bar
to reflect the unsaved changes.

While we're at it, unmark a no-longer-unused argument to save_record().

Change-Id: Ieb513fdf423b388519527621ecec4cf634b98caf
Reviewed-on: https://code.wireshark.org/review/4885
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 21:37:41 +00:00
AndersBroman 9d1afef1df isdigit -> g_ascii_isdigit to make the build work.
Change-Id: I670b7b83976a9db9491e017015d570a4dc8f433d
Reviewed-on: https://code.wireshark.org/review/4771
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-17 08:52:10 +00:00
Guy Harris 87545f39da Remove unnecessary includes of <ctype.h>.
Change-Id: I8eacec5fa8d57b10d40a3627197461dae89c6cb2
Reviewed-on: https://code.wireshark.org/review/4768
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:57:41 +00:00
Guy Harris f90d8dcbbb Use g_ascii_isspace() instead of isascii() && isspace().
This eliminates one more use of <ctype.h> macros; we're using
g_ascii_isXXX() instead of isXXX() elsewhere.

Change-Id: I184caeefab95dda2cf207acf9539eabbd7c32a51
Reviewed-on: https://code.wireshark.org/review/4767
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:54:54 +00:00