osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
39,050 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

132 Commits

Author SHA1 Message Date
Michael Tüxen ed68db6e5d Fix tooltips (There is a hidden column). 
svn path=/trunk/; revision=41051
 2012-02-17 16:48:55 +00:00
Jörg Mayer a206a11e7e include "../util.h" -> include "ui/util.h" 
svn path=/trunk/; revision=41048
 2012-02-17 12:46:50 +00:00
Jörg Mayer 35508464b2 Start moving files to ui/ and ui/cli/ 
svn path=/trunk/; revision=41047
 2012-02-17 12:30:27 +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
Bill Meier b28fe4d079 When building QtShark on Windows: Don't (re)compile Wireshark .c files 
svn path=/trunk/; revision=40933
 2012-02-08 18:51:01 +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
Jörg Mayer 84f869cb2e Add the magic incantation to get icons into the cmake build. 
No idea why the qtcreate build worked without this.
See http://developer.qt.nokia.com/doc/qt-4.8/resources.html

@Gerald: I've most likely put this into the wrong place, please
  verify/fix.

Thanks to Alexander Neundorf for spotting this and proposing a
fix.

svn path=/trunk/; revision=40841
 2012-02-04 14:27:14 +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
Jörg Mayer e41766e4bb Rename the binary Wireshark -> qtshark 
svn path=/trunk/; revision=40832
 2012-02-04 10:02:40 +00:00
Jörg Mayer 0d0b51e56b Don't forget about the .qrc files. 
There is nothing to install for the qt gui right now.

svn path=/trunk/; revision=40826
 2012-02-03 17:40:55 +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 d987442264 Add a comment about automoc (but don't use it as this would 
force everyone to use a rather recent cmake).

svn path=/trunk/; revision=40815
 2012-02-02 21:33:37 +00:00
Jörg Mayer 33b8433336 Fix make install for qtshark. 
svn path=/trunk/; revision=40814
 2012-02-02 21:21:04 +00:00
Jörg Mayer c3dea73ade Make out-of-tree builds work. 
svn path=/trunk/; revision=40809
 2012-02-02 12:38:04 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because 
a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

svn path=/trunk/; revision=40807
 2012-02-02 12:04:22 +00:00
Jörg Mayer f628ed7aec Update svn:ignore for existing qtshark build process 
svn path=/trunk/; revision=40805
 2012-02-02 08:55:00 +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
Bill Meier 781d224ada Fix some Windows qmake and Qt Wireshark build issues: 
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.


svn path=/trunk/; revision=40797
 2012-02-01 21:47:31 +00:00
Bill Meier 60eca2a2eb Fix a typo 
svn path=/trunk/; revision=40795
 2012-02-01 21:24:08 +00:00
Bill Meier cf24e97617 Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files. 
svn path=/trunk/; revision=40781
 2012-01-30 23:55:34 +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
Bill Meier 4308ba7dc5 Rework Windows Wireshark Qt build configuration a bit: 
1. Compile and link with (almost exactly) the same options as used
   when building Windows Wireshark Gtk.
   The options used allow debugging of the exe using Visual Studio exactly
   as is done for Wireshark Gtk.
   Essentially: configure the "release" version to compile and link with
   symbols.  (See ui\qt\QtShark for the details).

2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
   which is linked against the "release" Qt libraries.
   (IOW: don't create a "debug" Makefile).

3. Remove unused variable assignments from config.pri.
   (They can be added back if needed in the future).


svn path=/trunk/; revision=40768
 2012-01-30 04:37:12 +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