Commit Graph

74 Commits

Author SHA1 Message Date
Stig Bjørlykke 9676190af1 Uh, new attempt to sort hostlist correct...
svn path=/trunk/; revision=26577
2008-10-27 14:40:44 +00:00
Stig Bjørlykke 164b61e7b0 Sort hostlist columns correct.
Temporary fix for adding GeoIPCity names with norwegian characters,
so we do not crash in gtk_clist_insert(). 

svn path=/trunk/; revision=26576
2008-10-27 14:17:04 +00:00
Gerald Combs 1b7064bb6a Add support for the GeoIP library. Using different database files,
GeoIP can map IP addresses to Countries, Cities, AS numbers, ISPs,
etc. If any library paths are defined AND any database files are found,
corresponding columns are added to the endpoint tables in the GUI.

To do:
  - Add columns to the conversation list
  - Add GeoIP info to "-z conv,..."
  - Create a default UAT file.

svn path=/trunk/; revision=26571
2008-10-27 04:50:57 +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
Stig Bjørlykke a63ad85c78 Changed to display NCP connection, as in conversations.
svn path=/trunk/; revision=25181
2008-04-25 19:42:27 +00:00
Ulf Lamping 644a474c95 sort #includes by directories
svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +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
Ulf Lamping 8e58ec7085 last round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +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 736cada149 third round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24914
2008-04-11 22:10:36 +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 d4672d13f5 Add macros for various filter actions and types, and to combine them
into a callback argument and split a callback argument up.

svn path=/trunk/; revision=23816
2007-12-09 09:04:58 +00:00
Guy Harris d31730a21b Use G_GINT64_MODIFIER for gint64 and guint64 values.
svn path=/trunk/; revision=23763
2007-12-05 10:17:58 +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
Stig Bjørlykke facb4b5d50 Move the "copy" button down to the button bar, to match the layout in
the conversations window.

svn path=/trunk/; revision=23685
2007-11-30 14:36:18 +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
Guy Harris 944d2e5487 Squelch some qualifier (const vs. non-const) warnings.
svn path=/trunk/; revision=21938
2007-05-25 19:13:49 +00:00
Ronnie Sahlberg 62353b8044 From Jon Smirl
support for usb host/endpoint lists


svn path=/trunk/; revision=21180
2007-03-25 11:37:13 +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
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping 4e973150ea fix bug #660: we must alphabetically sort columns 0&1, not 0&2
svn path=/trunk/; revision=16974
2006-01-07 11:08:07 +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
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
Luis Ontanon 222cd82f4f have the definition of init_hostlist_table *ACTUALLY* match its declaration.
svn path=/trunk/; revision=15229
2005-08-05 22:36:28 +00:00
Luis Ontanon 90badc628d have the definition of init_hostlist_table match the declaration.
svn path=/trunk/; revision=15228
2005-08-05 22:34: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
Luis Ontanon f0c8a7ab65 From Francisco Alcoba:
changed the behaviour of get_addr_name:
 - resolve to a name if the address supports it
 - call address_to_str if it does not, but the address is valid
 - return "NONE" if it is AT_NONE


svn path=/trunk/; revision=13463
2005-02-22 01:55:04 +00:00
Ulf Lamping 0861927ce3 huge cleanup of capture file API (functions in file.c/file.h).
This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions.

Hopefully, I didn't introduced any new bugs, as I had to change a lot of files...

svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
Ulf Lamping 66ce7f3623 add some more online help functionality and help buttons at various dialog boxes, if a help page *is* available. However, the new help system needs a lot more work before completed.
svn path=/trunk/; revision=13152
2005-01-20 23:17:23 +00:00
Guy Harris 4df2c4abd9 Make the signatures of functions passed to "register_tap_listener()"
match what "register_tap_listener()" expects (rather than squelching
warnings about the differences by casting function pointers to "void
*").

Make static some functions not used outside the module in which they're
defined. 

svn path=/trunk/; revision=12913
2005-01-01 12:49:54 +00:00
Guy Harris 0ccf418724 Add a "get_addr_name()" routine that takes an "address *" and attempts
to resolve it to a name.

Fix up some const-pointer-to-non-const-pointer, and
function-pointer-to-void-*, conversions.

Fix some comments.

svn path=/trunk/; revision=12863
2004-12-30 02:10:24 +00:00
Guy Harris 6472876ab3 Move the tap infrastructure to the epan directory.
svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
Gerald Combs 9cde8d8a70 Put the "copy" button back in the conversation and host list tables.
svn path=/trunk/; revision=11624
2004-08-08 03:56:02 +00:00
Guy Harris 3a583aeb59 From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).

svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
Guy Harris b104e6e3eb From Ian Schorr: fix a bug where addresses were drawn to the wrong rows
in the clist, and get rid of some duplicated code.

svn path=/trunk/; revision=11613
2004-08-06 19:22:04 +00:00