Commit graph

67 commits

Author SHA1 Message Date
Bill Meier
7b01915b6b Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31730
2010-01-29 16:13:26 +00:00
Stig Bjørlykke
0dbfde8b6d Removed some unused variables and unused assignments.
svn path=/trunk/; revision=30918
2009-11-10 12:05:25 +00:00
Anders Broman
85d8b896a6 From Didier Gautheron:
- memory leak, free the list after walking it, ie free a NULL list, ie free nothing. I've only fixed bugs introduced by me with GTKCList to TreeView modifs, it seems there's the same bug in gtk/dlg_utils.c.

svn path=/trunk/; revision=30421
2009-10-09 09:06:22 +00:00
Anders Broman
4d52b3aa83 From Didier Gautheron:
- Display number with a space as thousand separator.
- Move functions use both by conversations and hostlist in gui_utils.c, they may be useful for other taps too.

svn path=/trunk/; revision=30416
2009-10-09 08:52:36 +00:00
Anders Broman
1f34437271 From Didier Gautheron:
conversations table leaks hash keys memory on close.
Modified by me to use g_hash_table_new_full().

svn path=/trunk/; revision=30396
2009-10-08 07:56:48 +00:00
Anders Broman
b42fda0fd2 From : Didier Gautheron
gtktreeview for conversations:
- use a garray rather than g_realloc memory for conversations list.
- use a hashtable for finding conversation rather than a linear search.

Notes:
- sorting is too slow, I disabled it.
- the dialog box is really a big problem because it's also empty the idle event queue, slow down a lot.
- Test on a 1.5M packets with hundred thousands conversations capture, slow but bearable.

svn path=/trunk/; revision=30353
2009-10-06 07:44:48 +00:00
Kovarththanan Rajaratnam
8c48c6835f Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
Anders Broman
135ca5136f Change window_new() to dlg_window_new() and destroy the window with the top level window.
svn path=/trunk/; revision=28796
2009-06-21 20:42:07 +00:00
Guy Harris
cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Bill Meier
e63e93b27e -As suggested by Jakub Zawadzki: use sizeof(...) rather than a numeric constant in various places;
Also: 
 - Change ct_port_to_str to be slightly simpler and more efficient;
 - Change indentation to be consistent;

