Commit Graph

1370 Commits

Author SHA1 Message Date
Jörg Mayer a206a11e7e include "../util.h" -> include "ui/util.h"
svn path=/trunk/; revision=41048
2012-02-17 12:46:50 +00:00
Michael Tüxen fe30e4ad2e Fix from Irene Ruengeler: Show correct details in the interface dialog on
Windows.

svn path=/trunk/; revision=41042
2012-02-16 20:22:34 +00:00
Anders Broman d0b4fb05f0 From Sean Bright:
Wireshark crashes after editing interface settings from capture options dialog.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6788

svn path=/trunk/; revision=41017
2012-02-13 18:58:14 +00:00
Anders Broman 196e1ab97b Mark an unused parameter.
svn path=/trunk/; revision=41016
2012-02-13 18:50:31 +00:00
Anders Broman c894108aca Edit packet comments
svn path=/trunk/; revision=41013
2012-02-13 17:33:05 +00:00
Anders Broman 6971302a1b Drop count is 64 bits
svn path=/trunk/; revision=41012
2012-02-13 17:31:54 +00:00
Jeff Morriss 95c75fb67a Add edit_packet_comment_dlg.h to the source distribution
svn path=/trunk/; revision=41006
2012-02-12 23:17:01 +00:00
Guy Harris 96b89de3e9 Capitalize the "P" in "Packet" in "Add or Edit Packet Comment". Add
"..." after it, as it pops up a dialog box to let you actually type in a
comment.

Add "Add or Edit Packet Comment" to the menubar's Edit menu.

svn path=/trunk/; revision=41005
2012-02-12 23:09:14 +00:00
Anders Broman ad0df12982 Add a button row.
svn path=/trunk/; revision=41003
2012-02-12 21:15:11 +00:00
Michael Tüxen 8aa280b721 Get it compiling.
svn path=/trunk/; revision=40986
2012-02-12 16:38:47 +00:00
Anders Broman 15d8fe8baa Get the comment and put it in the textview.
svn path=/trunk/; revision=40985
2012-02-12 16:18:25 +00:00
Anders Broman ff4a624dcf Try to make the buildbot happy.
svn path=/trunk/; revision=40983
2012-02-12 15:48:57 +00:00
Anders Broman f78145ca9f Add the edit packet comment menu entry and the empty files
to actually handel the menu to edit the comments.

svn path=/trunk/; revision=40980
2012-02-12 14:56:06 +00:00
Jörg Mayer 18e04269fb Sean Bright <sean.bright@gmail.com>:
In r37159, the following change was made to ui/gtk/rtp_player.c:

@@ -1654,9 +1636,7 @@
        GtkWidget *dialog;

        /* we should never be here if we are in PLAY and !PAUSE */
-       if(!rtp_channels->stop&&  !rtp_channels->pause){
-               exit(10);
-       }
+       g_assert(!rtp_channels->stop&&  !rtp_channels->pause);


The logic, however, was not negated properly.  The correct assertion should be:

        g_assert(rtp_channels->stop || rtp_channels->pause);

With the current code, the RTP player causes a crash for me when pressing the
'Play' button.


svn path=/trunk/; revision=40951
2012-02-10 07:16:27 +00:00
Chris Maynard 4e1637e67c Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h.
svn path=/trunk/; revision=40950
2012-02-10 05:05:17 +00:00
Anders Broman b7c03d8235 From a.piesk:
no menu item Fle->Export->SSL Session Keys in GTK
Ported to 1.7 by me.

#BACKPORT
Use the patch in the bug report.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813

svn path=/trunk/; revision=40937
2012-02-08 19:56:48 +00:00
Stig Bjørlykke dcc82dd2bf Disable the File->Merge... menu item if we cannot save-as,
because this will assert.

svn path=/trunk/; revision=40927
2012-02-08 11:16:30 +00:00
Martin Mathieson 7c166c9c4e Initiliase another variable.
svn path=/trunk/; revision=40917
2012-02-07 11:15:22 +00:00
Martin Mathieson 203d9589f3 Initialise a variable to avoid warning.
svn path=/trunk/; revision=40916
2012-02-07 11:12:17 +00:00
Jörg Mayer d69fe726b9 packet-gsm_sim.c was the wrong file to check in.
I meant ui/gtk/voip_calls_dlg.c.

