metze/wireshark/wip.git
11 years agowiretap support for the CAM Inspector file format
Martin Kaiser [Sat, 30 Mar 2013 09:56:57 +0000 (09:56 -0000)]
wiretap support for the CAM Inspector file format

svn path=/trunk/; revision=48647

11 years agoNote to self: stop using 'index' as a variable name, it triggers -Wshadow on
Evan Huus [Sat, 30 Mar 2013 00:11:00 +0000 (00:11 -0000)]
Note to self: stop using 'index' as a variable name, it triggers -Wshadow on
some platforms. You'd think I'd have learned by now.

svn path=/trunk/; revision=48646

11 years agoImplement str_to_val, opposite of val_to_str for value_strings.
Evan Huus [Fri, 29 Mar 2013 23:23:28 +0000 (23:23 -0000)]
Implement str_to_val, opposite of val_to_str for value_strings.

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

svn path=/trunk/; revision=48645

11 years agoBump two guint16 to guint32 to prevent overflow when reassembling a large
Evan Huus [Fri, 29 Mar 2013 22:20:04 +0000 (22:20 -0000)]
Bump two guint16 to guint32 to prevent overflow when reassembling a large
number of fragments, and add an extra bounds check.

Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8540
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8541

svn path=/trunk/; revision=48644

11 years agoAdd items for Bluetooth and GTK3.
Gerald Combs [Fri, 29 Mar 2013 18:16:45 +0000 (18:16 -0000)]
Add items for Bluetooth and GTK3.

svn path=/trunk/; revision=48643

11 years agoConvert png → xpm using a higher alpha threshold.
Gerald Combs [Fri, 29 Mar 2013 18:12:29 +0000 (18:12 -0000)]
Convert png → xpm using a higher alpha threshold.

svn path=/trunk/; revision=48642

11 years agoAdd some missing #includes to hopefully fix check-abi buildbot.
Evan Huus [Fri, 29 Mar 2013 17:43:14 +0000 (17:43 -0000)]
Add some missing #includes to hopefully fix check-abi buildbot.