svn path=/trunk/; revision=27798
2009-03-19 17:44:57 +00:00
Stig Bjørlykke
8608c8f1de Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26641
2008-10-31 09:53:56 +00:00
Stig Bjørlykke
b4d9a5c868 Bring the windows to front when rescanning of packets are done.
svn path=/trunk/; revision=26436
2008-10-13 18:16:35 +00:00
Jeff Morriss
dd6a15e1c7 Don't put (non-extern'd) prototypes for protect_thread_critical_region() and
unprotect_thread_critical_region() in every module in gtk/: instead have those
modules include main.h (which has the properly extern'd prototype).

This should fix the link error on HP-UX described in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2702

svn path=/trunk/; revision=25933
2008-08-05 17:33:14 +00:00
Bill Meier
56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Stig Bjørlykke
860028c634 Removed the usage of topic_available() as we now have all topics.
svn path=/trunk/; revision=25505
2008-06-21 13:36:31 +00:00
Stig Bjørlykke
c89675bf8f - Use the common function for applying a selected filter.
- Allocate data for filter string instead of using a static array.

svn path=/trunk/; revision=25315
2008-05-17 23:03:17 +00:00
Ulf Lamping
0b97c4211e sort #includes by directories
svn path=/trunk/; revision=24967
2008-04-13 00:55:59 +00:00
Ulf Lamping
d4ccf577a8 where it's not necessary, remove #include "compat_macros.h"
svn path=/trunk/; revision=24922
2008-04-12 01:02:59 +00:00
Ronnie Sahlberg
154e8f0892 add missing braces to unbreak the build
svn path=/trunk/; revision=24916
2008-04-11 23:12:24 +00:00
Ulf Lamping
9af9a0e619 first round to replace SIGNAL_CONNECT with g_signal_connect
This requires some casts to be added and I just don't want to add casts at all possible places. So I compile and only add casts where the (MSVC) compiler has a hard time. 

Unfortunately this won't find any problems in Linux/Unix only code - I'll keep an eye on the buildbot and try to fix things as I'm going on ...

svn path=/trunk/; revision=24912
2008-04-11 21:20:51 +00:00
Ulf Lamping
a471e1af90 replace ITEM_FACTORY_ENTRY and ITEM_FACTORY_STOCK_ENTRY with their required data values to build the menus
svn path=/trunk/; revision=24909
2008-04-11 20:21:05 +00:00
Ulf Lamping
4de04eae27 replace CHECK_BUTTON_NEW_WITH_MNEMONIC with gtk_check_button_new_with_mnemonic
svn path=/trunk/; revision=24905
2008-04-11 19:04:34 +00:00
Bill Meier
10f2ea11d5 OBECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24894
2008-04-11 16:26:32 +00:00
Stephen Fisher
a398bebdaf Remove GTK1 code and change ugly version checking statements into
GTK_CHECK_VERSION().


svn path=/trunk/; revision=24826
2008-04-07 03:46:01 +00:00
Stig Bjørlykke
43272f9435 Added an option to Conversations and Endpoints to limit the list to match
the current display filter.

Some Hosts -> Endpoints cleanup.

svn path=/trunk/; revision=24368
2008-02-17 00:35:55 +00:00
Stig Bjørlykke
89693ff729 Avoid double space in filter when creating from conversations and endpoints.
svn path=/trunk/; revision=24299
2008-02-11 11:06:35 +00:00
Stig Bjørlykke
59a76191b4 Added SCTP Endpoints table.
Display port number in SCTP Conversations table.
Get correct display filter from SCTP Conversations.
Arrange Conversations and Endpoints tabs alphabetically.

svn path=/trunk/; revision=24291
2008-02-08 12:33:26 +00:00
Guy Harris
7c03d14d60 Add macros for various filter actions, types, and directions, and to
combine them into a callback argument and split a callback argument up.

svn path=/trunk/; revision=23815
2007-12-09 09:04:39 +00:00
Stig Bjørlykke
d3c4d1b221 Do not create an illegal filter when having an empty display filter and
selecting Apply/Prepare "and/or (not) Selected" in Conversations, Endpoints
and Service Response Time.

svn path=/trunk/; revision=23756
2007-12-04 23:47:30 +00:00
Guy Harris
353d921d66 Clean up indentation.
svn path=/trunk/; revision=23745
2007-12-04 07:50:44 +00:00
Gerald Combs
dfb104544f Add relative start time, duration, and average data rate (bps) columns
to the conversation lists. Move the "copy" button down to the button bar
in order to free up some real estate. Add an nstime_cmp() function. Clean
up code in a few places.

svn path=/trunk/; revision=23516
2007-11-20 18:35:41 +00:00
Anders Broman
4093b817c6 Apply yet another set of the optimization patches:
there's two structures with the same name conversation_t, change one to conv_t

svn path=/trunk/; revision=23423
2007-11-10 16:09:10 +00:00
Guy Harris
5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Sebastien Tandel
76729e5d0f From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975
2007-05-29 02:43:18 +00:00
Ronnie Sahlberg
17b4ee556b From Jon Smirl
support for USB conversations



svn path=/trunk/; revision=21179
2007-03-25 11:27:29 +00:00
Stephen Fisher
8aeefa1bfd Fix for bug #1278:
"When analysing a trace with 802.11 packages (made by airpcap) and selecting
Statistics->Conversation List->WLAN all wlan conversations are listed. When
after this selecting Apply as filter->Selected->A<->B a display filter is
created as

eth.addr==<A>  && eth.addr==<B>

when if should be

wlan.addr==<A>  && wlan.addr==<B>"


svn path=/trunk/; revision=20234
2006-12-29 22:22:54 +00:00
Ulf Lamping
a1b7a22a8e from Stephen Fisher:
Here is a patch for spelling typos in comments and strings in the gtk/ 
directories.

svn path=/trunk/; revision=19568
2006-10-17 01:29:55 +00:00
Ronnie Sahlberg
89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Anders Broman
ac21800c67 From Greg Morris:
- Change to display NCP connection for each conversation
- New NCP Endpoints. Please apply
expert_comp_table
- Use local variable space instead of pointer. The previous implementation utilized pointers and the values would change the table data.

svn path=/trunk/; revision=17446
2006-03-02 20:50:33 +00:00
Jaap Keuter
613d04a1ce Cleaning up copy to CSV code
svn path=/trunk/; revision=17064
2006-01-20 19:56:02 +00:00
Gilbert Ramirez
c5db51da2d From Greg Morris, patch to allow proper search/filtering of
NCP conversations.

svn path=/trunk/; revision=16278
2005-10-20 18:04:11 +00:00
Gerald Combs
33cfe1725a Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing.  Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake.  The rest of the occurrences of xcopy will have to
be taken care of at some point.

svn path=/trunk/; revision=15840
2005-09-16 16:25:53 +00:00
Guy Harris
f34e1a97c6 Have cf_retap_packets() take an argument that indicates whether to
generate columns; use cf_retap_packets instead of cf_redissect_packets()
when running taps (the general flow graph stat uses the Info column).

svn path=/trunk/; revision=15793
2005-09-14 08:59:41 +00:00
Gerald Combs
1b8f8ffcb3 Fix sorting in the "Ports" columns. Add a comment about address sorting.
Remove unused code.

svn path=/trunk/; revision=15529
2005-08-25 13:58:34 +00:00
Ulf Lamping
eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Ulf Lamping
d28861b607 removed tons of MSVC const related warnings.
This might at some places interfere with the changes for gcc4, we might have to negotiate in that case :-)

Please note that a lot of these warnings were GTK1.x related only!

svn path=/trunk/; revision=15286
2005-08-10 19:49:45 +00:00
Jörg Mayer
4e1f4b18ab More char -> const char warning fixes.
Removed (very few) casts that only change the warning message
  but don't remove it (with gcc-4).

svn path=/trunk/; revision=15227
2005-08-05 20:59:08 +00:00
Ulf Lamping
832fc14ad8 MSVC: fix some guint64 related compiler warnings, could someone please review my comment(s), I don't think it's currently implemented correct
svn path=/trunk/; revision=14887
2005-07-09 11:26:46 +00:00
Ronnie Sahlberg
897a12c305 make the packets/bytes counters 64bit integers to not wrap when using really large captures.
setting packet counter to 64bit is overkill but makes it consistent with the very similar bytes counter.



svn path=/trunk/; revision=14872
2005-07-07 22:24:28 +00:00
Anders Broman
2ab0496a72 From Mike Duigou:
In order to get filtering of conversations and
> endpoints to work from the endpoints and conversations windows I found 
> it necessary to add a new AT_URI address type and a SAT_JXTA. This also 
> necessitated a change to to_str.c to avoid a buffer overflow problem. 
> Please review these changes carefully.
> 
> Also includes some changes to the jxta dissector to fix filtering on
> generated fields and some changes to the types used for ints/unsigned ints.
> 
> Fixes a bug with the processing of messages containing namespaces.

svn path=/trunk/; revision=14714
2005-06-20 20:14:22 +00:00