obnox/wireshark/wip.git
12 years agoMake USE_THREADS actually work with cmake
jmayer [Thu, 21 Jul 2011 00:13:14 +0000 (00:13 +0000)]
Make USE_THREADS actually work with cmake

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

12 years agoFrom Martin Kaiser:
etxrab [Wed, 20 Jul 2011 22:34:57 +0000 (22:34 +0000)]
From Martin Kaiser:
Add support for the ca_pmt_reply apdu as defined in section 8.4.3.5 of the DVB-CI standard (EN 50221).

Also some new apdu tags and their descriptions are added for completeness.
After applying this patch, DVB-CI support is complete except for reassembly

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

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

12 years agoFrom Lei Chen:
etxrab [Wed, 20 Jul 2011 22:07:31 +0000 (22:07 +0000)]
From Lei Chen:
patch to support "Additional MS Radio Access Capability" and "Packet Pause" in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6133

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

12 years agoUse ENC_BIG_ENDIAN.
etxrab [Wed, 20 Jul 2011 14:09:19 +0000 (14:09 +0000)]
Use ENC_BIG_ENDIAN.

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

12 years agostrdup -> g_strdup
etxrab [Wed, 20 Jul 2011 13:53:00 +0000 (13:53 +0000)]
strdup -> g_strdup

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

12 years agoSynchronize the selection of interfaces between the main welcome
tuexen [Wed, 20 Jul 2011 12:51:57 +0000 (12:51 +0000)]
Synchronize the selection of interfaces between the main welcome
window, the capture/interface dialog box and the capture / start
menu item.
Obtained from Irene Ruengeler.

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

12 years agoDon't sanity-check snaplen against frame length if snaplen is 0.
martinm [Wed, 20 Jul 2011 12:24:41 +0000 (12:24 +0000)]
Don't sanity-check snaplen against frame length if snaplen is 0.

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

12 years agoRegister nicer entry points for LTE RRC BCH messages, and use them in RLC, MAC, PDCP.
martinm [Wed, 20 Jul 2011 12:19:22 +0000 (12:19 +0000)]
Register nicer entry points for LTE RRC BCH messages, and use them in RLC, MAC, PDCP.

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

12 years agoRegularize style a bit in help messages.
guy [Wed, 20 Jul 2011 05:49:24 +0000 (05:49 +0000)]
Regularize style a bit in help messages.

Clean up capitalization.

Fix a comment.

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

12 years agoApply some endian heuristics when dissecting ICMP originate, receive and transmit...
cmaynard [Wed, 20 Jul 2011 00:22:31 +0000 (00:22 +0000)]
Apply some endian heuristics when dissecting ICMP originate, receive and transmit timestamps.  Fixes bug 6114.

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

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

12 years agoAdd a DREP_LITTLE_ENDIAN for the DCE RPC endianness bit in the data
guy [Tue, 19 Jul 2011 23:02:02 +0000 (23:02 +0000)]
Add a DREP_LITTLE_ENDIAN for the DCE RPC endianness bit in the data
representation.  Use it rather than a raw 0x10.

Add a DREP_ENC_INTEGER() macro that takes a pointer to the data
representation and returns either ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN;
use it for the encoding argument to proto_tree_add_item(), rather than
just the AND of drep[0] and DREP_LITTLE_ENDIAN, as it's not a boolean
any more, and for string values we'll be supporting character encodings
as well and thus won't be able to trust that the 0x10 bit will mean
"little endian".

Use ENC_NA for some other encoding values, i.e. for FT_BYTES and the
like.

Fix a couple of places in the DCOM dissector where we were passing the
byte-order bit rather than the field value to
proto_tree_add_uint_format().

Clean up white space.

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

12 years agoThe GTK+ documentation says we can pass NULL to gtk_table_get_size(). Do
gerald [Tue, 19 Jul 2011 22:38:28 +0000 (22:38 +0000)]
The GTK+ documentation says we can pass NULL to gtk_table_get_size(). Do
that instead of using a dummy variable.

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

12 years agoUse ENC_NA for FT_PROTOCOL.
stig [Tue, 19 Jul 2011 19:37:58 +0000 (19:37 +0000)]
Use ENC_NA for FT_PROTOCOL.

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