svn path=/trunk/; revision=40915
2012-02-07 09:06:44 +00:00
Anders Broman b84f2921ac Allways use g_list_prepend().
svn path=/trunk/; revision=40912
2012-02-07 06:56:45 +00:00
Alexis La Goutte 34813d66aa Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40890
2012-02-06 22:02:36 +00:00
Alexis La Goutte ee590fdd58 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40889
2012-02-06 22:02:03 +00:00
Alexis La Goutte 5ff63c0bb9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40888
2012-02-06 22:01:37 +00:00
Anders Broman f9c270e8d2 From Cristian Constantin:
slow voip/sip call flow for large captures.
Add missing update.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6794

svn path=/trunk/; revision=40881
2012-02-06 17:32:37 +00:00
Anders Broman 42b1f365a9 From Cristian Constantin:
slow voip/sip call flow for large captures.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6794

svn path=/trunk/; revision=40878
2012-02-06 17:23:04 +00:00
Jörg Mayer 08478ae3f4 Copy over rev 40874 to gtk3
svn path=/trunk/; revision=40875
2012-02-06 11:22:21 +00:00
Ronnie Sahlberg 8537bfbce8 SMB response time stats dissapeared a while ago.
This adds it back.


svn path=/trunk/; revision=40874
2012-02-06 09:39:00 +00:00
Anders Broman 5f891470ac From Cristian Constantin:
Dissable sorting while storing the data.

svn path=/trunk/; revision=40836
2012-02-04 12:22:06 +00:00
Martin Mathieson 1b42caf3b3 Add a link back to previous frame for UM sequence number analysis.
Change a couple of filter names to use "-" rather than "_".  Update
stats window to use changed filter name.

svn path=/trunk/; revision=40822
2012-02-03 10:42:01 +00:00
Jörg Mayer 6a9a596745 Update the list of problems with gtk3 and where to find
win32 builds of gtk3

svn path=/trunk/; revision=40821
2012-02-03 10:27:26 +00:00
Jörg Mayer 0e3ac2fdf0 Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
Stig Bjørlykke 44a9db54e1 No need to set new save icon if equal to previous icon.
svn path=/trunk/; revision=40770
2012-01-30 13:51:04 +00:00
Stig Bjørlykke d86b90ce04 Disable the save-as button in the toolbar if we cannot save-as,
because this will assert.

svn path=/trunk/; revision=40769
2012-01-30 13:05:27 +00:00
Anders Broman 6be62cd753 From Martin Kaiser:
Unused variable in rtp_analysis.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6776

svn path=/trunk/; revision=40747
2012-01-28 15:13:28 +00:00
Chris Maynard 9f8003f490 Fix Coverity CID 1371: UNINIT.
svn path=/trunk/; revision=40728
2012-01-26 15:11:20 +00:00
Michael Tüxen 3d3346bc7e Try to make the buildbots happy.
svn path=/trunk/; revision=40726
2012-01-25 20:26:34 +00:00
Bill Meier 36209e8773 Fix error when building QtShark:
...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters


svn path=/trunk/; revision=40723
2012-01-25 18:03:50 +00:00
Michael Tüxen eca83b8a0c Address warnings reported by Bill.
svn path=/trunk/; revision=40718
2012-01-25 16:32:51 +00:00
Jeff Morriss a122d4616e 'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.
svn path=/trunk/; revision=40716
2012-01-25 14:26:09 +00:00
Michael Tüxen 14b1a44c0f Third try. This time pipes and stdin are supported and the
test scripts are passed.

Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.

svn path=/trunk/; revision=40715
2012-01-25 13:04:32 +00:00
Martin Mathieson 93ac5f499e Use sizeof(buff) as length argument when calling g_snprintf().
svn path=/trunk/; revision=40714
2012-01-25 04:01:33 +00:00
Martin Mathieson cf60b35576 Delete a TODO comment (now that there is an equivalent tshark tap).
svn path=/trunk/; revision=40713
2012-01-25 04:00:25 +00:00
Guy Harris 13bd3bfbaa Note that INIT_DELAY is .1 second.
svn path=/trunk/; revision=40705
2012-01-24 20:32:01 +00:00
Michael Tüxen 4fece25e7f We need a 3rd try. (After learning how to run the testuite on Windows locally).
svn path=/trunk/; revision=40695
2012-01-24 17:12:56 +00:00
Michael Tüxen b0819f5a80 (Try to) make the buildbot happy.
svn path=/trunk/; revision=40694
2012-01-24 16:40:16 +00:00
Michael Tüxen 08d6785412 Second try. This time pipes and stdin are supported.
Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.


