obnox/wireshark/wip.git
8 years agoAdd a few more menu items.
etxrab [Fri, 19 Aug 2011 13:38:03 +0000 (13:38 +0000)]
Add a few more menu items.

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

8 years agoPut the UIManager menubar code in a separate file.
etxrab [Fri, 19 Aug 2011 12:40:51 +0000 (12:40 +0000)]
Put the UIManager menubar code in a separate file.

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

8 years agoMark length as U(nsused)
etxrab [Fri, 19 Aug 2011 12:15:54 +0000 (12:15 +0000)]
Mark length as U(nsused)

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

8 years agoFix MM Context for E-UTRAN SRVCC elment lengths
etxrab [Fri, 19 Aug 2011 12:02:49 +0000 (12:02 +0000)]
Fix MM Context for E-UTRAN SRVCC elment lengths

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

8 years agoIntroduce NSTime Lua object to handle nstime_t.
stig [Fri, 19 Aug 2011 08:36:02 +0000 (08:36 +0000)]
Introduce NSTime Lua object to handle nstime_t.

This object can be used to retreive other absolute and relative time fields,
create and modify nstime_t values and put generated time values in the tree.

Also added ProtoField.absolute_time and ProtoField.relative_time.

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

8 years agoGTK 3.0
etxrab [Fri, 19 Aug 2011 08:13:48 +0000 (08:13 +0000)]
GTK 3.0
Make tcp_graph.c build on GTK3 without breaking GTK2.
Cross and Window scaling graph is not working in GTK 3.

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

8 years agoGTK 3.0 "Comment out" GTK 2 code for now. Functionality needs to be restored on GTK 3.
etxrab [Fri, 19 Aug 2011 04:36:40 +0000 (04:36 +0000)]
GTK 3.0 "Comment out" GTK 2 code for now. Functionality needs to be restored on GTK 3.

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

8 years agoBack out previous commit (38612) which was the brutal patch to build with
sfisher [Fri, 19 Aug 2011 00:01:11 +0000 (00:01 +0000)]
Back out previous commit (38612) which was the brutal patch to build with
GTK 3 because not all of it is contained within #if statements for GTK 3
builds and could affect GTK 2 builds as well.

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

8 years agoFrom Anders on -dev:
sfisher [Thu, 18 Aug 2011 23:55:01 +0000 (23:55 +0000)]
From Anders on -dev:

Brutal patch to build with GTK 3.0

With the enclosed patch Wireshark builds on GTK3.0. Colors are messed up etc but
it should be possible to start to fix things and actually see what's happening.
I wouldn't be surprised if many patches leading up to this are faulty. Color
handling should probably be rewritten to use GdkRGBA in many places etc.

  http://www.wireshark.org/lists/wireshark-dev/201108/msg00383.html

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

8 years agoChange || in an "if test" statement to "-o"
sfisher [Thu, 18 Aug 2011 23:48:46 +0000 (23:48 +0000)]
Change || in an "if test" statement to "-o"

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

8 years agoUpdate the AirPcap code in prefs_dlg.c to match the changes made to
gerald [Thu, 18 Aug 2011 23:04:23 +0000 (23:04 +0000)]
Update the AirPcap code in prefs_dlg.c to match the changes made to
airpcap_dlg.c long ago in r28350. Re-enable GTK_DISABLE_DEPRECATED. Add
a comment to airpcap_loader.c about moving functionality to
packet-ieee80211.c.

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

8 years agoGet --enable-ui-manager working.
tuexen [Thu, 18 Aug 2011 22:50:35 +0000 (22:50 +0000)]
Get --enable-ui-manager working.

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

8 years agoAdd "WPA" to the 802.11 decryption key preference text.
gerald [Thu, 18 Aug 2011 21:46:28 +0000 (21:46 +0000)]
Add "WPA" to the 802.11 decryption key preference text.

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

8 years agoWhen building with GTK3 we *must* use the ui-manager interface,
jmayer [Thu, 18 Aug 2011 20:38:25 +0000 (20:38 +0000)]
When building with GTK3 we *must* use the ui-manager interface,
the ItemFactory stuff doesn't exists any more.

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

