guy [Sat, 6 Aug 2011 19:12:31 +0000 (19:12 +0000)]
Get rid of HAVE_PCAP_SET_BUFFER_SIZE - nobody checks for
pcap_set_buffer_size() (if *pcap has pcap_create() it has
pcap_set_buffer_size(), as they were both introduced in libpcap 1.0.0),
and nobody looks at HAVE_PCAP_SET_BUFFER_SIZE.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38382
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 6 Aug 2011 19:10:25 +0000 (19:10 +0000)]
Set svn:keywords and svn:eol-style. Fix the EOL style.
Add the copyright comment and give it an SVN ID.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38381
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 6 Aug 2011 18:36:46 +0000 (18:36 +0000)]
Move the *pcap stuff together. Add an item for
HAVE_PCAP_GET_SELECTABLE_FD to make it clear that it is never defined on
Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38380
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sat, 6 Aug 2011 15:39:50 +0000 (15:39 +0000)]
- Resolve a GTK_CHECK_VERSION(2,6,0) check. It's always true.
- Fix defined but not used warnings (turned errors) by surrounding
the code with HAVE_PCAP_REMOTE_NEVERTRUE. Let's see what breaks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38379
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Sat, 6 Aug 2011 15:05:08 +0000 (15:05 +0000)]
Update cavebear link.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38378
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sat, 6 Aug 2011 13:22:51 +0000 (13:22 +0000)]
Some whitespace cleanups.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38377
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sat, 6 Aug 2011 12:40:19 +0000 (12:40 +0000)]
Take out unused functions as reported by Joerg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38376
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sat, 6 Aug 2011 12:34:15 +0000 (12:34 +0000)]
This should fix the "else without previous if" error reported by Joerg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38375
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sat, 6 Aug 2011 09:16:00 +0000 (09:16 +0000)]
Whitespace fixes:
- Remove trailing whitespace
- Remove leading space then tab
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38374
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 5 Aug 2011 21:56:31 +0000 (21:56 +0000)]
Set the activate signal for the capture filter to the ok button.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38373
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 5 Aug 2011 18:52:53 +0000 (18:52 +0000)]
FindGTK2: Add a check for pangocairo. It has to be linked explicitly, at
least for MacPorts.
FindPCAP: Define HAVE_PCAP_CREATE if we have pcap_create.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38372
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Fri, 5 Aug 2011 18:10:05 +0000 (18:10 +0000)]
From John Thacker via bug 1831: Export proto_tree_set_appendix.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1831
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38371
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 17:58:06 +0000 (17:58 +0000)]
Try to make the clang buildbot happy...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38370
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 17:41:31 +0000 (17:41 +0000)]
Use the fix from Joerg to get the airpcap icon also for remote
interface.
This is a misuse of the icon, but we don't have an icon
for remote interfaces yet and I'm the wrong one for
creating one...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38369
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 17:33:47 +0000 (17:33 +0000)]
Fix the compile issue reported by Joerg.
This does not fix the icon issue.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38368
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 16:37:17 +0000 (16:37 +0000)]
Try to make the Mac OS X PPC builder happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38367
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 15:43:28 +0000 (15:43 +0000)]
Make buildbot OSX-10.5-x86 happy:
Work around a spurius warning where gcc was unable to find out that two variables
would only be used initialized.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38366
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Fri, 5 Aug 2011 14:40:47 +0000 (14:40 +0000)]
Show in info line if predefined contents lines are truncated.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38365
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Fri, 5 Aug 2011 14:33:53 +0000 (14:33 +0000)]
Update pflog dissector via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6115
* Update pflog dissector to the last header format (OpenBSD 4.9)
* Dissect all new field (uid, pid, saddr, daddr...)
* Replace proto_tree_add_xxx(uint/string...) by proto_tree_add_item
* Remove not needed packet-pflog.h file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38364
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 13:17:41 +0000 (13:17 +0000)]
Fix one instance of strdup() -> g_strdup().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38363
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 13:11:11 +0000 (13:11 +0000)]
Try to make the Mac OS PPC builder happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38362
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 12:25:54 +0000 (12:25 +0000)]
Add call to FindPackageHandleStandardArgs
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38361
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 12:21:46 +0000 (12:21 +0000)]
Attempt to properly fix the missing path information for glib libraries
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38360
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 11:10:26 +0000 (11:10 +0000)]
We can always add ${GTHREAD2_LIBRARIES} - this variable will be empty
if not building with the gthread library.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38359
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 10:43:03 +0000 (10:43 +0000)]
Fix typo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38358
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 10:40:45 +0000 (10:40 +0000)]
Using gtk_tree_view_column_get_cell_renderers is an error now.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38357
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 5 Aug 2011 10:38:58 +0000 (10:38 +0000)]
Replace the deprecated call to gtk_tree_view_column_get_cell_renderers by
gtk_cell_layout_get_cells, which is available since 2.12 (according to docs)
and not 2.18 as one guard indicated.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38356
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 10:24:36 +0000 (10:24 +0000)]
Fix API issues.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38355
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 10:19:26 +0000 (10:19 +0000)]
Fix the Mac OS buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38354
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 10:13:48 +0000 (10:13 +0000)]
Whitespace changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38353
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 08:26:07 +0000 (08:26 +0000)]
Fix Windows build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38352
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 08:11:27 +0000 (08:11 +0000)]
Simplification suggested by Guy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38351
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 07:19:17 +0000 (07:19 +0000)]
Add support for multiple interfaces to the capture options dialog.
Obtained from Irene Ruengeler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38350
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Fri, 5 Aug 2011 07:10:20 +0000 (07:10 +0000)]
Generate the capure sync pipe correctly.
Fix obtained from Irene Ruengeler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38349
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 5 Aug 2011 07:02:22 +0000 (07:02 +0000)]
From Lei Chen:
patch to support gsm rr decoding of Immediate Assignment rest octet
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6119
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38348
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 5 Aug 2011 05:16:37 +0000 (05:16 +0000)]
Typo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38347
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 5 Aug 2011 05:13:42 +0000 (05:13 +0000)]
Free the PangoLayout.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38346
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 5 Aug 2011 00:25:02 +0000 (00:25 +0000)]
Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since it
includes the path to the libraries. Add gthread to wireshark_LIBS if
threads are enabled.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38345
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 4 Aug 2011 22:56:36 +0000 (22:56 +0000)]
Replace almost all uses of GtkObject (which no longer exists
in GTK3) by GObject (which does).
These were the trivial cases, the two remaining uses in packet_win.c
are left for someone who understands the code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38344
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 4 Aug 2011 22:40:31 +0000 (22:40 +0000)]
Remove usage of GDK_DRAWABLE macro.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38343
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 4 Aug 2011 22:38:44 +0000 (22:38 +0000)]
The macros GDK_DRAWABLE, GDK_IS_DRAWABLE, GTK_OBJECT are no longer
present and can probably just be removed without any ill effects or,
if there are problems, these should be solvable by using casts.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38342
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 4 Aug 2011 21:38:31 +0000 (21:38 +0000)]
As suggested by Anders: only compile with GSEAL_ENABLE if we're using GTK 2.22 or higher (and not GTK3)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38341
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 4 Aug 2011 20:20:51 +0000 (20:20 +0000)]
Don't report svn version if not building from svn. Change prompted by ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38340
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 4 Aug 2011 17:49:57 +0000 (17:49 +0000)]
Don't call expert_add_info_format() from within an "if (tree)" block. Fixes bug 6198. Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6198
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38339
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 4 Aug 2011 16:51:21 +0000 (16:51 +0000)]
Remove unneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38338
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 4 Aug 2011 16:42:32 +0000 (16:42 +0000)]
Whitespace cleanup: convert mixture of "4 space" and "8 space" tabs to spaces.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38337
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 4 Aug 2011 16:02:09 +0000 (16:02 +0000)]
Put src and dst ports in the option of "Both" decorate with arrows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38336
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 4 Aug 2011 15:59:23 +0000 (15:59 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38335
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 4 Aug 2011 14:41:45 +0000 (14:41 +0000)]
- Get rid of some deprecated functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38334
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 4 Aug 2011 11:53:50 +0000 (11:53 +0000)]
Change the default to "Both"
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38333
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 4 Aug 2011 11:24:15 +0000 (11:24 +0000)]
gtkvumeter.[ch] seems to be used only on Windows. So only build it there...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38332
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 4 Aug 2011 10:02:37 +0000 (10:02 +0000)]
Removed a debug printf.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38331
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 4 Aug 2011 08:54:13 +0000 (08:54 +0000)]
Corrected position of FBAR and DOT.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38330
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 4 Aug 2011 00:04:53 +0000 (00:04 +0000)]
Update some references.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38329
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 3 Aug 2011 21:14:04 +0000 (21:14 +0000)]
Convert "4 space tabs" to spaces + do other whitespace cleaup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38328
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 3 Aug 2011 20:31:51 +0000 (20:31 +0000)]
Minor cleanup
[benign] Remove _U_ from param arg when param is actually used;
[benign] Use 'item' (not 'tree') arg for proto_item_append_text()
Whitespace
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38327
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 3 Aug 2011 19:11:07 +0000 (19:11 +0000)]
From Dirk Jagdmann via bug 6194:
The attachted patch fixes and enhances the SCPS TCP option dissection. Changes
are:
- fix order of reserved Bit 1,2,3
- fix minimum TCP option length
- fix proto items
- add proto item for Connection ID
- removed the verify_scps() function. It's logic was broken, because it did
reset the scps_capable flag on both flows if one of them did not have it.
However sometimes that flag is only enabled in one flow direction and that flow
direction could see TCP options later on, which would get dissected as invalid.
See the attachted capture file for an example.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38326
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 3 Aug 2011 18:49:35 +0000 (18:49 +0000)]
Get rid of gdk_draw_layout().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38325
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Wed, 3 Aug 2011 18:45:06 +0000 (18:45 +0000)]
From Jim Young via bug 3196: Enhancement to Expert Info Composite Tab Labels
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3196
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38324
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 3 Aug 2011 18:38:23 +0000 (18:38 +0000)]
AFAICT, the item for 'hf_gtpv2_stn_sr' should be used as the parent tree-item in dissect_gtpv2_stn_sr().
This is a different fix for Coverity 1248 than that committed in SVN 38314.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38323
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 3 Aug 2011 17:05:30 +0000 (17:05 +0000)]
Fix the SR state report for when get SR following SR with no grant or failure in-between.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38322
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 3 Aug 2011 16:06:00 +0000 (16:06 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38321
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 3 Aug 2011 15:39:16 +0000 (15:39 +0000)]
Fix compiler warning turned error:
graph_analysis.c:1363: warning: unused parameter 'widget'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38320
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 3 Aug 2011 15:25:57 +0000 (15:25 +0000)]
Try to make the builbot happy
# define gtk_widget_is_drawable(x) GDK_IS_DRAWABLE(x)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38319
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 3 Aug 2011 15:24:06 +0000 (15:24 +0000)]
'-Wno-error=unused-but-set-parameter' not req'd since no such warnings in Wireshark compile.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38318
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 3 Aug 2011 14:54:03 +0000 (14:54 +0000)]
- Get rid of deprecated functions.
- Include pangocairo.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38317
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 2 Aug 2011 21:23:00 +0000 (21:23 +0000)]
Define PACKAGE in config.h.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38316
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 2 Aug 2011 20:39:53 +0000 (20:39 +0000)]
Fix 45 occurrences of unused values reported under Coverity CID's 1235-1241.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38315
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 2 Aug 2011 19:29:51 +0000 (19:29 +0000)]
Fix Coverity CID 1248: unused value.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38314
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 2 Aug 2011 18:13:16 +0000 (18:13 +0000)]
Add tap-hosts.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38313
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 16:47:37 +0000 (16:47 +0000)]
Bug 6146 - Malformed RANAP packets when HandOver procedure on iuh
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6146
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38312
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 2 Aug 2011 16:17:25 +0000 (16:17 +0000)]
For now: treat GCC 4.6 'unused-but-set' reports as just warnings (i.e., when -Werror).
GCC 4.6 has added 'unused but set' reports so this change allows builds to proceed without
erroring out for those building from SVN with GCC 4.6.
(AFAIK Wireshark source distributions do not enable -Werror).
This change can be removed (at least globally) once the code as been fixed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38311
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 12:52:59 +0000 (12:52 +0000)]
Channel Description includes the element identifier.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38310
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 2 Aug 2011 10:35:22 +0000 (10:35 +0000)]
Show version and mode in protocol root. Now dissects details whether tree is NULL or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38309
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 05:30:59 +0000 (05:30 +0000)]
From Roland Knall:
openSAFETY: Cleaning up, removing multiple implementations and cleaning up code
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6180
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38307
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 05:18:58 +0000 (05:18 +0000)]
From Jeremy Jones:
Add support for decoding NFSv4.1 OP_BIND_CONN_TO_SESSION.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6182
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38306
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 05:12:53 +0000 (05:12 +0000)]
From Martin Kaiser:
DVB-CI dissector, packet reassembly on the link layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6075
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38305
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 2 Aug 2011 04:17:45 +0000 (04:17 +0000)]
Gnenerate the dissector for previous commit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38304
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 2 Aug 2011 01:54:03 +0000 (01:54 +0000)]
From Paul Stath via bug 5731: The check for engineID length should only occur if the engineID has a non-zero length.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38303
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 1 Aug 2011 16:56:45 +0000 (16:56 +0000)]
Update documentation to reflect configure option being "--with-gtk3" not
"--enable-gtk3"
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38302
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Mon, 1 Aug 2011 14:48:19 +0000 (14:48 +0000)]
Add tvb_get_bits
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38301
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Mon, 1 Aug 2011 14:34:16 +0000 (14:34 +0000)]
gtk_widget_get_sensitive() seems to be available on gtk 2.18
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38300
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 1 Aug 2011 12:38:58 +0000 (12:38 +0000)]
Another fix for building with MSVC2005.
The previous fixes in r37728 and r37730 did build a wireshark which was
unable to use the native windows file dialog (GetOpenFileName).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38299
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 1 Aug 2011 01:09:04 +0000 (01:09 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38298
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 31 Jul 2011 23:41:20 +0000 (23:41 +0000)]
Restore saved 'pinfo->fragmented' as appropriate;
Fixes gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38297
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 21:54:46 +0000 (21:54 +0000)]
Try to fix:
cc1: warnings being treated as errors
../../gtk/sctp_graph_dlg.c: In function ‘draw_tsn_graph’:
../../gtk/sctp_graph_dlg.c:511: error: ‘cr’ may be used uninitialized in this function
../../gtk/sctp_graph_dlg.c: In function ‘draw_sack_graph’:
../../gtk/sctp_graph_dlg.c:163: error: ‘cr’ may be used uninitialized in this function
../../gtk/sctp_graph_dlg.c: In function ‘draw_nr_sack_graph’:
../../gtk/sctp_graph_dlg.c:341: error: ‘cr’ may be used uninitialized in this function
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38296
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 20:23:59 +0000 (20:23 +0000)]
This circle should not be filled.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38294
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 20:20:30 +0000 (20:20 +0000)]
Add comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38293
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 20:20:05 +0000 (20:20 +0000)]
Code cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38292
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 20:19:33 +0000 (20:19 +0000)]
Use Cairo for drawing.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38291
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 31 Jul 2011 14:03:28 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-07-31]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38288
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 31 Jul 2011 13:32:05 +0000 (13:32 +0000)]
Configuring with --enable-ui-manager would not work - fix this.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38287
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 31 Jul 2011 13:25:13 +0000 (13:25 +0000)]
Use pinfo->iphdrlen rather than a fixed vaue of 20 to make
the calculation correct for IPv6 too.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38286
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 31 Jul 2011 12:07:23 +0000 (12:07 +0000)]
GdkDrawable is also used in one place.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38285
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 31 Jul 2011 11:32:15 +0000 (11:32 +0000)]
Update status file. Special mention is given to removed structs in GDK3.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38284
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 30 Jul 2011 19:00:43 +0000 (19:00 +0000)]
Whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38283
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 30 Jul 2011 18:15:39 +0000 (18:15 +0000)]
Remove unneeded #includes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38282
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 30 Jul 2011 15:47:47 +0000 (15:47 +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 8/9] add support for Root Announcement (RANN) IEs
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38281
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 30 Jul 2011 15:36:47 +0000 (15:36 +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 8/9] add support for Root Announcement (RANN) IEs
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38280
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 30 Jul 2011 15:31:59 +0000 (15:31 +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 7/9] update parsing of mesh control field
During development of the 80211s standard, a "mesh header" was conceived. This mesh header has been renamed the "mesh control field". Further, the conditions under which it is expected to appear have also changed. Specifically, the mesh control field appears in multihop action frames and mesh data frames. In the former case, it appears after the action category and action code, so no special header parsing is required to parse it.
The latter case is a bit more complicated. We know the mesh control field is present if the data frame was transmitted by a mesh STA, AND the new "Mesh Control Present" bit in the QoS control field is set. This second thing is easy enough to check. But the first thing is not. So we continue to rely on heuristics. Specifically, we only expect the mesh control field for valid from-ds/to-ds settings, and if the mesh control field itself is valid.
Other relevant changes in this patch include:
-- rename mesh_header to mesh_control as appropriate
-- consider the mesh control field to be part of the header when accounting for payload padding.
-- parse some of the qos fields earlier so they can be used to determine if the mesh control field is present.
-- use existing mesh control parsing code instead of duplicating it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38279
f5534014-38df-0310-8fa8-
9805f1628bb7