svn path=/trunk/; revision=40693
2012-01-24 16:05:26 +00:00
Guy Harris c8854a7a5f Add a routine to Wiretap that takes a file type value and an
encapsulation value and returns a GArray containing all the file types
that could be used to save a file of that file type and that
encapsulation value (which could be WTAP_ENCAP_PER_PACKET), with the
input file type first if that can be used and pcap or pcap-ng first if
not and if one of them can be used, and with pcap and pcap-ng clustered
together if they're among the file types that can be used.

Use that routine for the GTK+ file save dialog.

svn path=/trunk/; revision=40685
2012-01-24 04:33:23 +00:00
Jeff Morriss c5be5ec99c Finish wrapping heuristic dissector functions in #if conditionals; change the condition to check if HEUR_DISSECTOR_LIST is defined.
svn path=/trunk/; revision=40671
2012-01-23 20:40:16 +00:00
Guy Harris 77005f2a8c Put back the #include changes from a previous commit.
svn path=/trunk/; revision=40670
2012-01-23 20:31:42 +00:00
Anders Broman 008dd26ff5 Remove a debug statement.
svn path=/trunk/; revision=40668
2012-01-23 19:48:05 +00:00
Anders Broman 2b95c6601e Add the code to add a Heuristics protocol page.
#if 0:d out for now.

svn path=/trunk/; revision=40667
2012-01-23 19:47:13 +00:00
Anders Broman dcf10c7c10 Not working Conversation Filter in (analyse menu)
(Fix the path to the fileter menu.)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6751

svn path=/trunk/; revision=40661
2012-01-23 17:55:52 +00:00
Michael Tüxen 2e6455f3c7 Get make checkapi working again.
svn path=/trunk/; revision=40625
2012-01-21 11:45:57 +00:00
Chris Maynard 80087898ea Convert forward slashes in URI to backslashes if WIN32. Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237
svn path=/trunk/; revision=40615
2012-01-20 21:20:53 +00:00
Michael Tüxen cb470474ab Add icons for pipe interfaces. This allows for easier
testing the upcoming patch, which improves the
infrastructure to handle interfaces for capturing.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=40583
2012-01-19 13:02:32 +00:00
Guy Harris 9465e9f0fa Another change for the recent changes (in both senses of "recent
changes" :-)).

svn path=/trunk/; revision=40566
2012-01-18 20:38:51 +00:00
Guy Harris 5263048b9b Reflect the move of recent.c from ui/gtk to the top-level directory.
svn path=/trunk/; revision=40565
2012-01-18 20:23:30 +00:00
Guy Harris 7f38dd5903 Another fix for the move of recent.h to the ui directory.
svn path=/trunk/; revision=40564
2012-01-18 20:11:06 +00:00
Guy Harris dacb4133e8 Restructure the recent file code so that recent.c is GUI-independent;
move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

svn path=/trunk/; revision=40561
2012-01-18 19:38:34 +00:00
Guy Harris 375399181c Reflect the move of simple_dialog.h to the ui directory.
svn path=/trunk/; revision=40533
2012-01-16 01:31:08 +00:00
Guy Harris 21ddeed32b Reflect the move of the top-level win32 directory into the ui directory.
svn path=/trunk/; revision=40532
2012-01-16 01:29:08 +00:00
Guy Harris d7b2aad043 Move some headers for UI stuff, and the alert_box.c UI-specific file, to
the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

svn path=/trunk/; revision=40529
2012-01-16 01:07:52 +00:00
Bill Meier a28901b226 Fix a typo in a comment ....
svn path=/trunk/; revision=40527
2012-01-15 23:26:23 +00:00
Jörg Mayer fc9d227e3f Missed another .. -> ../.. case
svn path=/trunk/; revision=40524
2012-01-15 23:07:44 +00:00
Jörg Mayer 89ac6f314f More .. -> ../.. changes after gtk/ move
svn path=/trunk/; revision=40523
2012-01-15 22:40:03 +00:00
Jörg Mayer ef356ef2ef More .. -> ../.. changes after gtk/ move
svn path=/trunk/; revision=40522
2012-01-15 22:22:28 +00:00
Jörg Mayer 308a103931 Clean up after gtk/ move: Makefile.am.inc is now at ../..
svn path=/trunk/; revision=40521
2012-01-15 22:12:28 +00:00
Jörg Mayer 32ea7ecc41 Add back revision 40517 which got lost during gtk/ move
svn path=/trunk/; revision=40520
2012-01-15 22:09:43 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00