8 years agoTemporary fix to get Windows build going again: undefine GTK_DISABLE_DEPRECATED if...
sfisher [Thu, 18 Aug 2011 16:15:23 +0000 (16:15 +0000)]
Temporary fix to get Windows build going again: undefine GTK_DISABLE_DEPRECATED if building on Windows.  See: wireshark.org/lists/wireshark-dev/201108/msg00373.html

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

8 years agoGTK 3.0 Typo.
etxrab [Thu, 18 Aug 2011 15:28:25 +0000 (15:28 +0000)]
GTK 3.0 Typo.

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

8 years agoGTK 3.0 Fix colors(?)
etxrab [Thu, 18 Aug 2011 13:59:53 +0000 (13:59 +0000)]
GTK 3.0 Fix colors(?)

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

8 years agoGTK 3.0 fix a couple of gtk_style_context_get().
etxrab [Thu, 18 Aug 2011 13:44:27 +0000 (13:44 +0000)]
GTK 3.0 fix a couple of gtk_style_context_get().

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

8 years agoDraw the cursor line using ccairo
etxrab [Thu, 18 Aug 2011 13:43:59 +0000 (13:43 +0000)]
Draw the cursor line using ccairo

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

8 years agoFrom Ryan Hoffman via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6122
alagoutte [Thu, 18 Aug 2011 13:43:24 +0000 (13:43 +0000)]
From Ryan Hoffman via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6122
Malformed Packet in decode for BGP-AD (autodiscovery) update (RFC6074)

From me:
Add support of RFC6074 (BGP-AD) in BGP dissector.
Both BGP-AD and VPLS-BGP (RFC4761) use the same AFI/SAFI, The NLRI length must be used as a demultiplexer. (See RFC6074  Section 7 : BGP-AD and VPLS-BGP Interoperability)

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

8 years agoEnhance support of RD Type 2 (FORMAT_AS4_LOC) (RFC4364)
alagoutte [Thu, 18 Aug 2011 12:51:30 +0000 (12:51 +0000)]
Enhance support of RD Type 2 (FORMAT_AS4_LOC) (RFC4364)

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

8 years agoUse cairo_surface_t instead of axis_pixmap.
etxrab [Thu, 18 Aug 2011 12:20:11 +0000 (12:20 +0000)]
Use cairo_surface_t instead of axis_pixmap.

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

8 years agoUse cairo_surface_t instead of title_pixmap.
etxrab [Thu, 18 Aug 2011 11:02:38 +0000 (11:02 +0000)]
Use cairo_surface_t instead of title_pixmap.

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

8 years agoFix a typo in the gtk3 case
jmayer [Thu, 18 Aug 2011 10:54:55 +0000 (10:54 +0000)]
Fix a typo in the gtk3 case

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

8 years agoGTK 3.0 version of modify forground.
etxrab [Thu, 18 Aug 2011 08:58:29 +0000 (08:58 +0000)]
GTK 3.0 version of modify forground.

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

8 years agoFix two typos in the gtk3 case
jmayer [Thu, 18 Aug 2011 08:49:05 +0000 (08:49 +0000)]
Fix two typos in the gtk3 case

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

8 years agoCopy-paste errors.
etxrab [Thu, 18 Aug 2011 06:43:35 +0000 (06:43 +0000)]
Copy-paste errors.

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

8 years agoMore GTK 3.0 changes.
etxrab [Thu, 18 Aug 2011 06:37:28 +0000 (06:37 +0000)]
More GTK 3.0 changes.

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

8 years agoFrom Gisle Vanem:
stig [Wed, 17 Aug 2011 19:46:13 +0000 (19:46 +0000)]
From Gisle Vanem:
Patch for a missing WINAPI.

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

8 years agoUse gtk_widget_override_font() in GTK 3.0 ( Untested on GTK 3.0)
etxrab [Wed, 17 Aug 2011 19:39:34 +0000 (19:39 +0000)]
Use gtk_widget_override_font() in GTK 3.0 ( Untested on GTK 3.0)

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

8 years agoReplace deprecated functions/macros
jmayer [Wed, 17 Aug 2011 18:13:25 +0000 (18:13 +0000)]
Replace deprecated functions/macros

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

8 years agoFrom Sergey V. Lobanov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128
alagoutte [Wed, 17 Aug 2011 18:09:27 +0000 (18:09 +0000)]
From Sergey V. Lobanov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128
Wireshark doesn't decode BGP.MP_REACH_NLRI.NLRI when RD type is 2(defined in
RFC4364:4.2)

