obnox/wireshark/wip.git
12 years agoFrom Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
alagoutte [Sat, 30 Jul 2011 15:20:40 +0000 (15:20 +0000)]
From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

Subject: [PATCH 4/9] eliminate obsolete non-standard 80211s peer link action frame code

The peer link action frame no longer exists.  Its data now appears in the self-protected action frame and the peering management IE.

Note that this leaves a gap in the internal field codes that is addressed in a subsequent patch.

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

12 years agoFrom Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
alagoutte [Sat, 30 Jul 2011 15:19:10 +0000 (15:19 +0000)]
From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 3/9] add support for 802.11s v12.0 mesh peering management IE

The v12.0 mesh peering management IE replaces the exiting mesh peer link management IE and has a slightly different format.

From me
Fix checkAPI Errors (the blurb field matches the field name)
Remove unused hf_ieee80211_mesh_mgt_pl_reason_code

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

12 years agoFrom Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
alagoutte [Sat, 30 Jul 2011 15:16:30 +0000 (15:16 +0000)]
From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 2/9] add support for 802.11s v12.0 action frame fixed fields

From me
Fix checkAPI Errors (the blurb field matches the field name)

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

12 years agoFrom Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
alagoutte [Sat, 30 Jul 2011 15:14:19 +0000 (15:14 +0000)]
From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 1/9] update mesh ID and mesh config IEs to latest 80211s draft (v12)

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

12 years ago* Replace FALSE by ENC_BIG_ENDIAN for encoding parameter
alagoutte [Sat, 30 Jul 2011 14:11:08 +0000 (14:11 +0000)]
* Replace FALSE by ENC_BIG_ENDIAN for encoding parameter
* Remove some whitespace...

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

12 years agoAdd 3GPP Sv interface.
etxrab [Sat, 30 Jul 2011 14:05:55 +0000 (14:05 +0000)]
Add 3GPP Sv interface.

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

12 years agoAdd 3GPP Sv interface.
etxrab [Sat, 30 Jul 2011 14:05:31 +0000 (14:05 +0000)]
Add 3GPP Sv interface.

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

12 years agoFix a typo.
stig [Sat, 30 Jul 2011 09:52:40 +0000 (09:52 +0000)]
Fix a typo.

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

12 years agoCCRSI is not included in 3GPP 29.274 R8.
etxrab [Sat, 30 Jul 2011 09:33:10 +0000 (09:33 +0000)]
CCRSI is not included in 3GPP 29.274 R8.
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6183

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

12 years agoFix the problem in the .c file.
jmayer [Sat, 30 Jul 2011 09:17:08 +0000 (09:17 +0000)]
Fix the problem in the .c file.

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

12 years agoThe last commit contained a change too much. Revert it.
jmayer [Sat, 30 Jul 2011 08:49:18 +0000 (08:49 +0000)]
The last commit contained a change too much. Revert it.

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

12 years agoMacros aren't functions: Back out rev 38264 and wait for someone who knows what he...
jmayer [Sat, 30 Jul 2011 08:48:20 +0000 (08:48 +0000)]
Macros aren't functions: Back out rev 38264 and wait for someone who knows what he is doing to fix this

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

12 years ago- Put gtk_table_get_size into old-gtk-compat.h
jmayer [Sat, 30 Jul 2011 08:33:33 +0000 (08:33 +0000)]
- Put gtk_table_get_size into old-gtk-compat.h
- Shorten comment about sealing bug.

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

12 years agoLooks like ->column was sealed during the gtk 2.13 development cycle.
jmayer [Fri, 29 Jul 2011 22:29:31 +0000 (22:29 +0000)]
Looks like ->column was sealed during the gtk 2.13 development cycle.

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

12 years agoPrint a more correct error message when missing gtk3.
stig [Fri, 29 Jul 2011 19:35:16 +0000 (19:35 +0000)]
Print a more correct error message when missing gtk3.

This fixes bug 6181.

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

