Commit graph

109 commits

Author SHA1 Message Date
Stig Bjørlykke
bb4acb8fe3 Corrected an if-statement in field_select_row_cb() where checking for
hfinfo->strings and hfinfo->display.

This bug was found by clang.

svn path=/trunk/; revision=34785
2010-11-05 08:10:40 +00:00
Bill Meier
15851701e8 Rework "extended value strings":
- Allow direct access when a range of values begins with a value other than 0;
- Provide value_string_ext_new() for creating extended value strings at runtime;
- Do access to value_string_ext members via a macro (all but value_string.c);
- Update documentation.

svn path=/trunk/; revision=34514
2010-10-14 17:50:35 +00:00
Bill Meier
838ffd0c72 Fix crash creating a filter (using "Expression ...") for a field with an extended value_string
svn path=/trunk/; revision=34223
2010-09-23 20:45:22 +00:00
Jeff Morriss
b4c2ed1b86 Remove some unnecessary includes: a lot of things don't need globals.h and register.h
svn path=/trunk/; revision=34017
2010-08-30 16:10:01 +00:00
Bill Meier
4dcaf67f37 Fix regression: unable to enter values in Filter Expression window unless value list present.
(Regression introduced in SVN #30918).
Code reworked slightly for clarification.

svn path=/trunk/; revision=32912
2010-05-20 23:49:57 +00:00
Gerald Combs
7c0dc5d7e7 If we don't have PCRE and we do have GLib >= 2.14, use GRegexes for the
"matches" operator.

svn path=/trunk/; revision=31302
2009-12-18 01:15:08 +00:00
Guy Harris
a4b7135ce3 Rename BASE_STRUCTURE_RESET to BASE_DISPLAY_E_MASK, to clarify that it's
a mask to select the base_display_e value from a display field in a
header_field_info structure.

Never select that value by masking out the BASE_RANGE_STRING flag bit,
as that won't continue to work if more flag bits, or other bitfields,
are added.  Instead, mask with BASE_DISPLAY_E_MASK.

Note that the base_display_e value and BASE_RANGE_STRING flag are only
for integral field types, and clarify what BASE_DISPLAY_E_MASK is.

Give at least one of the reasons why hiding protocol fields is not
considered a good idea.

svn path=/trunk/; revision=31249
2009-12-12 03:15:28 +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
Stig Bjørlykke
6325c5d30f Return from dfilter_expr_dlg_accept_cb() if nothing selected.
svn path=/trunk/; revision=30235
2009-10-01 14:44:59 +00:00
Bill Meier
174ce5633c From Kovarththanan Rajaratnam: Fixes for bug #3536
(plus some additional changes by me).

Handle BASE_RANGE_STRING display types properly

We always treat header field info strings as value_string's undiscriminated.
However, if the header field info display is marked as BASE_RANGE_STRING, we
need to treat them as range_string's. This wasn't properly handled in the
filter expression dialog and in the filter toolbar which would cause a crash
upon referencing any fields marked as BASE_RANGE_STRING.


svn path=/trunk/; revision=28931
2009-07-03 01:11:23 +00:00
Bill Meier
8c5ef88c53 dfilter_expr_dlg: fix several very minor memory leaks;
svn path=/trunk/; revision=28565
2009-06-01 17:27:54 +00:00
Guy Harris
4149ec87c6 Squelch an uninitialized variable complaint from older versions of GCC
(which presumably don't know that g_assert_not_reached() never returns).

svn path=/trunk/; revision=28470
2009-05-25 18:40:07 +00:00
Stig Bjørlykke
4d3a7aa966 Use g_strdup_printf() instead of g_snprintf() with a fixed buffer.
svn path=/trunk/; revision=28402
2009-05-18 22:01:19 +00:00
Guy Harris
54c159cb41 Turn on -Wshorten-64-to-32 by default, and fix some issues that turned
up (99 44/100% of which were assignments of double-precision
floating-point constants to floats).  Hopefully this will catch at least
some P64 issues on UN*X.

svn path=/trunk/; revision=28108
2009-04-21 16:57:52 +00:00
Gerald Combs
9c9db36825 size_t fixes.
svn path=/trunk/; revision=28059
2009-04-15 21:35:51 +00:00
Stig Bjørlykke
62f60df6b4 From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.

svn path=/trunk/; revision=27718
2009-03-13 22:06:48 +00:00
Stig Bjørlykke
cb94226629 Handle BASE_NONE as BASE_DEC until we get a proper handling of integer
values with BASE_NONE and a value string.

svn path=/trunk/; revision=27669
2009-03-09 00:30:45 +00:00
Stig Bjørlykke
5e5a674e76 Show both short and long protocol name in the Filter Expression dialog.
svn path=/trunk/; revision=26537
2008-10-24 07:48:09 +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
Sake Blok
a287b0f3f5 From Jim Young (bug 2212):
Add the profile name to the title of all the configuration windows.
(this is a rewrite of Jim's patch)


svn path=/trunk/; revision=25016
2008-04-14 15:01:34 +00:00
Ulf Lamping
8e3e8b588f sort #includes by directories
svn path=/trunk/; revision=24968
2008-04-13 01:54:20 +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
f9f87904c4 second 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=24913
2008-04-11 21:39:16 +00:00
Ulf Lamping
1f4b5e5f07 replace SIGNAL_DISCONNECT_BY_FUNC with g_signal_handlers_disconnect_by_func
svn path=/trunk/; revision=24911
2008-04-11 20:34:30 +00:00
Ulf Lamping
c6d13dc2c8 replace WIDGET_SET_SIZE with gtk_widget_set_size_request
svn path=/trunk/; revision=24910
2008-04-11 20:31:05 +00:00
Ulf Lamping
1ab5a1ea4b replace RADIO_BUTTON_NEW_WITH_MNEMONIC with gtk_radio_button_new_with_mnemonic_from_widget
svn path=/trunk/; revision=24908
2008-04-11 19:26:22 +00:00
Bill Meier
42acebd42c OBECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
Ulf Lamping
0e701b77ae remove GTK1 code
svn path=/trunk/; revision=24816
2008-04-06 23:20:23 +00:00
Luis Ontanon
906d2f3cbb http://www.wireshark.org/lists/wireshark-dev/200803/msg00308.html
proto.[hc]
    define new APIs to allow delayed registration of protocol fields,
	so that dissectors with "flexible" fields  like xml, radius, diameter,
	snmp do not have to load their files at startup but can do so as late as possible.

gtk/dfilter_expr_dlg.c :
	have the expression dialog registering all prefixes so that all fileds appear in the dialog

tshark.c
	register all prefixes when called with -G

epan/radius_dict.l
epan/dissectors/packet-radius.c
epan/dissectors/packet-radius.h
	refactor registration to delay dictionary loading as long as possible



svn path=/trunk/; revision=24762
2008-04-03 22:13:52 +00:00
Bill Meier
80b754bb01 Fix some typos; Fix some indenting to be at least locally consistent
svn path=/trunk/; revision=24575
2008-03-06 15:51:44 +00:00
Stig Bjørlykke
7deec480ff Next attempt to cleanup some string functions, including:
strncpy -> g_strlcpy, strncat -> g_strlcat

svn path=/trunk/; revision=24504
2008-02-29 13:33:37 +00:00
Stig Bjørlykke
10a8f59e03 Rewrote some prohibited APIs in gtk/ (sprintf, strcpy, strcat).
If we get some truncated strings we probably overwrote some buffers...

svn path=/trunk/; revision=24239
2008-02-01 01:07:58 +00:00
Jeff Morriss
22d2547547 Fix a couple "cast to pointer from integer of different size" warnings when building with GTK1.2 on Redhat AS4 64-bit
svn path=/trunk/; revision=22329
2007-07-16 22:19:59 +00:00
Stephen Fisher
c4ba5ad2b0 Fix bug #1334 and a problem where a user couldn't interact with the
filter dialog's add expression dialog when going to it through file->open
or file->merge (because dialogs in between are set to modal).


svn path=/trunk/; revision=22115
2007-06-17 00:54:58 +00:00
Ronnie Sahlberg
8fc740a53e hmm
best to revert this for a while.



revert all changes from previous patch.



svn path=/trunk/; revision=20195
2006-12-22 09:01:12 +00:00
Ronnie Sahlberg
8433f6d589 change some slab allocated memory into ep/emem allocated structures instead.
this primarily removes code and simplifies (==eliminates) the need to track the data that is allocated and should potentially be slightly faster than a slab allocator.
however these functions are called A LOT so there might be a performance hit when using emem with full debugging canary values and all the bells and whistles activated.


this change also makes any future attempt to parallellize dissection of frames easier if we just make the ep allocator allocate from a threads specific ep pool.
(something we would have to do anyway to make ep allocations multithreaded)



this works in all my tests so far but needs more test coverage.



svn path=/trunk/; revision=20194
2006-12-22 08:35:43 +00:00
Jaap Keuter
c629886ab1 Fix for bug 1178. Allow FT_?INT24 BASE_DEC VALs in the expression selection dialog.
svn path=/trunk/; revision=19666
2006-10-23 22:43:11 +00:00
Guy Harris
92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg
89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Gerald Combs
4535b93147 Make sure we can't pass NULL to strcmp. Fixes Coverity CID 34. Fix up
whitespace.

svn path=/trunk/; revision=17555
2006-03-09 19:38:51 +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
Guy Harris
554f620001 Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043
2005-07-24 19:01:28 +00:00
Guy Harris
76258fe8e3 Constify a bunch of structure members and function arguments, to squelch
compiler warnings.

Clean up indentation.

svn path=/trunk/; revision=14739
2005-06-24 01:32:42 +00:00
Guy Harris
f1deabed56 Make the tone of the error messages a bit less formal, by using
contractions.  (Safari does, at least when you're trying to open a file
to which you don't have read access.)

svn path=/trunk/; revision=12852
2004-12-29 01:08:20 +00:00
Guy Harris
0cd6d2f51c From Stas Grabois: make the previous change not to show disabled
protocols in the "Add Expression" and "Decode As" dialogs work with GTK+
2.x.

svn path=/trunk/; revision=11626
2004-08-08 06:25:24 +00:00
Ulf Lamping
bfd6ace52e renamed filter_prefs to filter_dlg, as the filter settings are (well, for a long time) no longer part of the preferences dialog.
svn path=/trunk/; revision=11436
2004-07-19 21:42:01 +00:00
Guy Harris
8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris
77fcb848f2 Move "dfilter_expr_dlg_delete_event_cb()" after
"dfilter_expr_dlg_cancel_cb()" to avoid use-before-declaration warnings.

svn path=/trunk/; revision=11136
2004-06-10 20:16:50 +00:00