From me:
 Add RD type 2 (FORMAT_AS4_LOC) (not tested... based only on RFC spec..)

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

8 years agoAlways build with -DGTK_DISABLE_DEPRECATED. The files that
jmayer [Wed, 17 Aug 2011 17:34:56 +0000 (17:34 +0000)]
Always build with -DGTK_DISABLE_DEPRECATED. The files that
fail when built in specific configurations will disable this
option when required.

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

8 years agoThese two files cannot be compiled with GTK_DISABLE_DEPRECATED
jmayer [Wed, 17 Aug 2011 17:29:27 +0000 (17:29 +0000)]
These two files cannot be compiled with GTK_DISABLE_DEPRECATED
as long as they are still using the non MAIN_MENU_USE_UIMANAGER
case.

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

8 years agoUse gpointer instead of GtkItemFactoryCallback for functions
jmayer [Wed, 17 Aug 2011 17:27:50 +0000 (17:27 +0000)]
Use gpointer instead of GtkItemFactoryCallback for functions
register_stat_menu_item and register_stat_menu_item_stock in
the non MAIN_MENU_USE_UIMANAGER case. This is in preparation
for the next patch.

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

8 years agoUnifiy parameters to menu_open_recent_file_cmd for the
jmayer [Wed, 17 Aug 2011 17:24:49 +0000 (17:24 +0000)]
Unifiy parameters to menu_open_recent_file_cmd for the
MAIN_MENU_USE_UIMANAGER and on MAIN_MENU_USE_UIMANAGER case
(use gpointer instead of GtkWidget*/GetAction*).
In at least some cases the calling paramter is of
type gpointer anyway.

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

8 years agoThe MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
gerald [Wed, 17 Aug 2011 16:54:24 +0000 (16:54 +0000)]
The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.

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

8 years agoFrom Gisle Vanem: Make sure our SetProcessDEPPolicyHandler typedef
gerald [Wed, 17 Aug 2011 16:47:04 +0000 (16:47 +0000)]
From Gisle Vanem: Make sure our SetProcessDEPPolicyHandler typedef
matches the documentation.

I also verified that DEP is still enabled on Win32 using Process Explorer.

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

8 years agoFix compilation on when not using MAIN_MENU_USE_UIMANAGER
sfisher [Wed, 17 Aug 2011 15:52:12 +0000 (15:52 +0000)]
Fix compilation on when not using MAIN_MENU_USE_UIMANAGER

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