12 years agoUse ENC_NA for hf_fragments (FT_NONE).
stig [Tue, 19 Jul 2011 19:37:45 +0000 (19:37 +0000)]
Use ENC_NA for hf_fragments (FT_NONE).

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

12 years agoReenable the commented out code. I was able to reproducably break
jmayer [Tue, 19 Jul 2011 19:36:26 +0000 (19:36 +0000)]
Reenable the commented out code. I was able to reproducably break
the compilation but after a complete removal of the build directory
and a rebuild the problem is gone.

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

12 years agoUse ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.
stig [Tue, 19 Jul 2011 18:48:31 +0000 (18:48 +0000)]
Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.

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

12 years agoInstead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
gerald [Tue, 19 Jul 2011 18:22:46 +0000 (18:22 +0000)]
Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.

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

12 years agoThere are some undefined symbols in the code: comment out
jmayer [Tue, 19 Jul 2011 18:00:08 +0000 (18:00 +0000)]
There are some undefined symbols in the code: comment out
the problematic code parts.

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

12 years agoBack out parts of 38112, as pointed out by Stig Bj\370rlykke:
jmayer [Tue, 19 Jul 2011 17:40:23 +0000 (17:40 +0000)]
Back out parts of 38112, as pointed out by Stig Bj\370rlykke:

The changes in profile_dlg.c, uat_gui.c and new_packet_list.c does not
work.  The tooltip is not displayed, and it's not possible to get the
context menu from a column header in the packet list.
...
I guess gtk_tree_view_column_get_widget() does not return
column->button, which is the widget we use.

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

12 years agoMartin Mathieson: gtk_table_get_size() was only introduced in gtk 2.22
jmayer [Tue, 19 Jul 2011 17:29:27 +0000 (17:29 +0000)]
Martin Mathieson: gtk_table_get_size() was only introduced in gtk 2.22

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

12 years agoFrom Pradip Biswas, bug 6127 - Added Decode for RRC BCCH (BCH and DL_SCH) messages...
martinm [Tue, 19 Jul 2011 16:41:56 +0000 (16:41 +0000)]
From Pradip Biswas, bug 6127 - Added Decode for RRC BCCH (BCH and DL_SCH) messages on RLC-over-UDP.

Add separate codes/cases for BCH-over-BCH and BCH-over-DLSCH.

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

12 years agoPull WIRESHARK_LIBS from the system environment if it's available.
gerald [Tue, 19 Jul 2011 16:26:42 +0000 (16:26 +0000)]
Pull WIRESHARK_LIBS from the system environment if it's available.

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

12 years agoGet rid of direct access to struct GtkToggleButton
jmayer [Tue, 19 Jul 2011 16:02:16 +0000 (16:02 +0000)]
Get rid of direct access to struct GtkToggleButton

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

12 years agoFix access to the following stuctures:
jmayer [Tue, 19 Jul 2011 15:13:36 +0000 (15:13 +0000)]
Fix access to the following stuctures:
GtkCheckMenuItem
GtkTable
GtkTreeViewColumn

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

12 years agoGet rid of all GtkAdjustment element accesses. Fix a bug
jmayer [Tue, 19 Jul 2011 14:33:50 +0000 (14:33 +0000)]
Get rid of all GtkAdjustment element accesses. Fix a bug
introduced when fixing this stuff for rtp_player.c

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

12 years agoBased on the information provided by Steve Karg via -dev, change all occurrences...
cmaynard [Tue, 19 Jul 2011 13:19:49 +0000 (13:19 +0000)]
Based on the information provided by Steve Karg via -dev, change all occurrences of ENC_LITTLE_ENDIAN to ENC_BIG_ENDIAN.

Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00305.html

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

12 years agoGet the interfaces list from the Capture / Interfaces list in sync
tuexen [Tue, 19 Jul 2011 12:42:18 +0000 (12:42 +0000)]
Get the interfaces list from the Capture / Interfaces list in sync
when using the capture / start menu item.

Obtained from Irene Ruengeler.

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

12 years agoFix some errors when compiling with -DGSEAL_ENABLE.
jmayer [Tue, 19 Jul 2011 11:02:26 +0000 (11:02 +0000)]
Fix some errors when compiling with -DGSEAL_ENABLE.

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