12 years agoTry build with GSEAL_ENABLE if not gtk3 again.
stig [Fri, 29 Jul 2011 17:00:59 +0000 (17:00 +0000)]
Try build with GSEAL_ENABLE if not gtk3 again.

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

12 years agoLooks like button was deprecated with version 20, not 22
jmayer [Fri, 29 Jul 2011 16:50:35 +0000 (16:50 +0000)]
Looks like button was deprecated with version 20, not 22

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

12 years agoRemove unneeded #includes and do other minor cleanup.
wmeier [Fri, 29 Jul 2011 16:07:00 +0000 (16:07 +0000)]
Remove unneeded #includes and do other minor cleanup.

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

12 years agoFrom Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6147
alagoutte [Fri, 29 Jul 2011 14:26:41 +0000 (14:26 +0000)]
From Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6147
6LoWPAN: Support for IP-in-IP tunnelingy

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

12 years agoFrom Colin O'Flynn & Robert Craige via https://bugs.wireshark.org/bugzilla/show_bug...
alagoutte [Fri, 29 Jul 2011 13:19:16 +0000 (13:19 +0000)]
From Colin O'Flynn & Robert Craige via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6109
Add support for PANA Relay

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

12 years agoRemoved building with GSEAL_ENABLE, does not work yet.
stig [Fri, 29 Jul 2011 12:06:24 +0000 (12:06 +0000)]
Removed building with GSEAL_ENABLE, does not work yet.

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

12 years agoBuild with GSEAL_ENABLE if not gtk3.
stig [Fri, 29 Jul 2011 11:04:58 +0000 (11:04 +0000)]
Build with GSEAL_ENABLE if not gtk3.

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

12 years agoMake it compile.
stig [Fri, 29 Jul 2011 10:53:51 +0000 (10:53 +0000)]
Make it compile.

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

12 years agoGet rid of non-ASCII characters.
guy [Fri, 29 Jul 2011 10:28:29 +0000 (10:28 +0000)]
Get rid of non-ASCII characters.

Clean up white space.

Clean up capitalization a bit.

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

12 years ago - Always build with GSEAL_ENABLE
etxrab [Fri, 29 Jul 2011 10:12:48 +0000 (10:12 +0000)]
 - Always build with GSEAL_ENABLE

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

12 years agoRemove remaining direct access to GTK structs in Windows.
etxrab [Fri, 29 Jul 2011 10:11:24 +0000 (10:11 +0000)]
Remove remaining direct access to GTK structs in Windows.

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

12 years agoGet it compiling.
tuexen [Fri, 29 Jul 2011 07:24:15 +0000 (07:24 +0000)]
Get it compiling.

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

12 years agoFrom Wido Kelling:
etxrab [Fri, 29 Jul 2011 05:36:57 +0000 (05:36 +0000)]
From Wido Kelling:
Add Dissection of newly released PNIO IEC 61158 Version 2.3.
From me use ENC_BIG_ENDIAN.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6154

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

12 years agoFrom Lei Chen:
etxrab [Fri, 29 Jul 2011 05:19:29 +0000 (05:19 +0000)]
From Lei Chen:
support PSI5 and PSI13 in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6177

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

12 years agoAvoid a possible infinite loop in dissect_delete().
stig [Thu, 28 Jul 2011 22:19:46 +0000 (22:19 +0000)]
Avoid a possible infinite loop in dissect_delete().