8 years agoMore GTK 3.0 changes:
etxrab [Wed, 17 Aug 2011 15:29:15 +0000 (15:29 +0000)]
More GTK 3.0 changes:
- In main skipp RC for now
- main_proto_draw incomplete fix.(#if 0)

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

8 years agomenus.[hc]:
jmayer [Wed, 17 Aug 2011 14:35:32 +0000 (14:35 +0000)]
menus.[hc]:
  set_menu_object_data_old has identical parameters to set_menu_object_data,
  and one was used only in the MAIN_MENU_USE_UIMANAGER case, the other in the
  non MAIN_MENU_USE_UIMANAGER case. Differentiate inside the function code and
  not via the function name.
main_filter_toolbar.c: Unify the set_menu_object_data and
  set_menu_object_data_old as the only difference was the function name.

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

8 years agoMove #defines for MENU_BAR_PATH_* and PACKET_LIST_POPUP_PATH_* out of
jmayer [Wed, 17 Aug 2011 14:19:25 +0000 (14:19 +0000)]
Move #defines for MENU_BAR_PATH_* and PACKET_LIST_POPUP_PATH_* out of
menus.h to main_filter_toolbar.c, that's the only place where they are
used.
The #defines for PACKET_LIST_POPUP_PATH_* seem to be unused, so #if 0 them.

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

8 years agoFix a typo and size_request.
etxrab [Wed, 17 Aug 2011 14:05:54 +0000 (14:05 +0000)]
Fix a typo and  size_request.

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

8 years agoFix a typo and size_request.
etxrab [Wed, 17 Aug 2011 13:55:58 +0000 (13:55 +0000)]
Fix a typo and  size_request.

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

8 years agoGet further with compiling with GTK 3.0
etxrab [Wed, 17 Aug 2011 13:49:47 +0000 (13:49 +0000)]
Get further with compiling with GTK 3.0
(No functional testing done yet)

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

8 years agoTry to make tge build bot happy.
etxrab [Wed, 17 Aug 2011 11:41:23 +0000 (11:41 +0000)]
Try to make tge build bot happy.

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

8 years agoGet rid of get_color() it looks like we do not need allocated collors.
etxrab [Wed, 17 Aug 2011 10:53:46 +0000 (10:53 +0000)]
Get rid of get_color() it looks like we do not need allocated collors.
The code is #if 0:ed out in case there is any ill side effects.

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

8 years agoFix indentation.
etxrab [Wed, 17 Aug 2011 07:10:33 +0000 (07:10 +0000)]
Fix indentation.

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

8 years agoInitialize trunc.
stig [Tue, 16 Aug 2011 19:25:29 +0000 (19:25 +0000)]
Initialize trunc.

Fix CID 1229.

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

8 years agoFrom Jakub Ruzicka via bug 6240: Show data for trunked packets. Some typo fixes...
cmaynard [Tue, 16 Aug 2011 19:20:25 +0000 (19:20 +0000)]
From Jakub Ruzicka via bug 6240: Show data for trunked packets.  Some typo fixes by me.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6240

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

8 years agoSmall fix in a error message.
stig [Tue, 16 Aug 2011 18:51:11 +0000 (18:51 +0000)]
Small fix in a error message.

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

8 years agoRemoved usage of localtime_r().
stig [Tue, 16 Aug 2011 17:51:38 +0000 (17:51 +0000)]
Removed usage of localtime_r().

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

8 years agoRemove unused code.
stig [Tue, 16 Aug 2011 17:37:04 +0000 (17:37 +0000)]
Remove unused code.

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

8 years agoCasts to squelch warnings.
guy [Tue, 16 Aug 2011 17:23:39 +0000 (17:23 +0000)]
Casts to squelch warnings.

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

8 years agoFrom Edwin Groothuis:
stig [Tue, 16 Aug 2011 16:54:41 +0000 (16:54 +0000)]
From Edwin Groothuis:
1. Add tooltip helps for the input and buttons.
2. Change the buttons from Apply OK Cancel to Apply Close.
3. Fixed the strange extrapolate behaviour by splitting the double float
   maths from the integer maths.
4. Also update the other three time fields: Seconds since first packet,
   seconds since previous captured packet, seconds since previous
   displayed packet.

From me:
Changed location for sanity checks.

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

8 years agoMore misspellings of "unknown", for bug 6244.
guy [Tue, 16 Aug 2011 16:26:50 +0000 (16:26 +0000)]
More misspellings of "unknown", for bug 6244.

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

8 years agoUse col_append_sep_str() to comma-separate info column text. Fixes bug 6186.
cmaynard [Tue, 16 Aug 2011 14:54:59 +0000 (14:54 +0000)]
Use col_append_sep_str() to comma-separate info column text.  Fixes bug 6186.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6186

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

8 years agoCheck for valid filename in write_pdml_preamble().
stig [Tue, 16 Aug 2011 13:42:08 +0000 (13:42 +0000)]
Check for valid filename in write_pdml_preamble().

Part of fix for bug 6245.

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

8 years agoFrom Yann via bug 6245:
stig [Tue, 16 Aug 2011 13:27:41 +0000 (13:27 +0000)]
From Yann via bug 6245:
Fixed crash in write_preamble().

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

8 years agoBased on patch from Denis Ovsienko via
morriss [Tue, 16 Aug 2011 13:16:33 +0000 (13:16 +0000)]
Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

Fix typo: s/unkown/unknown/

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

8 years agoAllow the dissection of BER/DER carried over a TCP transport using
gal [Tue, 16 Aug 2011 12:28:17 +0000 (12:28 +0000)]
Allow the dissection of BER/DER carried over a TCP transport using
"Decode As..."

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

8 years agoAt least for the Provider Service Table items, they're part of 802.11,
guy [Tue, 16 Aug 2011 11:11:17 +0000 (11:11 +0000)]
At least for the Provider Service Table items, they're part of 802.11,
so precede their field names with "wlan.".  Fix some of their long names
and descriptions (no need to spell out "Internet Protocol" or "Medium
Access Control", for example).

Give the "Number of Channels" field a more reasonable name (and one that
avoids the problem of spelling "unknown" incorrectly).

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

8 years agoAn option to autoscroll the expanded item in the details view to a fixed
gal [Tue, 16 Aug 2011 10:57:52 +0000 (10:57 +0000)]
An option to autoscroll the expanded item in the details view to a fixed
position (percentage) within the details view.

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

8 years agoFor GTK3: Change type of unused parameter GtkObject -> GObject
jmayer [Tue, 16 Aug 2011 10:35:42 +0000 (10:35 +0000)]
For GTK3: Change type of unused parameter GtkObject -> GObject

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

8 years agoWith gtk3, gtk_adjustment_new changed the return type:
jmayer [Tue, 16 Aug 2011 10:31:38 +0000 (10:31 +0000)]
With gtk3, gtk_adjustment_new changed the return type:
  GtkObject -> GtkAdjustment

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

8 years agoUsing enabled/disabled instead of yes/no seems to be more descriptive.
tuexen [Tue, 16 Aug 2011 10:03:49 +0000 (10:03 +0000)]
Using enabled/disabled instead of yes/no seems to be more descriptive.

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

8 years agoHandle the case in the capture options dialog box
tuexen [Tue, 16 Aug 2011 09:35:14 +0000 (09:35 +0000)]
Handle the case in the capture options dialog box
where no interfaces are available.

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

8 years agoDon't prefix description with imf.
stig [Tue, 16 Aug 2011 09:08:36 +0000 (09:08 +0000)]
Don't prefix description with imf.

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

8 years agoAdd libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDB
gerald [Mon, 15 Aug 2011 22:00:21 +0000 (22:00 +0000)]
Add libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDB
archive. Add libwsutil.pdb and sort a few items while we're here.

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

8 years agoMark parent parameter to about_wireshark() as unused because its use
sfisher [Mon, 15 Aug 2011 21:20:59 +0000 (21:20 +0000)]
Mark parent parameter to about_wireshark() as unused because its use
was commented out in r38549.

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

8 years agogdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent...
etxrab [Mon, 15 Aug 2011 20:56:00 +0000 (20:56 +0000)]
gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent is gone in GTK 3.0.
Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.

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

8 years agoUse better names.
tuexen [Mon, 15 Aug 2011 20:39:44 +0000 (20:39 +0000)]
Use better names.
Make sure that the dlt is always set.

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

8 years agoFix trivial compilation error:
sfisher [Mon, 15 Aug 2011 16:17:36 +0000 (16:17 +0000)]
Fix trivial compilation error:

  gui_utils.c:1880:39: error: no newline at end of file

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

8 years agogtk_quit_add_destroy() is deprecated in GTK 3.0.
etxrab [Mon, 15 Aug 2011 14:42:01 +0000 (14:42 +0000)]
gtk_quit_add_destroy() is deprecated in GTK 3.0.
(I hope tis is the right thing to do).

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

8 years agoHmm try this instead.
etxrab [Mon, 15 Aug 2011 14:36:58 +0000 (14:36 +0000)]
Hmm try this instead.

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

8 years agogtk_quit_add_destroy() is deprecated in GTK 3.0.
etxrab [Mon, 15 Aug 2011 14:30:14 +0000 (14:30 +0000)]
gtk_quit_add_destroy() is deprecated in GTK 3.0.
(I hope tis is the right thing to do).

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

8 years agoSave graph GTK =< 2.22
etxrab [Mon, 15 Aug 2011 05:36:48 +0000 (05:36 +0000)]
Save graph GTK =< 2.22

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

8 years agoFrom Jeremy Quirke:
etxrab [Mon, 15 Aug 2011 04:39:30 +0000 (04:39 +0000)]
From Jeremy Quirke:
misdecoding 3G Neighbour Cell Information Element in SI2quater message due to a coding typo

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

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

8 years agoMake save IO graph work, I had to make a local copy of
etxrab [Sun, 14 Aug 2011 21:40:25 +0000 (21:40 +0000)]
Make save IO graph work, I had to make a local copy of
GTK 3.0 function gdk_pixbuf_get_from_surface() put in gui_util.c

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

8 years agoCheck arguments to prefs_find_preference().
stig [Sun, 14 Aug 2011 20:31:16 +0000 (20:31 +0000)]
Check arguments to prefs_find_preference().

Fix CID 1259.

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

8 years agoAdded extra argument check in rebuild_protocol_prefs_menu().
stig [Sun, 14 Aug 2011 20:21:12 +0000 (20:21 +0000)]
Added extra argument check in rebuild_protocol_prefs_menu().

Fix CID 1258.

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

8 years agoUse correct arguments in simple_dialog().
stig [Sun, 14 Aug 2011 19:55:10 +0000 (19:55 +0000)]
Use correct arguments in simple_dialog().

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

8 years agoUse simple_dialog() for error messages.
stig [Sun, 14 Aug 2011 19:35:18 +0000 (19:35 +0000)]
Use simple_dialog() for error messages.

Fix CID 1266.

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

8 years agoUse floorl() instead of truncl() on all platforms.
stig [Sun, 14 Aug 2011 18:53:28 +0000 (18:53 +0000)]
Use floorl() instead of truncl() on all platforms.

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

8 years agogtk_combo_box_set_active() takes a GtkComboBox *, not a GtkComboBoxText
guy [Sun, 14 Aug 2011 17:14:52 +0000 (17:14 +0000)]
gtk_combo_box_set_active() takes a GtkComboBox *, not a GtkComboBoxText
*, as its argument.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-08-14]
gerald [Sun, 14 Aug 2011 14:03:42 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-08-14]

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

8 years agoBeing loopback is an interface property, not an address property.
tuexen [Sun, 14 Aug 2011 13:05:08 +0000 (13:05 +0000)]
Being loopback is an interface property, not an address property.
Display it as such.

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

8 years agoTake the interface description into account when looking up the preferred
tuexen [Sun, 14 Aug 2011 12:37:35 +0000 (12:37 +0000)]
Take the interface description into account when looking up the preferred
interface to capture from.

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

8 years agoPreserve previous selected capture filters when opening the Edit Interface Settings
tuexen [Sun, 14 Aug 2011 11:58:05 +0000 (11:58 +0000)]
Preserve previous selected capture filters when opening the Edit Interface Settings
dialog box. This fixes a bug reported by Chris.

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

8 years agoGet rid of unused code.
tuexen [Sun, 14 Aug 2011 10:35:05 +0000 (10:35 +0000)]
Get rid of unused code.

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

8 years agoUse address counter...
tuexen [Sun, 14 Aug 2011 10:22:31 +0000 (10:22 +0000)]
Use address counter...

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

8 years agoImprove handling of remote interfaces.
tuexen [Sun, 14 Aug 2011 09:54:52 +0000 (09:54 +0000)]
Improve handling of remote interfaces.

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

8 years agoCount number of ip addresses and use this count to determine if we shall
stig [Sun, 14 Aug 2011 09:29:47 +0000 (09:29 +0000)]
Count number of ip addresses and use this count to determine if we shall
print the addresses string in the devices list.

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

8 years agoImprove the resizing of the capture options dialog box.
tuexen [Sun, 14 Aug 2011 08:54:53 +0000 (08:54 +0000)]
Improve the resizing of the capture options dialog box.
This was suggested by Stig.

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

8 years agoUse correct callback for time shift.
stig [Sun, 14 Aug 2011 08:03:25 +0000 (08:03 +0000)]
Use correct callback for time shift.
Don't use <control>A for time shift.

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

8 years agoDon't map "no interfaces" to "none" and then back to an empty string;
guy [Sat, 13 Aug 2011 23:34:28 +0000 (23:34 +0000)]
Don't map "no interfaces" to "none" and then back to an empty string;
just map it to an empty string.

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

8 years agoDo more checking of the TLV length. Yes, the length can be zero or
guy [Sat, 13 Aug 2011 22:33:14 +0000 (22:33 +0000)]
Do more checking of the TLV length.  Yes, the length can be zero or
negative in a malformed packet.  Should fix bug 6238.

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

8 years agoDon't print "none" if no addresses are available to save space.
tuexen [Sat, 13 Aug 2011 20:47:48 +0000 (20:47 +0000)]
Don't print "none" if no addresses are available to save space.
Patch provided by Stig.

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

8 years agoFix warnings reported by Bill.
tuexen [Sat, 13 Aug 2011 20:21:25 +0000 (20:21 +0000)]
Fix warnings reported by Bill.

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

8 years agoSome cleanup.
tuexen [Sat, 13 Aug 2011 20:12:27 +0000 (20:12 +0000)]
Some cleanup.

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