Commit Graph

667 Commits

Author SHA1 Message Date
Guy Harris 1fb476bf9f Have to include config.h before including headers that use #defines,
such as HAVE_LIBPCAP, from config.h.

svn path=/trunk/; revision=53583
2013-11-25 22:01:03 +00:00
Guy Harris e2735b15e0 No libpcap, no capturing, no capture interfaces. Ifdef the entire
capture interfaces dialog code, *and* the code that calls it, under
HAVE_LIBPCAP.

Still more stuff to remove from the no-pcap UI, such as the Capture
menu, the capture filter in the main window, and the list of interfaces
in the main window.

svn path=/trunk/; revision=53582
2013-11-25 21:50:58 +00:00
Alexis La Goutte 393c769597 From Thomas ERSFELD (GSoC13) and me : Try to fix OSX-10.5-x86 (without pcap...) Buildbot
svn path=/trunk/; revision=53572
2013-11-25 17:01:10 +00:00
Alexis La Goutte d4c4e24351 Try to fix OSX-10.6-x64 Buildbot
svn path=/trunk/; revision=53568
2013-11-25 15:56:22 +00:00
Alexis La Goutte 056a5edc21 Comment debug...
svn path=/trunk/; revision=53567
2013-11-25 15:43:16 +00:00
Alexis La Goutte 34d7df78cc From Thomas ERSFELD (GSoC13) : Try to fix Windows buildbot
svn path=/trunk/; revision=53566
2013-11-25 15:43:08 +00:00
Alexis La Goutte 43b1f47695 From Thomas ERSFELD (GSoC13) : Add Capture interface dialog window
* Reuse sparkline from welcome
* Split settings in tab (!= GTK)
* No all feature work (Work In Progress...)
* ...

Comments (and review) are welcome !