12 years agoUse correct encoding for proto_tree_add_item().
stig [Tue, 19 Jul 2011 10:51:12 +0000 (10:51 +0000)]
Use correct encoding for proto_tree_add_item().

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

12 years agoUse ENC_LITTLE_ENDIAN rather than TRUE in proto_tree_add_item() calls.
guy [Tue, 19 Jul 2011 03:20:02 +0000 (03:20 +0000)]
Use ENC_LITTLE_ENDIAN rather than TRUE in proto_tree_add_item() calls.
(Yes, that means that all but one call uses ENC_LITTLE_ENDIAN, and one
uses ENC_BIG_ENDIAN.  I guess that's how the protocol works....)

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

12 years agoFrom Michael Mann via bug 5769: In fDevice_Instance(), add field in proper
cmaynard [Tue, 19 Jul 2011 02:47:12 +0000 (02:47 +0000)]
From Michael Mann via bug 5769:  In fDevice_Instance(), add field in proper
big-endian byte order.

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

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

12 years agoWork around an annoying problem caused by the collision of GNU gettext's
guy [Tue, 19 Jul 2011 02:29:31 +0000 (02:29 +0000)]
Work around an annoying problem caused by the collision of GNU gettext's
configure script's attempts to deal with AIX 4 and Lion and/or Xcode 4's
dealings with Fortify.

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

12 years agoAt the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF)
cmaynard [Tue, 19 Jul 2011 01:46:16 +0000 (01:46 +0000)]
At the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF)

Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00156.html

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