This may fix the "Malformed IKE Packet DoS" bug.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
wmeier [Thu, 28 Jul 2011 18:17:16 +0000 (18:17 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
wmeier [Thu, 28 Jul 2011 17:57:11 +0000 (17:57 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.

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

12 years ago Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
wmeier [Thu, 28 Jul 2011 17:05:56 +0000 (17:05 +0000)]
 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
 Also:
   Return same 'offset' from functions whether or not 'if(tree)'

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
wmeier [Thu, 28 Jul 2011 16:54:42 +0000 (16:54 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
Also:
  Return same 'offset' from functions whether or not 'if(tree)'

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

12 years agoMake links forward from DL tx to retx frames.
martinm [Thu, 28 Jul 2011 16:52:02 +0000 (16:52 +0000)]
Make links forward from DL tx to retx frames.

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
wmeier [Thu, 28 Jul 2011 15:34:18 +0000 (15:34 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
Also:
  Use -1 iso tvb_[reported_]length() as 'len' arg in proto_tree_add_...();
  Use tvb_reported_length_remaining() where appropriate.

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

12 years agoUse cairo for drawing.
etxrab [Thu, 28 Jul 2011 14:25:09 +0000 (14:25 +0000)]
Use cairo for drawing.

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

12 years ago- Always build with GSEAL_ENABLE
jmayer [Thu, 28 Jul 2011 14:21:29 +0000 (14:21 +0000)]
- Always build with GSEAL_ENABLE
- Enable the extra warnings only when building with GTK2 (but not GTK3
  directly).

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

12 years agoCommit a hack^wworkaround for the missing accessor function to the column
jmayer [Thu, 28 Jul 2011 14:11:21 +0000 (14:11 +0000)]
Commit a hack^wworkaround for the missing accessor function to the column
element in GtkTreeView when building with GSEAL.

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

12 years agoAdd a cast to avoid "conversion from size_t to int, possible loss of data" warning...
cmaynard [Thu, 28 Jul 2011 12:28:06 +0000 (12:28 +0000)]
Add a cast to avoid "conversion from size_t to int, possible loss of data" warning found when attempting to create the U3 package on Windows 7-x64.  Hmm, why doesn't the Window 7-x64 buildbot build U3 or portableapps packages?

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

12 years agoDiameter dissector does not decode User-Authorization-Type AVP properly and add AVP...
etxrab [Thu, 28 Jul 2011 11:45:47 +0000 (11:45 +0000)]
Diameter dissector does not decode User-Authorization-Type AVP properly and add AVP 651.

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

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

12 years agoapplication/simservs+xml
etxrab [Thu, 28 Jul 2011 10:04:12 +0000 (10:04 +0000)]
application/simservs+xml

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

12 years agoReplace gdk_draw_rectangle() with cairo equivalents
etxrab [Thu, 28 Jul 2011 09:21:43 +0000 (09:21 +0000)]
Replace gdk_draw_rectangle() with cairo equivalents

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

12 years agoFrom Dirk:
etxrab [Thu, 28 Jul 2011 05:49:47 +0000 (05:49 +0000)]
From Dirk:
support ISO style date and time for frame.time filter

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

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

12 years agoFrom Edwin Groothuis:
etxrab [Thu, 28 Jul 2011 05:42:25 +0000 (05:42 +0000)]
From Edwin Groothuis:
Add preference to Mute noise of TCP Timestamp Option in the summary line.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6162

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

12 years agoFrom Lei Chen:
etxrab [Thu, 28 Jul 2011 05:38:07 +0000 (05:38 +0000)]
From Lei Chen:
support 'Packet System Information Type 3' in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6170

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

12 years agoTry to fix
etxrab [Wed, 27 Jul 2011 20:28:07 +0000 (20:28 +0000)]
Try to fix
../gtk/old-gtk-compat.h:42:48: error: "(" may not appear in macro parameter list

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

12 years agoReplace the remaining gdk_draw_pixmap().
etxrab [Wed, 27 Jul 2011 20:25:31 +0000 (20:25 +0000)]
Replace the remaining gdk_draw_pixmap().

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

12 years ago(dialog)->vbox can be replaced by gtk_dialog_get_content_area()
etxrab [Wed, 27 Jul 2011 19:44:35 +0000 (19:44 +0000)]
(dialog)->vbox can be replaced by gtk_dialog_get_content_area()
in gtk 2.14.

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

12 years agoFrom Eric Zhu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
alagoutte [Wed, 27 Jul 2011 15:19:17 +0000 (15:19 +0000)]
From Eric Zhu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
Wireshark cannot display Reachable time & Retrans timer in IPv6 RA messages

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

12 years agoUse tvb_length when adding MSISDN.
etxrab [Wed, 27 Jul 2011 13:17:58 +0000 (13:17 +0000)]
Use tvb_length when adding MSISDN.

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

12 years agofrom T. Loebner:
etxrab [Wed, 27 Jul 2011 12:27:39 +0000 (12:27 +0000)]
from T. Loebner:
Dissector for XR IDMS from ETSI TS 182 063 v3.5.2 Annex W

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

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

12 years agoDefine M_PI and protect it
etxrab [Wed, 27 Jul 2011 11:43:45 +0000 (11:43 +0000)]
Define M_PI and protect it
(http://ubuntuforums.org/showthread.php?t=583094)

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

12 years agoDefine M_PI
etxrab [Wed, 27 Jul 2011 11:05:34 +0000 (11:05 +0000)]
Define M_PI

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

12 years agogtk_tree_view_column_get_button ()
etxrab [Wed, 27 Jul 2011 10:05:09 +0000 (10:05 +0000)]
gtk_tree_view_column_get_button ()
is available in GTK 3.0 use that.

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

12 years agoUse correct color for impulse, filled bar and dot.
stig [Wed, 27 Jul 2011 09:49:35 +0000 (09:49 +0000)]
Use correct color for impulse, filled bar and dot.
Draw dot as a circle.

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

12 years agoAdd include
etxrab [Wed, 27 Jul 2011 07:13:09 +0000 (07:13 +0000)]
Add include

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

12 years agoUse gtk_widget_get_window.
etxrab [Wed, 27 Jul 2011 05:46:15 +0000 (05:46 +0000)]
Use gtk_widget_get_window.

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

12 years agoUpdate numbers
jmayer [Tue, 26 Jul 2011 21:25:50 +0000 (21:25 +0000)]
Update numbers

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

12 years agoPart 2 of the cleanup. fix some compile errors in previous patch.
jmayer [Tue, 26 Jul 2011 19:44:06 +0000 (19:44 +0000)]
Part 2 of the cleanup. fix some compile errors in previous patch.

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

12 years agoRemove some more GTK_WIDGET_STATE
jmayer [Tue, 26 Jul 2011 19:24:19 +0000 (19:24 +0000)]
Remove some more GTK_WIDGET_STATE

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

12 years agoReplace access to ...->allocation by gtk_widget_get_allocation +
jmayer [Tue, 26 Jul 2011 19:01:01 +0000 (19:01 +0000)]
Replace access to ...->allocation by gtk_widget_get_allocation +
  using the return val - part 1
Maybe the call needs to be done more often.

Replace GTK_WIDGET_STATE by gtk_widget_get_state

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

12 years agoDon't free a string which will be used later on.
gerald [Tue, 26 Jul 2011 17:46:19 +0000 (17:46 +0000)]
Don't free a string which will be used later on.

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

12 years agoAvoid a crash reported in bug 6138 by never allowing frame1Size < dataLength.
cmaynard [Tue, 26 Jul 2011 16:19:48 +0000 (16:19 +0000)]
Avoid a crash reported in bug 6138 by never allowing frame1Size < dataLength.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6138

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

12 years agoUse Cairo for drawing, step 2.
etxrab [Tue, 26 Jul 2011 15:19:12 +0000 (15:19 +0000)]
Use Cairo for drawing, step 2.

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

12 years agoUse Cairo for drawing, step 1.
etxrab [Tue, 26 Jul 2011 11:21:14 +0000 (11:21 +0000)]
Use Cairo for drawing, step 1.

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

12 years agoUpdate 3GPP AVP:s
etxrab [Tue, 26 Jul 2011 11:20:30 +0000 (11:20 +0000)]
Update 3GPP AVP:s

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

12 years agoFrom Asmita:
etxrab [Tue, 26 Jul 2011 11:18:46 +0000 (11:18 +0000)]
From Asmita:
Diameter AVP patch for Cisco.xml

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

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

12 years agoDon't attach sequence analysis results to control/data PDUs when not appropriate...
martinm [Tue, 26 Jul 2011 10:16:02 +0000 (10:16 +0000)]
Don't attach sequence analysis results to control/data PDUs when not appropriate.  The problem is that I use the frame number in the result hash table - I may end up adding more info (e.g. channel, SN) to further avoid attaching reports to wrong PDUs.

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

12 years agoCode cleanup.
etxrab [Tue, 26 Jul 2011 05:35:19 +0000 (05:35 +0000)]
Code cleanup.

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

12 years agoFrom Lei Chen:
etxrab [Tue, 26 Jul 2011 04:20:39 +0000 (04:20 +0000)]
From Lei Chen:
This patch tries to support 'Packet System Information Type 2' in gsm rlcmac
dissector.

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

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

12 years agoFrom Lei Chen:
etxrab [Tue, 26 Jul 2011 03:52:29 +0000 (03:52 +0000)]
From Lei Chen:
CSN_RECURSIVE_TARRAY should count the last '0' bit.

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

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

12 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
wmeier [Mon, 25 Jul 2011 20:54:13 +0000 (20:54 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
Also: various minor cleanup and a few minor bug fixes:

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

12 years agoUse cairo for drawing to avoid deprecated functions.
etxrab [Mon, 25 Jul 2011 20:00:04 +0000 (20:00 +0000)]
Use cairo for drawing to avoid deprecated functions.

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

12 years agoUpdate comments.
etxrab [Mon, 25 Jul 2011 15:55:27 +0000 (15:55 +0000)]
Update comments.

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

12 years agoUse Cairo for drawing.
etxrab [Mon, 25 Jul 2011 15:54:57 +0000 (15:54 +0000)]
Use Cairo for drawing.

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

12 years agoCode cleanup.
etxrab [Mon, 25 Jul 2011 15:54:21 +0000 (15:54 +0000)]
Code cleanup.

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

12 years agoFrom Pascal Quantin (bug 6159).
martinm [Mon, 25 Jul 2011 13:47:26 +0000 (13:47 +0000)]
From Pascal Quantin (bug 6159).
When decoding drb payload, call IPv4, IPv6 or data dissector as appropriate.

Am slightly concerned that we always dereference the first byte of the frame - is it safe to assume that the length can't be 0?

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

12 years agoFix bug 6160.
martinm [Mon, 25 Jul 2011 13:34:40 +0000 (13:34 +0000)]
Fix bug 6160.
Use correct string to search for RRC BCH dissectors.

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

12 years agoUse gtk_widget_get_has_window() as a wrapper around
guy [Mon, 25 Jul 2011 06:40:01 +0000 (06:40 +0000)]
Use gtk_widget_get_has_window() as a wrapper around
GTK_WIDGET_NO_WINDOW() in pre-2.18 versions of GTK+.  Treat calls to
GTK_WIDGET_NO_WINDOW() as an error in checkAPIs.pl.

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

12 years agoFix a couple of typos and 'E'' mark functions mapped in old-gtk-compat.h
etxrab [Mon, 25 Jul 2011 04:13:46 +0000 (04:13 +0000)]
Fix a couple of typos and 'E'' mark functions mapped in old-gtk-compat.h

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

12 years agoFix typo, get rid of #if no longer necessary with the typo fixed.
guy [Mon, 25 Jul 2011 01:38:11 +0000 (01:38 +0000)]
Fix typo, get rid of #if no longer necessary with the typo fixed.

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

12 years agogtk_widget_get_visible() is only available in GTK+ 2.18 and later.
guy [Mon, 25 Jul 2011 01:33:15 +0000 (01:33 +0000)]
gtk_widget_get_visible() is only available in GTK+ 2.18 and later.

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

12 years agoUse gtk_window_set_icon_list isof gdk_pixmap_create_from_xpm_d.
etxrab [Sun, 24 Jul 2011 21:34:52 +0000 (21:34 +0000)]
Use gtk_window_set_icon_list isof gdk_pixmap_create_from_xpm_d.

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

12 years agoFix a benign bug in the patch from Bug #5795.
wmeier [Sun, 24 Jul 2011 21:03:01 +0000 (21:03 +0000)]
Fix a benign bug in the patch from Bug #5795.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795

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

12 years ago(Trivial) Whitespace changes and reformatting ...
wmeier [Sun, 24 Jul 2011 20:50:00 +0000 (20:50 +0000)]
(Trivial) Whitespace changes and reformatting ...

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

12 years agoCommit missing parts of Bug #5795 patch (those not committed in SVN 38175 & 38176).
wmeier [Sun, 24 Jul 2011 20:48:57 +0000 (20:48 +0000)]
Commit missing parts of Bug #5795 patch (those not committed in SVN 38175 & 38176).
 (See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795)

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

12 years agoRemove unused variables.
etxrab [Sun, 24 Jul 2011 20:09:08 +0000 (20:09 +0000)]
Remove unused variables.

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

12 years agoReplace deprecated functions.
etxrab [Sun, 24 Jul 2011 19:39:21 +0000 (19:39 +0000)]
Replace deprecated functions.

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

12 years agoReplace deprecated functions.
etxrab [Sun, 24 Jul 2011 18:03:53 +0000 (18:03 +0000)]
Replace deprecated functions.

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

12 years agoReplace deprecated functions.
etxrab [Sun, 24 Jul 2011 17:25:52 +0000 (17:25 +0000)]
Replace deprecated functions.

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

12 years agoReplace deprecated functions.
etxrab [Sun, 24 Jul 2011 16:50:55 +0000 (16:50 +0000)]
Replace deprecated functions.
Udate comments in CheckAPIs

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

12 years agoReplace deprecated functions.
etxrab [Sun, 24 Jul 2011 15:22:21 +0000 (15:22 +0000)]
Replace deprecated functions.

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

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

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

12 years agoReplace depricated gdk_draw_drawable().
etxrab [Sun, 24 Jul 2011 11:35:51 +0000 (11:35 +0000)]
Replace depricated gdk_draw_drawable().

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

12 years agoTry to fix "The graph is not updated when changing settings or adding new graphs.".
etxrab [Sun, 24 Jul 2011 11:11:38 +0000 (11:11 +0000)]
Try to fix "The graph is not updated when changing settings or adding new graphs.".
We need to find non deperecated equivalents...

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

12 years agoFix some compile errors when building with real gtk-3.
jmayer [Sun, 24 Jul 2011 07:59:34 +0000 (07:59 +0000)]
Fix some compile errors when building with real gtk-3.

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

12 years agoThe guards for 2,22,0 are not needed, tested on a debian system with gtk 2.12.
jmayer [Sun, 24 Jul 2011 07:58:21 +0000 (07:58 +0000)]
The guards for 2,22,0 are not needed, tested on a debian system with gtk 2.12.

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

12 years agoWrong patch commit in Rev38175...
alagoutte [Sat, 23 Jul 2011 16:31:10 +0000 (16:31 +0000)]
Wrong patch commit in Rev38175...
Fix :
packet-tcp.c:3337: error: ‘dissect_tcpopt_maxseg’ undeclared here (not in a function)
packet-tcp.c:2264: error: ‘dissec_tcpopt_exp’ defined but not used

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

12 years agoFrom Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795
alagoutte [Sat, 23 Jul 2011 16:13:05 +0000 (16:13 +0000)]
From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795
Add TCP Options support for #253, #254 (experimental), expand MSS / SACKPERM view, add hidden TCP Option Kind/Length to all

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