svn path=/trunk/; revision=48641

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
Evan Huus [Fri, 29 Mar 2013 17:25:23 +0000 (17:25 -0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509

First round of fixes for Bluetooth SDP.

From me:
- rename one call of match_strval to try_val_to_str instead
- remove a few hf entries that really belong with the second patch (they
  weren't used in this one)

svn path=/trunk/; revision=48640

11 years agoResurrect wsicon32.xpm using 'svn cp' then update it based on
Gerald Combs [Fri, 29 Mar 2013 15:44:14 +0000 (15:44 -0000)]
Resurrect wsicon32.xpm using 'svn cp' then update it based on
wsicon32.png. This should hopefully preserve its history in SVN. Revert
r48565 in debian/.

svn path=/trunk/; revision=48639

11 years agoFrom Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506 :
Pascal Quantin [Fri, 29 Mar 2013 13:22:53 +0000 (13:22 -0000)]
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506 :
Fix incompatible display filters using the same name

svn path=/trunk/; revision=48638

11 years agoAdd support for new version of the ID which has been adopted as a WG item.
Michael Tüxen [Fri, 29 Mar 2013 13:01:52 +0000 (13:01 -0000)]
Add support for new version of the ID which has been adopted as a WG item.
The now version will be supported by Firefox soon.

svn path=/trunk/; revision=48637

11 years agoFix two instances of col_set_str being used with ephemeral memory returned
Evan Huus [Fri, 29 Mar 2013 02:46:06 +0000 (02:46 -0000)]
Fix two instances of col_set_str being used with ephemeral memory returned
from val_to_str. Use col_add_str instead.

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

svn path=/trunk/; revision=48636

11 years agoRemove decode_enumerated_bitfield and decode_enumerated_bitfield_shifted.
Evan Huus [Fri, 29 Mar 2013 02:34:23 +0000 (02:34 -0000)]
Remove decode_enumerated_bitfield and decode_enumerated_bitfield_shifted.
Effectively inline the only remain call (and replace a static buffer with ep
memory). Much of the NFS dissector needs to be converted to use named fields
at which point this code can go away, but that's a much bigger job.

Also, add modelines to packet-nfs.c and mark some internal value_string
functions as WS_DLL_LOCAL.

svn path=/trunk/; revision=48635

11 years agoRename value string (and similar) functions to use a consistent pattern. This
Evan Huus [Fri, 29 Mar 2013 00:26:23 +0000 (00:26 -0000)]
Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634

11 years agoGreatly clean up value_string.c
Evan Huus [Thu, 28 Mar 2013 22:02:04 +0000 (22:02 -0000)]
Greatly clean up value_string.c
 - use consistent indentation and coding style
 - add modelines
 - replace some g_assert calls with DISSECTOR_ASSERT where it makes sense
 - group related functions together and simplify many comments by referring to
   the 'normal' value_string as the canonical version

svn path=/trunk/; revision=48633

11 years agoThe tshark -R option specifies a read filter, not a display filter.
Chris Maynard [Thu, 28 Mar 2013 21:46:37 +0000 (21:46 -0000)]
The tshark -R option specifies a read filter, not a display filter.

svn path=/trunk/; revision=48632

11 years agoRemove a couple of unneeded lines and fix default execution.
Gerald Combs [Thu, 28 Mar 2013 21:22:08 +0000 (21:22 -0000)]
Remove a couple of unneeded lines and fix default execution.

svn path=/trunk/; revision=48631

11 years agoInclude glib.h in emem.h, it needs the definitions
Evan Huus [Thu, 28 Mar 2013 21:19:58 +0000 (21:19 -0000)]
Include glib.h in emem.h, it needs the definitions

svn path=/trunk/; revision=48630

11 years agoAdd some missing tvb_get_'s, proto_tree_add_'s, fix args and change all little_endian...
Chris Maynard [Thu, 28 Mar 2013 20:22:47 +0000 (20:22 -0000)]
Add some missing tvb_get_'s, proto_tree_add_'s, fix args and change all little_endian's to encoding.  Some detailed descriptions are still missing though.

svn path=/trunk/; revision=48629

11 years agoFix incorrectly duplicated display filter for hf_openwire_throwable_linenumber.
Chris Maynard [Thu, 28 Mar 2013 18:16:52 +0000 (18:16 -0000)]
Fix incorrectly duplicated display filter for hf_openwire_throwable_linenumber.
#BACKPORT(1.8)

svn path=/trunk/; revision=48628

11 years ago1.9.2 → 1.9.3.
Gerald Combs [Thu, 28 Mar 2013 18:13:22 +0000 (18:13 -0000)]
1.9.2 → 1.9.3.

svn path=/trunk/; revision=48627

11 years agoThe uniqueness bit occurs in 2 different places, so go ahead and use both hf_nhrp_fla...
Chris Maynard [Thu, 28 Mar 2013 18:13:12 +0000 (18:13 -0000)]
The uniqueness bit occurs in 2 different places, so go ahead and use both hf_nhrp_flag_U1 and hf_nhrp_flag_U2, but change the common display filter from "nhrp.flag.u1" to simply "nhrp.flag.u".
#BACKPORT(1.6, 1.8)???

svn path=/trunk/; revision=48626

11 years agoBuild 1.9.2.
Gerald Combs [Thu, 28 Mar 2013 17:48:31 +0000 (17:48 -0000)]
Build 1.9.2.

svn path=/trunk/; revision=48625

11 years agoAdd a little shell script to install all the RPMs necesary to do Wireshark
Jeff Morriss [Thu, 28 Mar 2013 16:59:21 +0000 (16:59 -0000)]
Add a little shell script to install all the RPMs necesary to do Wireshark
development.  Both the development and runtime packages are installed
although the latter aren't strictly necessary.

Ideally this could automatically pull the packages out of
packaging/rpm/SPECS/wireshark.spec.in but given the variance in package names
between distributions, this seems painful...

Tested on Fedora/Redhat and openSUSE.

svn path=/trunk/; revision=48624

11 years agoRegister a dissector table for Normal Vendor/Organization Specific Extension(NVSE...
Anders Broman [Thu, 28 Mar 2013 16:55:06 +0000 (16:55 -0000)]
Register a dissector table for Normal Vendor/Organization Specific Extension(NVSE) and use it for 3GPP2.

svn path=/trunk/; revision=48623

11 years agoFix Coverity CID's 280305-280306: Negative loop bound. (These are yet more annoying...
Chris Maynard [Thu, 28 Mar 2013 16:02:41 +0000 (16:02 -0000)]
Fix Coverity CID's 280305-280306: Negative loop bound.  (These are yet more annoying instances of not properly dealing with tvb_reported_length_remaining() possibly returning -1.)
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48622

11 years agoFix the remaining instances of Coverity CID's 741992 and 986498, which should have...
Chris Maynard [Thu, 28 Mar 2013 15:41:25 +0000 (15:41 -0000)]
Fix the remaining instances of Coverity CID's 741992 and 986498, which should have been committed with r47073 and r47830, respectively.  (I find Coverity doesn't always make it so obvious that there's more than 1 instance for a given CID.)

svn path=/trunk/; revision=48621

11 years agoFix Coverity CID's 281433 and 281434: Unintended sign extension. (18 instances)
Chris Maynard [Thu, 28 Mar 2013 15:28:12 +0000 (15:28 -0000)]
Fix Coverity CID's 281433 and 281434: Unintended sign extension. (18 instances)
Fix Coverity CID 702381: Missing break in switch.

Add an "XXX" note regarding the framing_rtp assignment, since something appears to be missing.

#BACKPORT(1.8)

svn path=/trunk/; revision=48620

11 years agofirst_flag should be static.
Chris Maynard [Thu, 28 Mar 2013 15:07:32 +0000 (15:07 -0000)]
first_flag should be static.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48619

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8536
Evan Huus [Thu, 28 Mar 2013 15:05:46 +0000 (15:05 -0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8536

Fix unrecognised CID session payload in bluetooth if there are multiple sessions
with the same DCID.

svn path=/trunk/; revision=48618

11 years agoFrom Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506
Evan Huus [Thu, 28 Mar 2013 15:01:35 +0000 (15:01 -0000)]
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506

Proper authorship and attribution information for
VITA 49 Radio Transport dissector.

svn path=/trunk/; revision=48617

11 years agoFix the incorrectly duplicated display filter for hf_kdsp_source_name.
Chris Maynard [Thu, 28 Mar 2013 14:56:58 +0000 (14:56 -0000)]
Fix the incorrectly duplicated display filter for hf_kdsp_source_name.
#BACKPORT(1.8)

svn path=/trunk/; revision=48616

11 years agoIf wireshark is started with a file and a display filter, apply the display
Evan Huus [Thu, 28 Mar 2013 14:54:33 +0000 (14:54 -0000)]
If wireshark is started with a file and a display filter, apply the display
filter *after* initially reading the file so that we get the expected multi-
pass behaviour and forward-looking filters (like response_in) work properly.

svn path=/trunk/; revision=48615

11 years agoFix the incorrectly duplicated display filter for hf_gearman_data_content.
Chris Maynard [Thu, 28 Mar 2013 14:49:41 +0000 (14:49 -0000)]
Fix the incorrectly duplicated display filter for hf_gearman_data_content.

svn path=/trunk/; revision=48614

11 years agoProperly dissect lat and long according to 3GPP TS 23.032. Fix incorrect display...
Chris Maynard [Thu, 28 Mar 2013 14:23:07 +0000 (14:23 -0000)]
Properly dissect lat and long according to 3GPP TS 23.032.  Fix incorrect display filters for hf_gsm_a_geo_loc_deg_of_lat and hf_gsm_a_geo_loc_deg_of_long.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8532
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48613

11 years agoSimplify the check for rpmbuild's version.
Jeff Morriss [Thu, 28 Mar 2013 14:17:38 +0000 (14:17 -0000)]
Simplify the check for rpmbuild's version.

svn path=/trunk/; revision=48612

11 years agoAdd dissection of Terminal Profile byte 32
Pascal Quantin [Thu, 28 Mar 2013 14:04:23 +0000 (14:04 -0000)]
Add dissection of Terminal Profile byte 32

svn path=/trunk/; revision=48611

11 years agoFix distcheck: put wssplash.h in noinst_HEADERS.
Jeff Morriss [Thu, 28 Mar 2013 13:19:16 +0000 (13:19 -0000)]
Fix distcheck: put wssplash.h in noinst_HEADERS.

svn path=/trunk/; revision=48610

11 years ago-Wmissing-prototypes
Anders Broman [Thu, 28 Mar 2013 07:34:13 +0000 (07:34 -0000)]
-Wmissing-prototypes

svn path=/trunk/; revision=48609

11 years agoMake that wssplash *underscore* dev dot png
Jaap Keuter [Thu, 28 Mar 2013 07:12:24 +0000 (07:12 -0000)]
Make that wssplash *underscore* dev dot png

svn path=/trunk/; revision=48608

11 years agoDistribute the shiny new splash screen logos.
Jaap Keuter [Thu, 28 Mar 2013 06:50:40 +0000 (06:50 -0000)]
Distribute the shiny new splash screen logos.

svn path=/trunk/; revision=48607

11 years agoFollow up on bug 8416.
Jaap Keuter [Thu, 28 Mar 2013 06:36:44 +0000 (06:36 -0000)]
Follow up on bug 8416.
Remove C++ incompatibilities in GTK+ 3 code.

svn path=/trunk/; revision=48606

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8530
Evan Huus [Thu, 28 Mar 2013 03:06:30 +0000 (03:06 -0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8530

Enable "Decode As" for Bluetooth over USB.

svn path=/trunk/; revision=48605

11 years agoISCSI: When printing the task management function, strip of the high bit which is...
Ronnie Sahlberg [Thu, 28 Mar 2013 00:06:19 +0000 (00:06 -0000)]
ISCSI: When printing the task management function, strip of the high bit which is always 1 before resoving the index into a name

svn path=/trunk/; revision=48604

11 years agoIt looks like GLib 2.36.0 was released on the 25th as well, although I
Gerald Combs [Wed, 27 Mar 2013 23:55:05 +0000 (23:55 -0000)]
It looks like GLib 2.36.0 was released on the 25th as well, although I
can't find a release announcement.

svn path=/trunk/; revision=48603

11 years agoFix the incorrectly duplicated display filter for hf_ixveriwave_vw_info_retryCount.
Chris Maynard [Wed, 27 Mar 2013 22:04:46 +0000 (22:04 -0000)]
Fix the incorrectly duplicated display filter for hf_ixveriwave_vw_info_retryCount.
#BACKPORT(1.8)

svn path=/trunk/; revision=48602

11 years agoFix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_...
Chris Maynard [Wed, 27 Mar 2013 21:41:56 +0000 (21:41 -0000)]
Fix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_type_number.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48601

11 years agoAdd the new splash image. Designed by Elliott Aldrich. Switch the splash
Gerald Combs [Wed, 27 Mar 2013 21:29:44 +0000 (21:29 -0000)]
Add the new splash image. Designed by Elliott Aldrich. Switch the splash
image from XPM to PNG+pixbuf. Remove old XPMs.

svn path=/trunk/; revision=48600

11 years agoFrom Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8534 802...
Alexis La Goutte [Wed, 27 Mar 2013 21:07:45 +0000 (21:07 -0000)]
From Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8534 802.11: doesn't parse extended channel switch announcement frames correctly

There are more fixed fields in extended channel switch announcement frames.

svn path=/trunk/; revision=48599

11 years agoRegenerate the dissector.
Chris Maynard [Wed, 27 Mar 2013 20:48:45 +0000 (20:48 -0000)]
Regenerate the dissector.

svn path=/trunk/; revision=48598

11 years agoFix the incorrectly duplicated display filter for hf_gsm_map_dlci.
Chris Maynard [Wed, 27 Mar 2013 20:44:47 +0000 (20:44 -0000)]
Fix the incorrectly duplicated display filter for hf_gsm_map_dlci.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48597

11 years agoFix the incorrectly duplicated display filters for hf_tp_bip_tcp_local and hf_tp_bip_...
Chris Maynard [Wed, 27 Mar 2013 20:26:06 +0000 (20:26 -0000)]
Fix the incorrectly duplicated display filters for hf_tp_bip_tcp_local and hf_tp_bip_udp_local.

svn path=/trunk/; revision=48596

11 years agoFix the incorrectly duplicated display filter for hf_om2k_cbi.
Chris Maynard [Wed, 27 Mar 2013 20:21:19 +0000 (20:21 -0000)]
Fix the incorrectly duplicated display filter for hf_om2k_cbi.
#BACKPORT(1.8)

svn path=/trunk/; revision=48595

11 years agoAdd items for WinPcap 4.1.3 and the new icons.
Gerald Combs [Wed, 27 Mar 2013 18:36:52 +0000 (18:36 -0000)]
Add items for WinPcap 4.1.3 and the new icons.

svn path=/trunk/; revision=48594

11 years agoFix dist.
Gerald Combs [Wed, 27 Mar 2013 18:25:54 +0000 (18:25 -0000)]
Fix dist.

svn path=/trunk/; revision=48593

11 years agoFrom G.Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8501 HomeplugA...
Alexis La Goutte [Wed, 27 Mar 2013 18:16:22 +0000 (18:16 -0000)]
From G.Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8501 HomeplugAV dissector: Decoding HPAV-1.1 Tone Map Tx/Rx Characteristics Req/Conf (0xA070/0xA071/0xA090/0xA091)

Dissecting HPAV-1.1 Tone Map Characteristics Req/Conf (0xA070/0xA071) was not correct.
Also found that MMType 0xA070/0xA071 is used for the Tx ToneMaps and the MMType 0xA090/0xA091 for the Rx ToneMaps. Added types and dissector for the Rx MMType. Although the Rx-Conf-Structure is almost identical to the Tx is did duplicate the dissector code to avoid mixups.
Added some additional Infos to the carrier dissector output (Carrier#, #Modulated-Bits, Average#Modulated-Bits/Carrier).

Also extended the homeplug_av_tone_map_vals with 0x08 for 12bit 4096-QAM (the AR74xx should support this kind of modulation) and changed the mask to 0x0f accordingly

svn path=/trunk/; revision=48592

11 years agoAdd an interface list icon. Some of the new capture icons were 1 pixel
Gerald Combs [Wed, 27 Mar 2013 18:09:00 +0000 (18:09 -0000)]
Add an interface list icon. Some of the new capture icons were 1 pixel
too small, so add corrected ones. Add SVG versions of the new toolbar
icons. Use consistent naming for alternate icons. Remove some
no-longer-used XPMs. Add a script to compress PNGs using various
utilities and run it. Regenerate the pixbuf includes using the smaller
PNGs.

svn path=/trunk/; revision=48591

11 years agoLoop the timing test 128 times so that statistics work more in our favour.
Evan Huus [Wed, 27 Mar 2013 17:30:12 +0000 (17:30 -0000)]
Loop the timing test 128 times so that statistics work more in our favour.

Print the times to stdout so that in a failure case we can see how badly it
was off.

svn path=/trunk/; revision=48590

11 years agoFrom Hadriel Kaplan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8223
Evan Huus [Wed, 27 Mar 2013 17:14:42 +0000 (17:14 -0000)]
From Hadriel Kaplan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8223

Add a 2-pass display-filter flag to tshark so that reassembly and other forward-
looking dissections can be used with filters.

It's a bit of a hack, but this entire area of 2-pass analysis etc. is a giant
pile of hacks to begin with and needs cleaning up. For now just having this
feature is a big enough win.

svn path=/trunk/; revision=48589

11 years agoAdd a timing test to check that the block allocator is actually faster than the
Evan Huus [Wed, 27 Mar 2013 16:37:12 +0000 (16:37 -0000)]
Add a timing test to check that the block allocator is actually faster than the
simple one. At the moment it seems to be between 2x and 2.5x faster in the
common case (a simple sequence of allocations followed by free_all).

svn path=/trunk/; revision=48588

11 years agoFix bug 8524 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8524) and show...
Irene Rüngeler [Wed, 27 Mar 2013 15:05:32 +0000 (15:05 -0000)]
Fix bug 8524 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8524) and show the correct tooltips for the columns.

svn path=/trunk/; revision=48587

11 years agoGeneralize the allocator test function and use it to test the simple and
Evan Huus [Wed, 27 Mar 2013 12:43:29 +0000 (12:43 -0000)]
Generalize the allocator test function and use it to test the simple and
the strict allocators as well.

svn path=/trunk/; revision=48586

11 years agoFrom Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8531 :
Pascal Quantin [Wed, 27 Mar 2013 12:29:44 +0000 (12:29 -0000)]
From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8531 :
Fix compilation when building with HAVE_GTKOSXAPPLICATION

svn path=/trunk/; revision=48585

11 years agoCopy over a missing flag in the block allocator to fix the build-bot failure
Evan Huus [Wed, 27 Mar 2013 12:01:36 +0000 (12:01 -0000)]
Copy over a missing flag in the block allocator to fix the build-bot failure
at http://buildbot.wireshark.org/trunk/builders/Ubuntu-12.04-x64/builds/4250

Adding --verbose to get the random seed has payed off already!

svn path=/trunk/; revision=48584

11 years agoRemove searching in $prefix for packages as requested in bug 6011 and bug 7926.
Stig Bjørlykke [Wed, 27 Mar 2013 09:44:34 +0000 (09:44 -0000)]
Remove searching in $prefix for packages as requested in bug 6011 and bug 7926.

svn path=/trunk/; revision=48582

11 years agoFrom Peter Hatina:
Anders Broman [Wed, 27 Mar 2013 06:37:46 +0000 (06:37 -0000)]
From Peter Hatina:
We call capture_dlg_prep() and do_file_close() in wrong order. capture_dlg_prep() clears global options for currently running capture and then we get an assertation fail in capture_input_new_packets().

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

svn path=/trunk/; revision=48581

11 years agoIt's 2013.
Gerald Combs [Wed, 27 Mar 2013 03:57:38 +0000 (03:57 -0000)]
It's 2013.

svn path=/trunk/; revision=48580

11 years agoAdd the release date for GTK+ 3.8.0.
Gerald Combs [Wed, 27 Mar 2013 03:56:42 +0000 (03:56 -0000)]
Add the release date for GTK+ 3.8.0.

svn path=/trunk/; revision=48579

11 years agotvb_reported_length_remaining() can return -1, so be sure to properly handle it if...
Chris Maynard [Wed, 27 Mar 2013 03:13:56 +0000 (03:13 -0000)]
tvb_reported_length_remaining() can return -1, so be sure to properly handle it if it does.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48578

11 years agoFix Coverity CID 281471: Logically dead code. (addr_type can only be 1 or 2 due...
Chris Maynard [Wed, 27 Mar 2013 02:46:45 +0000 (02:46 -0000)]
Fix Coverity CID 281471: Logically dead code.  (addr_type can only be 1 or 2 due to the return statement in the default case)

svn path=/trunk/; revision=48577

11 years agoRun the wmem unit tests with --verbose (provided by glib) so that if
Evan Huus [Wed, 27 Mar 2013 02:35:32 +0000 (02:35 -0000)]
Run the wmem unit tests with --verbose (provided by glib) so that if
one of the random bits fails we get the seed to reproduce with.

svn path=/trunk/; revision=48576

11 years agoFix -Wshadow that happens with some old versions of gcc (not mine, for some
Evan Huus [Wed, 27 Mar 2013 02:28:45 +0000 (02:28 -0000)]
Fix -Wshadow that happens with some old versions of gcc (not mine, for some
reason).

Don't use g_assert_cmpuint, since it apparently causes warnings on windows that
I don't know how to get rid of safely without breaking the conditions being
checked.

svn path=/trunk/; revision=48575

11 years agoGreatly improve wmem tests, including random fuzz-style testing. Improve
Evan Huus [Wed, 27 Mar 2013 00:27:45 +0000 (00:27 -0000)]
Greatly improve wmem tests, including random fuzz-style testing. Improve
assertions in the block allocator, and fix one rare potential underflow caught
by the improved tests.

The tests now take ~200MB and 5-10 seconds to run. Hopefully this is small
enough for the build-bots to handle, if not then we can reduce the max
allocation size or max iterations to suit.

svn path=/trunk/; revision=48574

11 years agoUse more recent versions of various libs.
Michael Tüxen [Tue, 26 Mar 2013 22:47:41 +0000 (22:47 -0000)]
Use more recent versions of various libs.

svn path=/trunk/; revision=48573

11 years agoFrom Hadriel Kaplan:
Jaap Keuter [Tue, 26 Mar 2013 21:53:09 +0000 (21:53 -0000)]
From Hadriel Kaplan:
The 'make-manuf'perl script gets the IEEE 22-bit OUI and IAB registries, but not OUI-36.
patch to get the OUI-36 listings.

From me:
Update header text in template to list the sources actually used.

svn path=/trunk/; revision=48572

11 years agoAdd new capture toolbar icons.
Gerald Combs [Tue, 26 Mar 2013 21:35:42 +0000 (21:35 -0000)]
Add new capture toolbar icons.

svn path=/trunk/; revision=48571

11 years agoAdd wsicon128.png to the source distribution.
Jeff Morriss [Tue, 26 Mar 2013 21:01:32 +0000 (21:01 -0000)]
Add wsicon128.png to the source distribution.

Install some more icon sizes (24x24 and 128x128) when installing desktop files.

svn path=/trunk/; revision=48570

11 years agoadd program number to the cc item tree
Martin Kaiser [Tue, 26 Mar 2013 20:39:58 +0000 (20:39 -0000)]
add program number to the cc item tree

svn path=/trunk/; revision=48569

11 years agoadd explicit cast to avoid a compiler warning
Martin Kaiser [Tue, 26 Mar 2013 20:33:49 +0000 (20:33 -0000)]
add explicit cast to avoid a compiler warning

svn path=/trunk/; revision=48568

11 years agoFix dist.
Gerald Combs [Tue, 26 Mar 2013 20:28:04 +0000 (20:28 -0000)]
Fix dist.

svn path=/trunk/; revision=48567

11 years agoUpdate the OS X application icon.
Gerald Combs [Tue, 26 Mar 2013 20:12:52 +0000 (20:12 -0000)]
Update the OS X application icon.

svn path=/trunk/; revision=48566

11 years agoMore icon updates.
Gerald Combs [Tue, 26 Mar 2013 19:51:33 +0000 (19:51 -0000)]
More icon updates.

Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565

11 years agoAdd checksum_bad, set to FALSE to the tree when the checksum is correct. Use PROTO_I...
Chris Maynard [Tue, 26 Mar 2013 18:08:05 +0000 (18:08 -0000)]
Add checksum_bad, set to FALSE to the tree when the checksum is correct.  Use PROTO_ITEM_SET_HIDDEN instead of PROTO_ITEM_SET_GENERATED so ICMP and ICMPv6 are consistent.

See: http://ask.wireshark.org/questions/19844/icmp-display-filter-checksum_bad-ignored

#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48563

11 years agoAdd new application icons. Designed by Elliott Aldrich.
Gerald Combs [Tue, 26 Mar 2013 18:02:20 +0000 (18:02 -0000)]
Add new application icons. Designed by Elliott Aldrich.

svn path=/trunk/; revision=48562

11 years agoFix Coverity CID 990752: Unused pointer value. (column was previously unused)
Chris Maynard [Tue, 26 Mar 2013 16:40:23 +0000 (16:40 -0000)]
Fix Coverity CID 990752: Unused pointer value.  (column was previously unused)

svn path=/trunk/; revision=48561

11 years agoFix c++-compat errors if WANT_PACKET_EDITOR is defined.
Evan Huus [Tue, 26 Mar 2013 15:14:02 +0000 (15:14 -0000)]
Fix c++-compat errors if WANT_PACKET_EDITOR is defined.

svn path=/trunk/; revision=48560

11 years agoAlign a bit more with upstream.
Anders Broman [Tue, 26 Mar 2013 05:36:27 +0000 (05:36 -0000)]
Align a bit more with upstream.

svn path=/trunk/; revision=48559

11 years agoMake the oid memeber a const.
Anders Broman [Tue, 26 Mar 2013 05:20:55 +0000 (05:20 -0000)]
Make the oid memeber a const.

svn path=/trunk/; revision=48558

11 years agoFrom Jim Young:
Anders Broman [Tue, 26 Mar 2013 05:02:05 +0000 (05:02 -0000)]
From Jim Young:
Add casts to support c++ when HAVE_GTKOSXAPPLICATION is defined.

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

svn path=/trunk/; revision=48557

11 years agoFix two errors in ieee80211_status_code - one out-of-order entry and one
Guy Harris [Tue, 26 Mar 2013 01:11:06 +0000 (01:11 -0000)]
Fix two errors in ieee80211_status_code - one out-of-order entry and one
(presumed) typo (61 would be a duplicate, and was between 70 and 72, so
I assume it was supposed to be 71).

svn path=/trunk/; revision=48556

11 years agoGive better diagnostics for "Extended value string XXX forced to fall
Guy Harris [Tue, 26 Mar 2013 00:37:03 +0000 (00:37 -0000)]
Give better diagnostics for "Extended value string XXX forced to fall
back to linear search", to make it easier to find the out-of-order
entries.

svn path=/trunk/; revision=48555

11 years agoInclude a message with all ReassemblyError exceptions; they're expected
Guy Harris [Mon, 25 Mar 2013 22:36:29 +0000 (22:36 -0000)]
Include a message with all ReassemblyError exceptions; they're expected
to have a message indicating the precise error.

svn path=/trunk/; revision=48554

11 years agoFix RFC number.
Guy Harris [Mon, 25 Mar 2013 22:04:51 +0000 (22:04 -0000)]
Fix RFC number.

svn path=/trunk/; revision=48553

11 years agoWiretap file open routines should not free wth->priv on error, since that
Evan Huus [Mon, 25 Mar 2013 22:04:15 +0000 (22:04 -0000)]
Wiretap file open routines should not free wth->priv on error, since that
leads to a double-free in wtap_close. Fix all the instances I found via
manual code review, and add a brief comment to the list of open routines in
file_access.c

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

svn path=/trunk/; revision=48552

11 years agoAdd two new dissectors to release notes.
Evan Huus [Mon, 25 Mar 2013 17:09:36 +0000 (17:09 -0000)]
Add two new dissectors to release notes.

svn path=/trunk/; revision=48551

11 years agoFrom Dario Lombardo, Alexander Chemeris and Ivan Klyuchnikovhis via
Evan Huus [Mon, 25 Mar 2013 17:06:11 +0000 (17:06 -0000)]
From Dario Lombardo, Alexander Chemeris and Ivan Klyuchnikovhis via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8507

Dissectors for the VRT (VITA 49 Radio Transport) and UHD protocols.

From me: modelines and misc trivial cleanups.

svn path=/trunk/; revision=48550

11 years agoFix compilation with C++ warnings enabled: use enum values instead of raw
Jeff Morriss [Mon, 25 Mar 2013 14:35:19 +0000 (14:35 -0000)]
Fix compilation with C++ warnings enabled: use enum values instead of raw
numbers in adns_init() and adns_submit().

(I haven't checked how long these enums have been there; hopefully for a long
time.)

svn path=/trunk/; revision=48549

11 years agoFrom Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8502
Evan Huus [Mon, 25 Mar 2013 12:53:26 +0000 (12:53 -0000)]
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8502

Allow reassembly of sequences when the sequence numbers do not count from 0.

svn path=/trunk/; revision=48548

11 years agoFrom Audric Schiltknecht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
Evan Huus [Mon, 25 Mar 2013 12:40:37 +0000 (12:40 -0000)]
From Audric Schiltknecht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8520

Fix typo in DVB-S2 dissector: s/lable/label/.

svn path=/trunk/; revision=48547

11 years agoFrom Michal Labedzki: linktype_val_to_name() returns a string, not a
Guy Harris [Mon, 25 Mar 2013 11:53:56 +0000 (11:53 -0000)]
From Michal Labedzki: linktype_val_to_name() returns a string, not a
number, and that string is what's appropriate for the -y command-line
argument, so just directly pass it to sync_pipe_add_arg(), and get rid
of the now-unnecessary sdlt variable.

svn path=/trunk/; revision=48546