12 years agoAdd instructions how to use the database offline (taken from
jmayer [Mon, 18 Jul 2011 20:49:35 +0000 (20:49 +0000)]
Add instructions how to use the database offline (taken from
an explanation by Chris Maynard)

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

12 years agoAdd a comment how to actually use the protocol help.
jmayer [Mon, 18 Jul 2011 20:44:01 +0000 (20:44 +0000)]
Add a comment how to actually use the protocol help.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Mon, 18 Jul 2011 19:11:32 +0000 (19:11 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

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

12 years agoUpdate status file to current state and statistics
jmayer [Mon, 18 Jul 2011 18:24:22 +0000 (18:24 +0000)]
Update status file to current state and statistics

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

12 years agoFix some trivial cases of gdk-deprecated warnings. The remaining
jmayer [Mon, 18 Jul 2011 18:16:36 +0000 (18:16 +0000)]
Fix some trivial cases of gdk-deprecated warnings. The remaining
ones have to be fixed by someone who understands the code.

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

12 years agoIgnore interfaces without a name.
tuexen [Mon, 18 Jul 2011 17:44:26 +0000 (17:44 +0000)]
Ignore interfaces without a name.

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

12 years agoMake a check a bit more pedantic.
tuexen [Mon, 18 Jul 2011 17:15:45 +0000 (17:15 +0000)]
Make a check a bit more pedantic.

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

12 years agoMake sure that the Capture/Start menue item will always use the
tuexen [Mon, 18 Jul 2011 16:20:19 +0000 (16:20 +0000)]
Make sure that the Capture/Start menue item will always use the
same interfaces as selected in the Main Welcome Window.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Mon, 18 Jul 2011 15:54:25 +0000 (15:54 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Mon, 18 Jul 2011 15:52:16 +0000 (15:52 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

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

12 years agoGet --enable-ui-manager working.
tuexen [Mon, 18 Jul 2011 13:36:11 +0000 (13:36 +0000)]
Get --enable-ui-manager working.

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

12 years agoSmall comment update: GtkItemFactory has been deprecated as of gtk 2.4
jmayer [Mon, 18 Jul 2011 13:19:34 +0000 (13:19 +0000)]
Small comment update: GtkItemFactory has been deprecated as of gtk 2.4
(aka close to forever).

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Mon, 18 Jul 2011 12:50:26 +0000 (12:50 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

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

12 years agoAdd option --enable-uimanager to mimic cmake -DUI_MANAGER=ON
jmayer [Mon, 18 Jul 2011 12:49:16 +0000 (12:49 +0000)]
Add option --enable-uimanager to mimic cmake -DUI_MANAGER=ON

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

12 years agoAdd instructions how to work with "git svn" instead of "svn"
jmayer [Mon, 18 Jul 2011 12:44:19 +0000 (12:44 +0000)]
Add instructions how to work with "git svn" instead of "svn"

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

12 years agoUpdate STATUS.gtk3
jmayer [Mon, 18 Jul 2011 12:40:40 +0000 (12:40 +0000)]
Update STATUS.gtk3
Make linking with stubbed out proto_help functions really work.
Add a comment to proto_help that its functionality will be lost
  once we make the ui-manager code default unless someone cares
  enough to fix it.
Enable -DGTK_DISABLE_DEPRECATED iff building with ui-manager.

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

12 years agoPrevent error about undefined function while linking.
jmayer [Mon, 18 Jul 2011 12:18:00 +0000 (12:18 +0000)]
Prevent error about undefined function while linking.

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

12 years agoFor UL retx, show links forward to next Tx as well as backwards to previous.
martinm [Mon, 18 Jul 2011 11:57:38 +0000 (11:57 +0000)]
For UL retx, show links forward to next Tx as well as backwards to previous.

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

12 years agoAdd a generated field for the number of NACKs in an AM status PDU.
martinm [Mon, 18 Jul 2011 10:40:57 +0000 (10:40 +0000)]
Add a generated field for the number of NACKs in an AM status PDU.

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

12 years agoWe don't have an "--enable-osxapp" configure option; update a comment.
guy [Sun, 17 Jul 2011 23:47:10 +0000 (23:47 +0000)]
We don't have an "--enable-osxapp" configure option; update a comment.

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

12 years agoGet rid of the .pkg and .dmg with "make clean".
guy [Sun, 17 Jul 2011 20:40:13 +0000 (20:40 +0000)]
Get rid of the .pkg and .dmg with "make clean".

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

12 years agoAdd the .pkg and .dmg to the list of files to ignore.
guy [Sun, 17 Jul 2011 20:36:17 +0000 (20:36 +0000)]
Add the .pkg and .dmg to the list of files to ignore.

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

12 years agoHandle versions of GTK+ where gdk-pixbuf is a separate library.
guy [Sun, 17 Jul 2011 20:23:07 +0000 (20:23 +0000)]
Handle versions of GTK+ where gdk-pixbuf is a separate library.

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

12 years agoCleanup and indent in Makefile.
stig [Sun, 17 Jul 2011 17:56:57 +0000 (17:56 +0000)]
Cleanup and indent in Makefile.

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

12 years agoCheck for a valid wspy_dissectors disectory to avoid a warning if missing.
stig [Sun, 17 Jul 2011 17:56:42 +0000 (17:56 +0000)]
Check for a valid wspy_dissectors disectory to avoid a warning if missing.

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

12 years ago[Automatic manuf, services and enterprise-numbers update for 2011-07-17]
gerald [Sun, 17 Jul 2011 14:03:36 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-07-17]

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

12 years agoInclude Cairo lib to be able to use caro functions.
etxrab [Sun, 17 Jul 2011 13:18:55 +0000 (13:18 +0000)]
Include Cairo lib to be able to use caro functions.

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

12 years agoRepair "Follow TCP Stream" which got broken by my change in SVN 38056
sake [Sun, 17 Jul 2011 11:08:02 +0000 (11:08 +0000)]
Repair "Follow TCP Stream" which got broken by my change in SVN 38056

Mental note: Try to not do half work ;-)

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

12 years agoImproved check for valid custom column in preferences.
stig [Sat, 16 Jul 2011 18:30:57 +0000 (18:30 +0000)]
Improved check for valid custom column in preferences.

This fixes bug 6131.

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

12 years agoRemove redundant code.
tuexen [Sat, 16 Jul 2011 17:04:48 +0000 (17:04 +0000)]
Remove redundant code.

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

12 years agoUse correct plausability check.
tuexen [Sat, 16 Jul 2011 14:19:43 +0000 (14:19 +0000)]
Use correct plausability check.

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

12 years agoAdd option for USE_THREADS.
tuexen [Sat, 16 Jul 2011 13:05:46 +0000 (13:05 +0000)]
Add option for USE_THREADS.

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

12 years agoUse threads per default. Same as on Windows.
tuexen [Sat, 16 Jul 2011 13:02:44 +0000 (13:02 +0000)]
Use threads per default. Same as on Windows.

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

12 years agoUse the threads based workaround only on windows (with thread support enabled),
tuexen [Sat, 16 Jul 2011 12:45:47 +0000 (12:45 +0000)]
Use the threads based workaround only on windows (with thread support enabled),
since the workaround is only intended to work on windows.

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

12 years agoProvide information regarding thred support.
tuexen [Sat, 16 Jul 2011 12:19:57 +0000 (12:19 +0000)]
Provide information regarding thred support.

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

12 years agoDon't allow capturing from multiple interface when compiled with multiple thread
tuexen [Sat, 16 Jul 2011 11:07:32 +0000 (11:07 +0000)]
Don't allow capturing from multiple interface when compiled with multiple thread
support.

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

12 years agoStop using the conversation index for tcp stream values as the gaps in the numbering...
sake [Fri, 15 Jul 2011 23:40:16 +0000 (23:40 +0000)]
Stop using the conversation index for tcp stream values as the gaps in the numbering is causing to many questions. Also, numbering could be different for the same file when viewed on different Wireshark versions, which could lead to confusion too.

(see also: http://ask.wireshark.org/questions/5056/how-does-wireshark-calculate-the-tcp-stream-index)

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

12 years agoPatch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
guy [Fri, 15 Jul 2011 23:26:22 +0000 (23:26 +0000)]
Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".

This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.

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

12 years agoUpdate URL addition in r37899 with an "original" site instead of a mirror.
sfisher [Fri, 15 Jul 2011 22:50:53 +0000 (22:50 +0000)]
Update URL addition in r37899 with an "original" site instead of a mirror.

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

12 years agoAdd Joerg Mayer's macos-setup.sh script, modified to add an "x" after
guy [Fri, 15 Jul 2011 21:48:02 +0000 (21:48 +0000)]
Add Joerg Mayer's macos-setup.sh script, modified to add an "x" after
"macos", to fix some bugs, to use "sudo" if necessary when installing,
to make the library version numbers variables, and to download the
optional libraries, by default, as well.  Also add his patches to make
GLib build and work.

Update README.macos to reflect that.

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

12 years agoGet rid of two gtk runtime warnings.
tuexen [Fri, 15 Jul 2011 21:26:43 +0000 (21:26 +0000)]
Get rid of two gtk runtime warnings.

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

12 years agoDon't show interface info when loading a capture file.
tuexen [Fri, 15 Jul 2011 20:45:28 +0000 (20:45 +0000)]
Don't show interface info when loading a capture file.

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

12 years agoFrom bug 6129:
stig [Fri, 15 Jul 2011 19:35:46 +0000 (19:35 +0000)]
From bug 6129:
Added proto_tree_add_uint_bits_format_value to libwireshark.def.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
wmeier [Fri, 15 Jul 2011 19:07:25 +0000 (19:07 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

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

12 years agoUpdate ptvcursor API description to reflect 'endianness' --> 'encoding' parameter...
wmeier [Fri, 15 Jul 2011 17:44:24 +0000 (17:44 +0000)]
Update ptvcursor API description to reflect 'endianness' --> 'encoding' parameter change.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Fri, 15 Jul 2011 16:59:18 +0000 (16:59 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Whitespace changes: "4 space tabs" --> spaces.

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

12 years agoEnsure that USE_THREADS is defined when --enable-threads is specified.
tuexen [Fri, 15 Jul 2011 14:59:42 +0000 (14:59 +0000)]
Ensure that USE_THREADS is defined when --enable-threads is specified.

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

12 years agoYou can't create a mutex without initializing the thread system.
tuexen [Fri, 15 Jul 2011 14:58:45 +0000 (14:58 +0000)]
You can't create a mutex without initializing the thread system.
So #ifdef the code with USE_THREADS.

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

12 years agoFix compilation on non-windows platforms defining USE_THREADS.
tuexen [Fri, 15 Jul 2011 14:31:27 +0000 (14:31 +0000)]
Fix compilation on non-windows platforms defining USE_THREADS.

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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