obnox/wireshark/wip.git
8 years agoHandle the case where dumpcap is compiled without thread support, which
tuexen [Fri, 15 Jul 2011 12:20:00 +0000 (12:20 +0000)]
Handle the case where dumpcap is compiled without thread support, which
is the default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38043 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a missing ( in the UI_MANAGER case
jmayer [Fri, 15 Jul 2011 11:14:41 +0000 (11:14 +0000)]
Add a missing ( in the UI_MANAGER case

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38042 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago* If first 8 bytes in icmp data do not look like a timestamp in BE, try LE representa...
sake [Fri, 15 Jul 2011 08:57:59 +0000 (08:57 +0000)]
* If first 8 bytes in icmp data do not look like a timestamp in BE, try LE representation.

* Change field title to not confuse people when the clocks of the pinging system and the capturing system are not in sync.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38041 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSet default svn:ignore targets on rua and hnbap.
stig [Fri, 15 Jul 2011 08:23:49 +0000 (08:23 +0000)]
Set default svn:ignore targets on rua and hnbap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38040 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix "comparison between signed and unsigned" warning.
cmaynard [Fri, 15 Jul 2011 04:40:03 +0000 (04:40 +0000)]
Fix "comparison between signed and unsigned" warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38039 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBe sure there's enough bytes in the ICMP payload before trying to access it in
cmaynard [Fri, 15 Jul 2011 02:39:53 +0000 (02:39 +0000)]
Be sure there's enough bytes in the ICMP payload before trying to access it in
order to try to determine if it contains a timestamp.  Added some FIXME notes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38038 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoNo need to define USE_THREADS twice.
cmaynard [Fri, 15 Jul 2011 01:30:06 +0000 (01:30 +0000)]
No need to define USE_THREADS twice.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38037 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Fri, 15 Jul 2011 00:15:01 +0000 (00:15 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38036 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Fri, 15 Jul 2011 00:13:59 +0000 (00:13 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38035 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Fri, 15 Jul 2011 00:08:45 +0000 (00:08 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also:
 - Move proto_reg_handoff_msrp() to the end of the file;
 - Define a function and a global variable as static;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38034 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoOn Windows enable threads everywhere instead of just in dumpcap. If
gerald [Thu, 14 Jul 2011 23:18:02 +0000 (23:18 +0000)]
On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38033 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a note re possible issues when 'info_all_data_present == FALSE'
wmeier [Thu, 14 Jul 2011 22:17:17 +0000 (22:17 +0000)]
Add a note re possible issues when 'info_all_data_present == FALSE'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38032 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix trunk/gtk/menus.c:4427:9: error: â\80\98sep_entryâ\80\99 undeclared (first use in this...
etxrab [Thu, 14 Jul 2011 22:08:15 +0000 (22:08 +0000)]
Fix trunk/gtk/menus.c:4427:9: error: â\80\98sep_entryâ\80\99 undeclared (first use in this function)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38031 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake windows buildbot happy (hopefully!)
sake [Thu, 14 Jul 2011 22:03:13 +0000 (22:03 +0000)]
Make windows buildbot happy (hopefully!)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38030 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a property name typo: svn:keyworrds --> svn:keywords
wmeier [Thu, 14 Jul 2011 21:37:39 +0000 (21:37 +0000)]
Fix a property name typo: svn:keyworrds --> svn:keywords

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38029 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf the first 8 bytes of the icmp echo/echo-reply data look like a timestamp, dissect...
sake [Thu, 14 Jul 2011 21:27:17 +0000 (21:27 +0000)]
If the first 8 bytes of the icmp echo/echo-reply data look like a timestamp, dissect it as a timestmap and calculate the time since the icmp packet was created.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38028 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove trailing whitespace
jmayer [Thu, 14 Jul 2011 21:25:33 +0000 (21:25 +0000)]
Remove trailing whitespace
Replace a deprecated gdk function

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38027 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix property name typo: svn:eol-syle --> svn:eol-style
wmeier [Thu, 14 Jul 2011 21:24:37 +0000 (21:24 +0000)]
Fix property name typo:   svn:eol-syle --> svn:eol-style

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38026 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse correct property name: svn.keywords --> svn:keywords
wmeier [Thu, 14 Jul 2011 20:58:14 +0000 (20:58 +0000)]
Use correct property name: svn.keywords --> svn:keywords

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38025 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove \80\98GtkItemFactoryEntry code in MAIN_MENU_USE_UIMANAGER
etxrab [Thu, 14 Jul 2011 20:36:00 +0000 (20:36 +0000)]
Remove \80\98GtkItemFactoryEntry code in MAIN_MENU_USE_UIMANAGER
code path.
Don't build and don't use protocol help if MAIN_MENU_USE_UIMANAGER is defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38024 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with...
wmeier [Thu, 14 Jul 2011 19:51:53 +0000 (19:51 +0000)]
Fix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with truncated frames.
(That is: the capture files were created with a snapshot length less than the maximum).

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38023 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd LTE RLC stats tap to tshark.
martinm [Thu, 14 Jul 2011 17:07:41 +0000 (17:07 +0000)]
Add LTE RLC stats tap to tshark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38019 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd back r37749, which was taken out by accident.
tuexen [Thu, 14 Jul 2011 16:54:44 +0000 (16:54 +0000)]
Add back r37749, which was taken out by accident.
Thanks to Stephen Fisher for pointing it out.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38018 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUpdate the algorithms in line with RFC 5912 including support for eliptic curve algor...
gal [Thu, 14 Jul 2011 13:47:13 +0000 (13:47 +0000)]
Update the algorithms in line with RFC 5912 including support for eliptic curve algorithms.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38017 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd LTE MAC statistics to tshark.
martinm [Thu, 14 Jul 2011 13:39:02 +0000 (13:39 +0000)]
Add LTE MAC statistics to tshark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38016 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED.
jmayer [Thu, 14 Jul 2011 09:43:53 +0000 (09:43 +0000)]
Fix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED.
Left are:

gtk/menus.c:4382:5: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/menus.c:4382:26: error: ‘sep_entry’ undeclared (first use in this function)
gtk/proto_help.c:79:16: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
gtk/proto_help.c:166:2: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:166:2: error: implicit declaration of function ‘gtk_item_factory_from_widget’
gtk/proto_help.c:181:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:183:2: error: implicit declaration of function ‘gtk_item_factory_get_widget’
gtk/proto_help.c:191:2: error: implicit declaration of function ‘gtk_item_factory_get_item’
gtk/proto_help.c:216:2: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/proto_help.c:216:23: error: ‘menu_entry’ undeclared (first use in this function)
gtk/proto_help.c:217:2: error: ISO C90 forbids mixed declarations and code
gtk/proto_help.c:222:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:258:4: error: implicit declaration of function ‘gtk_item_factory_create_item’

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38015 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUpdate to correct the definition of the clearance attribute used in certificates.
gal [Thu, 14 Jul 2011 08:47:05 +0000 (08:47 +0000)]
Update to correct the definition of the clearance attribute used in certificates.
RFC3281 erroneously defined the Clearance attribute to be different to that defined in X.509. This has been recognised and corrected in RFC5755.
The RFC3281 syntax is retained and registered as the "RFC3281Clearance" syntax, which can be used to override the correct syntax in the BER oidtables if necessary.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38014 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoReplace deprecated gdk_pixmap_unref() with g_object_unref().
etxrab [Thu, 14 Jul 2011 08:11:16 +0000 (08:11 +0000)]
Replace deprecated gdk_pixmap_unref() with g_object_unref().
Update checkAPIs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38013 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Joerg Mayer:
etxrab [Thu, 14 Jul 2011 08:02:32 +0000 (08:02 +0000)]
From Joerg Mayer:
Patch fixes most of the remaining errors when compiling with
GTK_DISABLE_DEPRECATED.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38012 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAs with Makefile.am, so with Makefile.nmake. To quote the comment for
guy [Thu, 14 Jul 2011 03:15:09 +0000 (03:15 +0000)]
As with Makefile.am, so with Makefile.nmake.  To quote the comment for
rev 37866:

  Removed empty directory docbook/wsluarm_src.  It's generated during 'make',
  and now removed during 'make clean'.

so we have to generate it now during nmake as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38011 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUpdate status of compile with -DGTK_DISABLE_DEPRECATED
jmayer [Thu, 14 Jul 2011 00:16:14 +0000 (00:16 +0000)]
Update status of compile with -DGTK_DISABLE_DEPRECATED

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38007 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some compiler errors with -DGTK_DISABLE_DEPRECATED
jmayer [Thu, 14 Jul 2011 00:04:37 +0000 (00:04 +0000)]
Fix some compiler errors with -DGTK_DISABLE_DEPRECATED

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38006 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agomake compiling with -DGTK_DISABLE_DEPRECATED work
jmayer [Wed, 13 Jul 2011 22:49:38 +0000 (22:49 +0000)]
make compiling with -DGTK_DISABLE_DEPRECATED work

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38005 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agomake compiling with -DGTK_DISABLE_DEPRECATED work
jmayer [Wed, 13 Jul 2011 22:32:05 +0000 (22:32 +0000)]
make compiling with -DGTK_DISABLE_DEPRECATED work

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38004 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
wmeier [Wed, 13 Jul 2011 19:48:58 +0000 (19:48 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38001 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
wmeier [Wed, 13 Jul 2011 18:42:40 +0000 (18:42 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37999 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
wmeier [Wed, 13 Jul 2011 17:04:55 +0000 (17:04 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37998 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove two deprecated functions.
etxrab [Wed, 13 Jul 2011 14:47:31 +0000 (14:47 +0000)]
Remove two deprecated functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37997 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix more tooltips fixes.
etxrab [Wed, 13 Jul 2011 08:48:13 +0000 (08:48 +0000)]
Fix more tooltips fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37996 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDisplay interface stuff only when interfaces are available.
tuexen [Tue, 12 Jul 2011 21:33:11 +0000 (21:33 +0000)]
Display interface stuff only when interfaces are available.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37995 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCopy over behaviour of commit 37967 for configure.in
jmayer [Tue, 12 Jul 2011 21:24:15 +0000 (21:24 +0000)]
Copy over behaviour of commit 37967 for configure.in

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37994 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemote trailing whitespace
jmayer [Tue, 12 Jul 2011 21:21:13 +0000 (21:21 +0000)]
Remote trailing whitespace

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37993 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a comment noting why AirPcap support cannot be unconditionally
guy [Tue, 12 Jul 2011 17:19:17 +0000 (17:19 +0000)]
Add a comment noting why AirPcap support cannot be unconditionally
enabled by default (i.e., it's Windows-only).  InterCap the name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37992 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDisable airpcap by default. This matches the configure script.
tuexen [Tue, 12 Jul 2011 11:10:57 +0000 (11:10 +0000)]
Disable airpcap by default. This matches the configure script.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37991 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThis fixes the compile issue reported in
tuexen [Tue, 12 Jul 2011 11:06:44 +0000 (11:06 +0000)]
This fixes the compile issue reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6111

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37990 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSpeed up (slightly) reading of long text lines.
martinm [Tue, 12 Jul 2011 10:49:22 +0000 (10:49 +0000)]
Speed up (slightly) reading of long text lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37989 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix more tooltips.
etxrab [Tue, 12 Jul 2011 06:54:01 +0000 (06:54 +0000)]
Fix more tooltips.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37988 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix more tooltips.
etxrab [Tue, 12 Jul 2011 06:15:24 +0000 (06:15 +0000)]
Fix more tooltips.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37987 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a bunch of URLs for character encoding information.
guy [Tue, 12 Jul 2011 00:14:37 +0000 (00:14 +0000)]
Add a bunch of URLs for character encoding information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37986 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoHaving a non-NULL capture_opts->save_file might make us crash less.
gerald [Mon, 11 Jul 2011 22:51:46 +0000 (22:51 +0000)]
Having a non-NULL capture_opts->save_file might make us crash less.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37983 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the proper function name.
gerald [Mon, 11 Jul 2011 22:41:53 +0000 (22:41 +0000)]
Use the proper function name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37982 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix more tooltips.
etxrab [Mon, 11 Jul 2011 21:29:47 +0000 (21:29 +0000)]
Fix more tooltips.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37980 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
gerald [Mon, 11 Jul 2011 20:32:19 +0000 (20:32 +0000)]
More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37978 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix more tooltips, mark gtk_tooltips_new with 'E' in checkapi.
etxrab [Mon, 11 Jul 2011 20:01:28 +0000 (20:01 +0000)]
Fix more tooltips, mark gtk_tooltips_new with 'E' in checkapi.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37976 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a couple of tooltips.
etxrab [Mon, 11 Jul 2011 19:34:57 +0000 (19:34 +0000)]
Fix a couple of tooltips.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37975 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIn version_info.c, assume we always have the "matches" operator. In
gerald [Mon, 11 Jul 2011 19:15:57 +0000 (19:15 +0000)]
In version_info.c, assume we always have the "matches" operator. In
capture_opts.c, assume our output filename has been passed through
arg_list_utf_16to8().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37974 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemaining GLIB_CHECK_VERSION and GTK_CHECK_VERSION in the gtk directory.
gerald [Mon, 11 Jul 2011 19:10:57 +0000 (19:10 +0000)]
Remaining GLIB_CHECK_VERSION and GTK_CHECK_VERSION in the gtk directory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37973 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK_CHECK_VERSION cleanup.
etxrab [Mon, 11 Jul 2011 18:54:49 +0000 (18:54 +0000)]
GTK_CHECK_VERSION cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37972 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore GLIB_CHECK_VERSION and GTK_CHECK_VERSION cleanup.
gerald [Mon, 11 Jul 2011 18:35:36 +0000 (18:35 +0000)]
More GLIB_CHECK_VERSION and GTK_CHECK_VERSION cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37971 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore GLIB_CHECK_VERSION, GTK_CHECK_VERSION, and related whitespace
gerald [Mon, 11 Jul 2011 18:18:35 +0000 (18:18 +0000)]
More GLIB_CHECK_VERSION, GTK_CHECK_VERSION, and related whitespace
cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37970 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove a lot of instances of GTK_CHECK_VERSION. Clean up whitespace in a
gerald [Mon, 11 Jul 2011 18:08:08 +0000 (18:08 +0000)]
Remove a lot of instances of GTK_CHECK_VERSION. Clean up whitespace in a
couple of places.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37969 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake the minimum GLib version 2.14 and the minimum GTK+ version 2.12.
gerald [Mon, 11 Jul 2011 17:49:59 +0000 (17:49 +0000)]
Make the minimum GLib version 2.14 and the minimum GTK+ version 2.12.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37967 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoChange encoding type from FALSE to ENC_BIG_ENDIAN.
etxrab [Mon, 11 Jul 2011 13:44:29 +0000 (13:44 +0000)]
Change encoding type from FALSE to ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37963 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom qgj:
etxrab [Mon, 11 Jul 2011 13:43:12 +0000 (13:43 +0000)]
From qgj:
when dissect the capwap control header,the sequence's value is decoded
improperly,it tooks the wrong offset value,so the control messages' sequence is
showed improperly.
Changed to uset proto_add_item and encoding type changed from FALSE to ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37962 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoChange encoding type from FALSE to ENC_BIG_ENDIAN.
etxrab [Mon, 11 Jul 2011 13:41:19 +0000 (13:41 +0000)]
Change encoding type from FALSE to ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37961 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Ludovic Haessler:
etxrab [Mon, 11 Jul 2011 13:32:04 +0000 (13:32 +0000)]
From Ludovic Haessler:
Add 3GPP TS44.060 RLC/MAC control blocks management in GSMTAP dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6103

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37960 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake sure consumed is set.
etxrab [Mon, 11 Jul 2011 10:42:16 +0000 (10:42 +0000)]
Make sure consumed is set.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37959 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Michael Mann:
etxrab [Mon, 11 Jul 2011 10:12:40 +0000 (10:12 +0000)]
From Michael Mann:
Added filters for BOOTP options of "basic" types (modeled after packet-wssap.c)

"bootp.option.length" only used when specific option filter can't be found.
"bootp.option.value" expanded to support multiple types

Converted "custom options string" to UAT

replacing many proto_tree_add_text() calls with
proto_tree_add_item(), so the BOOTP dissector is considerably more filterable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37958 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAs noted by Jaap Keuter on -dev, be sure to use message_size instead of
cmaynard [Mon, 11 Jul 2011 00:17:08 +0000 (00:17 +0000)]
As noted by Jaap Keuter on -dev, be sure to use message_size instead of
header->message_size for a correct host endianness comparison.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37957 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMove the definitions of LANalyzer records to lanalyzer.c.
guy [Sun, 10 Jul 2011 22:57:59 +0000 (22:57 +0000)]
Move the definitions of LANalyzer records to lanalyzer.c.

Use LA_RecordHeaderSize rather than sizeof, to squelch some compiler
complaints.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37956 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jaap:
etxrab [Sun, 10 Jul 2011 22:13:03 +0000 (22:13 +0000)]
From Jaap:
Limit the search to the line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37955 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDefine a structure for the record header, and read into that, and then
guy [Sun, 10 Jul 2011 22:10:07 +0000 (22:10 +0000)]
Define a structure for the record header, and read into that, and then
extract values from it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37954 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAt that point in the code, bytes_read isn't the total number of record
guy [Sun, 10 Jul 2011 21:05:19 +0000 (21:05 +0000)]
At that point in the code, bytes_read isn't the total number of record
header bytes read, as we're reading the two header fields separately and
checking the byte count for each read.  We *do*, however, know that the
record header is 4 bytes long, so we can just seek back 4 bytes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37953 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd port 2710 for the XBT BitTorrent tracker (and note why it's added;
guy [Sun, 10 Jul 2011 18:34:15 +0000 (18:34 +0000)]
Add port 2710 for the XBT BitTorrent tracker (and note why it's added;
the other unusual ports should be mentioned as well).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37952 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake sure the SID string attached to a dcerpc_call_value has session
guy [Sun, 10 Jul 2011 17:57:39 +0000 (17:57 +0000)]
Make sure the SID string attached to a dcerpc_call_value has session
duration, just as the dcerpc_call_value itself does.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37951 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-07-10]
gerald [Sun, 10 Jul 2011 15:03:37 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-07-10]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37948 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPut Modbus/UDP support back.
guy [Sat, 9 Jul 2011 19:58:19 +0000 (19:58 +0000)]
Put Modbus/UDP support back.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37947 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf the reply length is < 32, that's an overflow, not a bug in the
guy [Sat, 9 Jul 2011 18:56:21 +0000 (18:56 +0000)]
If the reply length is < 32, that's an overflow, not a bug in the
dissector (unless you consider the calculation not being done in 64 bits
as a bug).  For now, toss a ReportedBoundsError.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37946 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPer README.developer, we must call subdissectors regardless of whether "tree"
cmaynard [Sat, 9 Jul 2011 02:04:48 +0000 (02:04 +0000)]
Per README.developer, we must call subdissectors regardless of whether "tree"
is NULL or not.  With this change, GRE-encapsulated packets (such as IP)
should now appear in then endpoint and conversation lists.  This was
essentially the request made at Sharkfest '11.  The actual request was for a
"GRE" tab to be added, but that doesn't really make much sense to me.  I
believe this change should fulfill that request.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37945 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPoint to the right place.
guy [Sat, 9 Jul 2011 01:41:09 +0000 (01:41 +0000)]
Point to the right place.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37944 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoShow a hint to read http://wiki.wireshark.org/CaptureSetup/CapturePrivileges
rbalint [Sat, 9 Jul 2011 00:20:13 +0000 (00:20 +0000)]
Show a hint to read wiki.wireshark.org/CaptureSetup/CapturePrivileges
when showing the warning about running Wireshark as root
Thanks to Evan Huus for the suggestion.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37943 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse a pixbuf for widgets used for icons.
tuexen [Fri, 8 Jul 2011 18:29:02 +0000 (18:29 +0000)]
Use a pixbuf for widgets used for icons.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37942 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTrivial: add a couple of newlines.
martinm [Fri, 8 Jul 2011 16:10:25 +0000 (16:10 +0000)]
Trivial: add a couple of newlines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37941 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoChange the way we scan past characters before the direction indicator.
martinm [Fri, 8 Jul 2011 16:08:32 +0000 (16:08 +0000)]
Change the way we scan past characters before the direction indicator.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37940 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf no interface is specified on the command line, use the default
tuexen [Fri, 8 Jul 2011 13:47:16 +0000 (13:47 +0000)]
If no interface is specified on the command line, use the default
capture interface if given.

This patch is provided by Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37939 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoYou can't select/deselct interfaces in the capture/interfaces
tuexen [Fri, 8 Jul 2011 13:40:00 +0000 (13:40 +0000)]
You can't select/deselct interfaces in the capture/interfaces
dialog while you are capturing.
This patch is provided by Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37938 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTry to make non-libpcap builds compiling.
tuexen [Fri, 8 Jul 2011 09:26:34 +0000 (09:26 +0000)]
Try to make non-libpcap builds compiling.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37937 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the interfaces from the last capturing process as a starting point
tuexen [Fri, 8 Jul 2011 08:49:06 +0000 (08:49 +0000)]
Use the interfaces from the last capturing process as a starting point
for the next one.

Obtained from Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37936 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAvoid 'variable set but no used' error from compiler.
jake [Fri, 8 Jul 2011 07:52:31 +0000 (07:52 +0000)]
Avoid 'variable set but no used' error from compiler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37935 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAlas, the libpcap API didn't use "void *" where it should have; squelch
guy [Fri, 8 Jul 2011 02:02:37 +0000 (02:02 +0000)]
Alas, the libpcap API didn't use "void *" where it should have; squelch
some warnings from Clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37934 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago%u suffices, as varargs are widened. (It aslso doesn't cause Clang to
guy [Fri, 8 Jul 2011 01:58:30 +0000 (01:58 +0000)]
%u suffices, as varargs are widened. (It aslso doesn't cause Clang to
complain.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37933 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThe argument of capture_get_if_icon() is used.
tuexen [Thu, 7 Jul 2011 21:16:03 +0000 (21:16 +0000)]
The argument of capture_get_if_icon() is used.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37932 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTry to unbreak the Mac OS X 10.5 buildbots.
tuexen [Thu, 7 Jul 2011 20:20:55 +0000 (20:20 +0000)]
Try to unbreak the Mac OS X 10.5 buildbots.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37931 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIn elem_cell_id_aux(), in the case of an unknown/invalid disc, be sure to
cmaynard [Thu, 7 Jul 2011 16:37:33 +0000 (16:37 +0000)]
In elem_cell_id_aux(), in the case of an unknown/invalid disc, be sure to
increment the curr_offset by the correct number of bytes; otherwise we can run
into an infinite loop condition such as was the case for bug 6044.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37930 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBring back interface icons.
tuexen [Thu, 7 Jul 2011 13:57:08 +0000 (13:57 +0000)]
Bring back interface icons.

Obtained from Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37929 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the interface descriptions again.
tuexen [Thu, 7 Jul 2011 13:34:40 +0000 (13:34 +0000)]
Use the interface descriptions again.

This patch is from Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37928 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6093
alagoutte [Thu, 7 Jul 2011 10:19:02 +0000 (10:19 +0000)]
From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6093
802.11 Association Response Packet's "Status Code" field is imprecisely decoded/described.

From me :
* Display Reason code in decimal (not Hexa)
* Check list from last standard (802.11-2007, 802.11r-2008, 802.11n-2009, 802.11w-2009 & 802.11z-2011)
* Add link to 802.11z-2010 documentation

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37927 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Ludovic Haessler:
etxrab [Thu, 7 Jul 2011 07:44:25 +0000 (07:44 +0000)]
From Ludovic Haessler:
CSN Ack/Nack Description wrongly handled in gsm_rlcmac_dl dissector (3GPP TS 44.060)

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37926 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a crash when using hidden interfaces.
tuexen [Wed, 6 Jul 2011 17:27:42 +0000 (17:27 +0000)]
Fix a crash when using hidden interfaces.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37925 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki via bug 6002: Don't set state to STATE_EXPECT_DATA if there...
cmaynard [Wed, 6 Jul 2011 16:22:11 +0000 (16:22 +0000)]
From Jakub Zawadzki via bug 6002:  Don't set state to STATE_EXPECT_DATA if there's no data to read.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37924 f5534014-38df-0310-8fa8-9805f1628bb7