svn path=/trunk/; revision=53563
2013-11-25 14:15:49 +00:00
Jakub Zawadzki 6aec20c782 Rmove packet_info argument from packet_list_append(), never used.
Part of attachment 12060, from Didier Gautheron (bug #9419).

svn path=/trunk/; revision=53544
2013-11-24 12:49:50 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Gerald Combs b3a24c5cc4 Replace similar code with a common routine.
svn path=/trunk/; revision=53519
2013-11-23 01:06:30 +00:00
Gerald Combs 213d47a82e Fix packet list selection signaling.
It looks like resetting the packet list model during freezing and
thawing disconnects the selection changed signal between the model and
the main window. Rename the packet list's setMenusFollowStream signal to
packetSelectionChanged and use it to trigger menu updates in the main
window.

svn path=/trunk/; revision=53516
2013-11-22 17:59:15 +00:00
Gerald Combs 779f95ab61 Make the "decode as" dialog modal (for now, at least).
svn path=/trunk/; revision=53515
2013-11-22 17:53:25 +00:00
Alexis La Goutte 6e2b1c91f4 Fix typo in top filename
svn path=/trunk/; revision=53505
2013-11-22 08:53:05 +00:00
Gerald Combs 635a5b196c Fix qmake builds on Unix.
tap_register.variable_out adds wireshark-tap-register.c to SOURCES. We
don't have to add it again ourselves.

svn path=/trunk/; revision=53502
2013-11-22 02:11:40 +00:00
Gerald Combs 629d5f1697 Mark a parameter unused.
svn path=/trunk/; revision=53501
2013-11-22 01:25:17 +00:00
Gerald Combs 78266fe17e Add an initial "Decode As" dialog. Currently read-only.
Fixup some of the Statistics menu items.

svn path=/trunk/; revision=53499
2013-11-22 01:07:36 +00:00
Gerald Combs fd51955989 Tap listeners have to be registered before we read our prefs.
svn path=/trunk/; revision=53491
2013-11-21 20:24:01 +00:00
Guy Harris a1f2a76427 #if 0 out some currently-unused variables and the code that sets them,
to squelch compiler warnings.

svn path=/trunk/; revision=53485
2013-11-21 18:48:36 +00:00
Michael Mann 64c687346b Remove packet_info->ipproto and packet_info->ethertype uses in the GUI. Convert to walking packet protocol list looking for desired protocols.
I may eventually switch this to use proto_* values instead of strings, but just the addition of the loop is more jarring as compared to the simple comparing of ip or ethernet values.  But it should lead to a smaller (less protocol specific) packet_info structure.

svn path=/trunk/; revision=53476
2013-11-21 16:42:10 +00:00
Michael Mann 2e983ba89f Revert what I thought was a simple "compile" change for r53473, but causes Wireshark to crash at startup.
svn path=/trunk/; revision=53474
2013-11-21 12:46:31 +00:00
Michael Mann ad1d471b1b Walk list of protocol strings to determine which protocols are present in a packet rather than rely on protocol specific items in packet_info in an effort to (eventually) reduce packet_info members.
svn path=/trunk/; revision=53473
2013-11-21 12:16:49 +00:00
Guy Harris 0604779baa Add ui_stats_tree_dialog.h to the list of generated headers not to
install; that should fix the "make distclean" errors.

svn path=/trunk/; revision=53469
2013-11-21 05:55:30 +00:00
Gerald Combs daa8b5e046 Fix buildbing ui/qt/wireshark-tap-register.c with autotools.
svn path=/trunk/; revision=53467
2013-11-21 02:12:56 +00:00
Gerald Combs 26325020a2 Try to get qmake to create wireshark-tap-register.c.
svn path=/trunk/; revision=53466
2013-11-21 02:05:36 +00:00
Gerald Combs ea28298e96 Add a statistics tree dialog.
Add menu items for each corresponding item in gtk/main_menubar.c that
calls gtk_stats_tree_cb(). Hopefully that's everything. Note that we use
quite a bit less code than the GTK+ flavor and why we might not want to
do that. Change a few things in ui/qt/CMakeLists.txt to more closely
match the GTK+ version. Add plumbing for tap registrations in
CMakeLists.txt and Makefile.am. Add the ability to copy text as CSV or
YAML.

svn path=/trunk/; revision=53464
2013-11-21 01:28:17 +00:00
Gerald Combs 80db2d0ade Print one YAML item per packet.
svn path=/trunk/; revision=53439
2013-11-19 20:29:58 +00:00
Guy Harris 06098fce7b Add routines to set the personal file directory paths (personal
configuration file directory and directory in which to save captures),
have the routine to parse -P options use them, and move that routine to
libui.

Have that routine just return a gboolean.

svn path=/trunk/; revision=53435
2013-11-19 19:45:38 +00:00
Martin Kaiser 3d0c92e017 fix compiler warning about write-only variable
svn path=/trunk/; revision=53426
2013-11-19 07:05:34 +00:00
Guy Harris f089b4cd9d #if 0 out an error check that wasn't doing anything interesting for an
error, and put in a pseudo-code call to stand in for error reporting
code.

Fix a signed-vs-unsigned comparison issue.

svn path=/trunk/; revision=53422
2013-11-19 00:29:37 +00:00
Gerald Combs 45fc7b65e0 Follow dialog data display improvements.
Change the "Raw" character type to UTF-8. I'm not sure it's possible
to show true raw data in a QTextEdit widget and calling it UTF-8 more
accurately repesents what happens when you pass a char * to a QString.
Add a YAML display. Hopefully Scapy users will find it useful.

Sort the the character display items alphabetically. Make sure we go
back to the top of the buffer when we change the direction or character
set. Be less aggressive about setting focus on the "find text" entry.

svn path=/trunk/; revision=53421
2013-11-18 23:39:47 +00:00
Alexis La Goutte 0bae995e39 Remove duplicate (wireshark_application.h) and unused #include files
svn path=/trunk/; revision=53413
2013-11-18 20:26:27 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Gerald Combs de4c6a2d07 Reset data_out_file when we close it. Add comments and fixup whitespace.
svn path=/trunk/; revision=53343
2013-11-15 20:25:33 +00:00
Gerald Combs 1868bd172b When we freeze the packet list disconnect its model.
This matches the GTK+ behavior and keeps us from dissecting TCP packets
out of order when we follow a TCP stream.

svn path=/trunk/; revision=53342
2013-11-15 20:24:56 +00:00
Gerald Combs 230ac546fe Apply the changes from r52506. Fixes bug 9044 for the Qt port.
svn path=/trunk/; revision=53340
2013-11-15 17:02:20 +00:00
Gerald Combs afd79c323e Add a "to do" item.
svn path=/trunk/; revision=53335
2013-11-15 00:30:07 +00:00
Gerald Combs 1745e131fc Create a plural-only English translation. Use it to pluralize the Follow
Stream and Flow Graph hint statistics.

svn path=/trunk/; revision=53326
2013-11-14 22:35:10 +00:00
Gerald Combs ea849c7662 Fix preprocessing logic.
svn path=/trunk/; revision=53324
2013-11-14 22:18:58 +00:00
Gerald Combs ccb6da1058 Fix automake compilation.
svn path=/trunk/; revision=53315
2013-11-14 18:55:50 +00:00
Gerald Combs 190bdc32de Add packet information and selection to the Follow Stream dialog.
Collect packet numbers when following streams so that we can correlate
text positions with packets. Add a FollowStreamText class so that we can
track mouse events. Add a hint label that shows the packet under the
cursor along with packet counts and the number of "turns".

Add the packet number to the C array dump. Note that dumping to YAML
might be useful for Scapy users.

svn path=/trunk/; revision=53314
2013-11-14 17:37:40 +00:00
Gerald Combs b0063a025b Highlight selected sequence diagram items.
Create a new dialog each time the user follows a stream. A lot of the
follow code seems to assume one and only one dialog so there are likely
outstanding bugs.

Don't use the global cfile (should we deprecate its usage?). We want to
move closer to multiple documents, not further away.

Clean up after ourselves. Free our payload list and unlink our temp
file. Make a bunch of gchar*s QStrings. Make sure our destructor gets
called and use it.

Make member variable and method names more consistent.

svn path=/trunk/; revision=53306
2013-11-13 22:18:01 +00:00
Gerald Combs fd81ae57a6 Highlight selected sequence diagram items.
svn path=/trunk/; revision=53294
2013-11-12 22:50:26 +00:00
Irene Rüngeler ecad809645 Fix segfault bug and show the combo-box.
svn path=/trunk/; revision=53272
2013-11-12 10:22:27 +00:00
Gerald Combs dc93a4b448 Redraw the diagram when needed.
svn path=/trunk/; revision=53264
2013-11-12 01:39:44 +00:00
Gerald Combs fc93c3a7c0 Sequence / flow diagram updates.
Add "Save As..." Add a context menu and keyboard shortcuts. Add a
tooltip.

svn path=/trunk/; revision=53263
2013-11-12 01:08:08 +00:00
Gerald Combs 66bb75dd4e Sequence / flow diagram updates.
Plumb some controls. Adjust dialog layout. Make sure sequence
information is allocated and freed correctly. Remove a debugging
statement.

svn path=/trunk/; revision=53260
2013-11-11 22:00:48 +00:00
Gerald Combs e78924d5a4 Use the correct event filter.
From Richard Moore via bug 9410.

svn path=/trunk/; revision=53239
2013-11-10 17:55:26 +00:00
Jakub Zawadzki 38edae1c71 Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. 

svn path=/trunk/; revision=53184
2013-11-09 10:38:02 +00:00
Guy Harris 853da2eb9b The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.

Rename various functions, #defines, and variables appropriately.

svn path=/trunk/; revision=53166
2013-11-08 09:53:01 +00:00
Guy Harris bf4e84aba6 For open dialogs, offer a list of sets of extensions, not of file types;
.cap, for example, doesn't refer to a particular file type - a whole
bunch of file types use .cap.

Also offer, in addition to "All Files", "All Capture Files", which
matches all the extensions we know about.

svn path=/trunk/; revision=53156
2013-11-08 01:08:42 +00:00