metze/wireshark/wip.git
11 years agoAdd a much better workaround for bug #8382 and some expert info.
Evan Huus [Fri, 1 Mar 2013 19:08:30 +0000 (19:08 -0000)]
Add a much better workaround for bug #8382 and some expert info.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382

svn path=/trunk/; revision=47979

11 years agoFrom Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Pascal Quantin [Fri, 1 Mar 2013 19:05:25 +0000 (19:05 -0000)]
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from WiMAX plugins

svn path=/trunk/; revision=47978

11 years agoFrom Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Pascal Quantin [Fri, 1 Mar 2013 18:35:51 +0000 (18:35 -0000)]
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-smb.C

svn path=/trunk/; revision=47977

11 years agoFix [-W shadow] issue in SVN #47958 in a slightly different manner than the fix ...
Bill Meier [Fri, 1 Mar 2013 16:31:42 +0000 (16:31 -0000)]
Fix [-W shadow] issue in SVN #47958 in a slightly different manner than the fix  SVN #47960.

svn path=/trunk/; revision=47976

11 years agoWhitespace changes: Convert spaces to tabs. Add modelines.
Chris Maynard [Fri, 1 Mar 2013 16:13:44 +0000 (16:13 -0000)]
Whitespace changes: Convert spaces to tabs.  Add modelines.

svn path=/trunk/; revision=47975

11 years agoAddendum to r47962, caught by Jakub Zawadzki via
Evan Huus [Fri, 1 Mar 2013 13:24:24 +0000 (13:24 -0000)]
Addendum to r47962, caught by Jakub Zawadzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8379

Respect the offset given us by TCP when fetching PDU len.

svn path=/trunk/; revision=47974

11 years agoFix Coverity CID 280396: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 07:02:08 +0000 (07:02 -0000)]
Fix Coverity CID 280396: Logically dead code.

svn path=/trunk/; revision=47973

11 years agoFix Coverity CID 280371: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 06:52:25 +0000 (06:52 -0000)]
Fix Coverity CID 280371: Logically dead code.

svn path=/trunk/; revision=47972

11 years agoFix warning: C++ style comments are not allowed in ISO C90 [enabled by default]
Anders Broman [Fri, 1 Mar 2013 06:44:37 +0000 (06:44 -0000)]
Fix  warning: C++ style comments are not allowed in ISO C90 [enabled by default]

svn path=/trunk/; revision=47971

11 years agoFix Coverity CID 280369: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 06:29:18 +0000 (06:29 -0000)]
Fix Coverity CID 280369: Logically dead code.

svn path=/trunk/; revision=47970

11 years agoConvert spaces to tabs in capture_step_snapshot().
Chris Maynard [Fri, 1 Mar 2013 06:20:41 +0000 (06:20 -0000)]
Convert spaces to tabs in capture_step_snapshot().
(Maybe this will make the XP buildbot happy so test.sh succeeds again?)

svn path=/trunk/; revision=47969

11 years agoFrom beroset:
Anders Broman [Fri, 1 Mar 2013 06:01:51 +0000 (06:01 -0000)]
From beroset:
remove C++ incompatibilities from packet-pw-atm.c

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

svn path=/trunk/; revision=47968

11 years agoFix Coverity CID 280367: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 05:46:07 +0000 (05:46 -0000)]
Fix Coverity CID 280367: Logically dead code.

svn path=/trunk/; revision=47967

11 years agoFix Coverity CID 280365: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 05:40:49 +0000 (05:40 -0000)]
Fix Coverity CID 280365: Logically dead code.
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=47966

11 years agoFix Coverity CID 280362: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 05:29:12 +0000 (05:29 -0000)]
Fix Coverity CID 280362: Logically dead code.
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=47965

11 years agoFix Coverity CID 280391: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 05:04:03 +0000 (05:04 -0000)]
Fix Coverity CID 280391: Logically dead code.

svn path=/trunk/; revision=47964

11 years agoFix Coverity CID 988967: Logically dead code.
Chris Maynard [Fri, 1 Mar 2013 04:53:26 +0000 (04:53 -0000)]
Fix Coverity CID 988967: Logically dead code.

svn path=/trunk/; revision=47963

11 years agoFrom Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
Evan Huus [Fri, 1 Mar 2013 02:07:58 +0000 (02:07 -0000)]
From Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8379

New dissector for the honeypot-feeds protocol.

From me: Misc. tweaks to expert info layout and remove a few unneeded initializers.

svn path=/trunk/; revision=47962

11 years agoAdd some 'const's to satisfy latest GCC.
Evan Huus [Fri, 1 Mar 2013 01:39:33 +0000 (01:39 -0000)]
Add some 'const's to satisfy latest GCC.

svn path=/trunk/; revision=47961

11 years agoRename a variable s/color_edit_dlg/color_edit_window/ to fix a -Wshadow error
Evan Huus [Thu, 28 Feb 2013 23:44:32 +0000 (23:44 -0000)]
Rename a variable s/color_edit_dlg/color_edit_window/ to fix a -Wshadow error

svn path=/trunk/; revision=47960

11 years agoRe-add statement accidentally removed in r47950 that was resulting in a
Evan Huus [Thu, 28 Feb 2013 23:39:47 +0000 (23:39 -0000)]
Re-add statement accidentally removed in r47950 that was resulting in a
variable being used uninitialized.

svn path=/trunk/; revision=47959

11 years agocolor_edit_dlg update:
Bill Meier [Thu, 28 Feb 2013 23:05:09 +0000 (23:05 -0000)]
color_edit_dlg update:
- Significantly simplify & rework code;
- Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer.
- Minor UI cleanup (default buttons & etc)
- Fix crash which occurred in the (existing) GTK3 related code.
- Fix some other relatively minor bugs (including some minor memory leaks);
- Remove some old, commented-out code;
- Use a more consistent naming scheme for certain variables.

svn path=/trunk/; revision=47958

11 years agoMake it so that alternate-prefix RPM builds actually work.
Jeff Morriss [Thu, 28 Feb 2013 23:02:38 +0000 (23:02 -0000)]
Make it so that alternate-prefix RPM builds actually work.

Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").

(Maybe this approach should also be used for the other options in the .spec
file.)

Only clean up if building the RPM was successful.

svn path=/trunk/; revision=47957

11 years agoReplace proto_tree_add_text with proto_tree_add_item/expert_info
Michael Mann [Thu, 28 Feb 2013 23:01:31 +0000 (23:01 -0000)]
Replace proto_tree_add_text with proto_tree_add_item/expert_info

svn path=/trunk/; revision=47956

11 years agoFix dissection of feedback with large CID
Pascal Quantin [Thu, 28 Feb 2013 22:22:52 +0000 (22:22 -0000)]
Fix dissection of feedback with large CID

svn path=/trunk/; revision=47955

11 years agoRevert "Fix MSVC build errors related to symbol visibility"
Balint Reczey [Thu, 28 Feb 2013 22:17:06 +0000 (22:17 -0000)]
Revert "Fix MSVC build errors related to symbol visibility"

This reverts commit r47952.
The problem was different from what I originally thought, thus
the commit was obsolete.

svn path=/trunk/; revision=47954

11 years agoAdd -DWS_BUILD_DLL to wiretap Windows builds
Balint Reczey [Thu, 28 Feb 2013 21:42:23 +0000 (21:42 -0000)]
Add -DWS_BUILD_DLL to wiretap Windows builds

It fixes symbol exporting from DLLs.

svn path=/trunk/; revision=47953

11 years agoFix MSVC build errors related to symbol visibility
Balint Reczey [Thu, 28 Feb 2013 21:11:32 +0000 (21:11 -0000)]
Fix MSVC build errors related to symbol visibility

svn path=/trunk/; revision=47952

11 years agoAdd SVN keywords
Pascal Quantin [Thu, 28 Feb 2013 21:05:27 +0000 (21:05 -0000)]
Add SVN keywords

svn path=/trunk/; revision=47951

11 years agoUse proto_tree_add_item (or similar) instead of proto_item_add_text.
Michael Mann [Thu, 28 Feb 2013 20:17:33 +0000 (20:17 -0000)]
Use proto_tree_add_item (or similar) instead of proto_item_add_text.

svn path=/trunk/; revision=47950

11 years agoConvert proto_item_add_text to proto_item_add_item.
Michael Mann [Thu, 28 Feb 2013 20:07:15 +0000 (20:07 -0000)]
Convert proto_item_add_text to proto_item_add_item.
General whitespace cleanup, add modelines.

svn path=/trunk/; revision=47949

11 years agoExport libwiretap symbols using WS_DLL_PUBLIC define
Balint Reczey [Thu, 28 Feb 2013 19:35:59 +0000 (19:35 -0000)]
Export libwiretap symbols using WS_DLL_PUBLIC define

TODO: hide flex-generated functions

svn path=/trunk/; revision=47948

11 years agoUpdate a comment.
Guy Harris [Thu, 28 Feb 2013 18:13:41 +0000 (18:13 -0000)]
Update a comment.

svn path=/trunk/; revision=47947

11 years agoDissect japan ISUP Charging Info IE.
Anders Broman [Thu, 28 Feb 2013 17:56:02 +0000 (17:56 -0000)]
Dissect japan ISUP Charging Info IE.

svn path=/trunk/; revision=47946

11 years agoAvoid a packet rescan if we don't have an AirPcap adapter.
Anders Broman [Thu, 28 Feb 2013 17:55:07 +0000 (17:55 -0000)]
Avoid a packet rescan if we don't have an AirPcap adapter.

svn path=/trunk/; revision=47945

11 years agoBe a little quieter (and do a little more cleanup) when building RPMs.
Jeff Morriss [Thu, 28 Feb 2013 17:29:10 +0000 (17:29 -0000)]
Be a little quieter (and do a little more cleanup) when building RPMs.

svn path=/trunk/; revision=47944

11 years agoAdd a #define for the default capture buffer size and use it.
Jeff Morriss [Thu, 28 Feb 2013 15:27:56 +0000 (15:27 -0000)]
Add a #define for the default capture buffer size and use it.

svn path=/trunk/; revision=47942

11 years agoAdd ws_symbol_export.h WIRESHARK_COMMON_INCLUDES to fix failing distcheck
Balint Reczey [Thu, 28 Feb 2013 15:27:15 +0000 (15:27 -0000)]
Add ws_symbol_export.h WIRESHARK_COMMON_INCLUDES to fix failing distcheck

svn path=/trunk/; revision=47941

11 years agoFrom Anders: revert r47934: it doesn't work everywhere.
Jeff Morriss [Thu, 28 Feb 2013 15:16:46 +0000 (15:16 -0000)]
From Anders: revert r47934: it doesn't work everywhere.
See email discussion on -dev.

svn path=/trunk/; revision=47940

11 years agoFrom Anders: more places to increase the default capture buffer size.
Jeff Morriss [Thu, 28 Feb 2013 14:36:41 +0000 (14:36 -0000)]
From Anders: more places to increase the default capture buffer size.

svn path=/trunk/; revision=47939

11 years agoExport libwsutil symbols using WS_DLL_PUBLIC define
Balint Reczey [Thu, 28 Feb 2013 14:09:46 +0000 (14:09 -0000)]
Export libwsutil symbols using WS_DLL_PUBLIC define

This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938

11 years agoDefault capture buffer size is now 2MB.
Jeff Morriss [Thu, 28 Feb 2013 13:59:47 +0000 (13:59 -0000)]
Default capture buffer size is now 2MB.

svn path=/trunk/; revision=47937

11 years agoFrom Hadriel Kaplan via https://www.wireshark.org/lists/wireshark-dev/201302/msg00216...
Pascal Quantin [Thu, 28 Feb 2013 08:13:40 +0000 (08:13 -0000)]
From Hadriel Kaplan via https://wireshark.org/lists/wireshark-dev/201302/msg00216.html :
Fix dissection of method name in case of RAck header

svn path=/trunk/; revision=47936

11 years agoUpdate the text of dumpcap -h, default buffer size should be 2 MB.
Anders Broman [Thu, 28 Feb 2013 06:37:41 +0000 (06:37 -0000)]
Update the text of dumpcap -h, default buffer size should be 2 MB.

svn path=/trunk/; revision=47935

11 years agostr_util.c: Although the glib documentation doesn't explicitly say so,
Gerald Combs [Thu, 28 Feb 2013 04:44:38 +0000 (04:44 -0000)]
str_util.c: Although the glib documentation doesn't explicitly say so,
it looks like the thousands grouping (') modifier is supported so use it
in format_size.

capinfos.c: Set our locale.

svn path=/trunk/; revision=47934

11 years agoCombine all the flags fields into one field, and get rid of the
Guy Harris [Thu, 28 Feb 2013 04:29:43 +0000 (04:29 -0000)]
Combine all the flags fields into one field, and get rid of the
commented-out/#if-ed-out "Data1" field, as it's the same field.

Give the flags in that field names including "flags".

Shuffle the fields around to put "Flags" (a/k/a Data1) where Data1 was,
and put the bits in that field after it.

Update the URL for the spec at IBM.

Reformat the entries in hf_netb[] to use the same style.

svn path=/trunk/; revision=47933

11 years agoFix Coverity CID 719419: Dereference after null check.
Chris Maynard [Thu, 28 Feb 2013 03:15:57 +0000 (03:15 -0000)]
Fix Coverity CID 719419: Dereference after null check.

svn path=/trunk/; revision=47932

11 years agoFix Coverity CID 280377: Dead default in switch.
Chris Maynard [Thu, 28 Feb 2013 02:48:16 +0000 (02:48 -0000)]
Fix Coverity CID 280377: Dead default in switch.

svn path=/trunk/; revision=47931

11 years agoFix Coverity CID 280366: Dead default in switch.
Chris Maynard [Thu, 28 Feb 2013 02:37:14 +0000 (02:37 -0000)]
Fix Coverity CID 280366: Dead default in switch.

svn path=/trunk/; revision=47930

11 years agoThe LDAP dissector uses register_frame_end_routine(), so it needs to
Guy Harris [Thu, 28 Feb 2013 00:09:26 +0000 (00:09 -0000)]
The LDAP dissector uses register_frame_end_routine(), so it needs to
include packet-frame.h.

svn path=/trunk/; revision=47928

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8378 :
Pascal Quantin [Wed, 27 Feb 2013 23:08:17 +0000 (23:08 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8378 :
A detailed diagnostic information contains either a SMS-SUBMIT-REPORT or a SMS-DELIVERY-REPORT. Set P2P direction accordingly.

svn path=/trunk/; revision=47927

11 years agoInclude <epan/show_exception.h>, as show_exception() is called.
Guy Harris [Wed, 27 Feb 2013 23:07:25 +0000 (23:07 -0000)]
Include <epan/show_exception.h>, as show_exception() is called.

svn path=/trunk/; revision=47926

11 years agoGet rid of unnecessary includes of "packet-frame.h".
Guy Harris [Wed, 27 Feb 2013 23:02:18 +0000 (23:02 -0000)]
Get rid of unnecessary includes of "packet-frame.h".

svn path=/trunk/; revision=47925

11 years agoMove show_exception() and show_reported_bounds_error() to
Guy Harris [Wed, 27 Feb 2013 22:43:54 +0000 (22:43 -0000)]
Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.

If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924

11 years agoFor subvectors, make a top-level item to cover the entire subvector, and
Guy Harris [Wed, 27 Feb 2013 22:07:44 +0000 (22:07 -0000)]
For subvectors, make a top-level item to cover the entire subvector, and
put the length, identifier, and value as visible sub-items underneath
it.  If the length is bad, add an expert info indication under the item
for the length, rather than using proto_malformed.  Add checks for the
lengths of each type of subvector.

Add some more subvector types from IEEE 802.5-1998, and use the names
from that spec.

svn path=/trunk/; revision=47923

11 years agoWhen decompressing, put an entry into the protocol tree that covers all
Guy Harris [Wed, 27 Feb 2013 22:04:40 +0000 (22:04 -0000)]
When decompressing, put an entry into the protocol tree that covers all
the compressed data, put the entries for particular parts of that data
under that entry, and, when we have a problem decompressing, add an
expert info item to that entry, rather than just adding text or using
proto_malformed.  Do so for *all* decompression problems; in particular,
check for decompressed_entry() returning NULL, which it can do.

tvb_new_child_real_data() won't throw an exception, so don't bother
checking for that.

If, after the first pass, we can't find the uncompressed data for a
frame, report it as a dissector bug.

Check whether we have room for a byte in the uncompressed data buffer
*before* copying it.

Other cleanups.

svn path=/trunk/; revision=47922

11 years agoFrom J. Schoenwaelder via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8410 :
Pascal Quantin [Wed, 27 Feb 2013 21:19:37 +0000 (21:19 -0000)]
From J. Schoenwaelder via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8410 :
Fix dissection of flowDurationMicroseconds in Netflow dissector

svn path=/trunk/; revision=47921

11 years agoIncrease the default buffer size to 2MB.
Anders Broman [Wed, 27 Feb 2013 20:38:43 +0000 (20:38 -0000)]
Increase the default buffer size to 2MB.

svn path=/trunk/; revision=47920

11 years agoDissect Japan ISUP Charge rate transfer (flexible charging) .
Anders Broman [Wed, 27 Feb 2013 20:02:38 +0000 (20:02 -0000)]
Dissect Japan ISUP Charge rate transfer (flexible charging) .

svn path=/trunk/; revision=47919

11 years agoUse ENC_NA for single byte fields, as that appears to be the generally agreed upon...
Chris Maynard [Wed, 27 Feb 2013 16:18:16 +0000 (16:18 -0000)]
Use ENC_NA for single byte fields, as that appears to be the generally agreed upon convention.  Add modelines.

#BACKPORT(1.8) + r47915

svn path=/trunk/; revision=47918

11 years agoUse consistent indentation; Add editor modelines.
Bill Meier [Wed, 27 Feb 2013 16:15:18 +0000 (16:15 -0000)]
Use consistent indentation; Add editor modelines.

svn path=/trunk/; revision=47917

11 years agoAdd a %prefix option for users who want to (easily) configure Wireshark to
Jeff Morriss [Wed, 27 Feb 2013 16:12:19 +0000 (16:12 -0000)]
Add a %prefix option for users who want to (easily) configure Wireshark to
install in a non-standard location.

Assume the desktop-integration stuff goes in /usr (regardless of our prefix).

This (with r47914) fixes RPM generation when someone uses a prefix other than
/usr .

Also: run desktop-file-validate on the wireshark.desktop file (just in case it
wasn't installed with desktop-file-install).

svn path=/trunk/; revision=47916

11 years agoProtocol is ENC_BIG_ENDIAN, adjust accordingly.
Michael Mann [Wed, 27 Feb 2013 16:08:48 +0000 (16:08 -0000)]
Protocol is ENC_BIG_ENDIAN, adjust accordingly.

Bug 8407 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8407)

svn path=/trunk/; revision=47915

11 years agoDon't install the desktop-integration files in our (Wireshark's) data
Jeff Morriss [Wed, 27 Feb 2013 16:08:16 +0000 (16:08 -0000)]
Don't install the desktop-integration files in our (Wireshark's) data
directory (which is based on our installation prefix): there's no guarantee
that the desktop also uses the same prefix.

Add a note about how we might be able to find the desktop's data directory
should anyone actually run GNOME with a prefix other than /usr .

Also use 'desktop-file-install' to install the desktop file (if configure
found that command).

svn path=/trunk/; revision=47914

11 years agoFix
Anders Broman [Wed, 27 Feb 2013 05:53:46 +0000 (05:53 -0000)]
Fix
- warning: unused parameter 'item'.
- warning: format not a string literal and no format arguments.

svn path=/trunk/; revision=47912

11 years agoFix example Lua plugin that passes wrong argument in register_menu function
Michael Mann [Wed, 27 Feb 2013 04:29:21 +0000 (04:29 -0000)]
Fix example Lua plugin that passes wrong argument in register_menu function

From Hadriel Kaplan, bug 8201 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8201)

svn path=/trunk/; revision=47911

11 years agoReplace proto_tree_add_text with proto_tree_add_item + expert_info. Not enough to...
Michael Mann [Wed, 27 Feb 2013 03:58:23 +0000 (03:58 -0000)]
Replace proto_tree_add_text with proto_tree_add_item + expert_info.  Not enough to pacify checkAPIs.pl standards, but its a vast improvement.

svn path=/trunk/; revision=47910

11 years agoIncrease use of proto_tree_add_item (mostly replacing proto_tree_add_text)
Michael Mann [Wed, 27 Feb 2013 03:37:45 +0000 (03:37 -0000)]
Increase use of proto_tree_add_item (mostly replacing proto_tree_add_text)

svn path=/trunk/; revision=47909

11 years agoReplace proto_tree_add_text with proto_tree_add_item + expert_info
Michael Mann [Wed, 27 Feb 2013 03:35:04 +0000 (03:35 -0000)]
Replace proto_tree_add_text with proto_tree_add_item + expert_info

svn path=/trunk/; revision=47908

11 years agoLook for desktop-file-install (to be used when installing wireshark.desktop).
Jeff Morriss [Wed, 27 Feb 2013 02:32:00 +0000 (02:32 -0000)]
Look for desktop-file-install (to be used when installing wireshark.desktop).

svn path=/trunk/; revision=47907

11 years agoPut a trailing semicolon on the MimeType line (to satisfy desktop-file-validate).
Jeff Morriss [Tue, 26 Feb 2013 22:13:58 +0000 (22:13 -0000)]
Put a trailing semicolon on the MimeType line (to satisfy desktop-file-validate).

svn path=/trunk/; revision=47906

11 years agoMove pack_flags to better place.
Jakub Zawadzki [Tue, 26 Feb 2013 21:32:11 +0000 (21:32 -0000)]
Move pack_flags to better place.

Reduce sizeof(frame_data) from 136 to 128 (AMD64).

svn path=/trunk/; revision=47905

11 years agoFix warning: 'rrc_sub_handle' may be used uninitialized in this function
Pascal Quantin [Tue, 26 Feb 2013 19:14:14 +0000 (19:14 -0000)]
Fix warning: 'rrc_sub_handle' may be used uninitialized in this function

svn path=/trunk/; revision=47904

11 years agoFix a misspelled word; Do some minor tweaking of the wording of a few comments.
Bill Meier [Tue, 26 Feb 2013 15:10:28 +0000 (15:10 -0000)]
Fix a misspelled word; Do some minor tweaking of the wording of a few comments.

svn path=/trunk/; revision=47903

11 years agoSNMP dissector should handle aes256 (better version than r47690)
Michael Mann [Tue, 26 Feb 2013 11:38:39 +0000 (11:38 -0000)]
SNMP dissector should handle aes256 (better version than r47690)

svn path=/trunk/; revision=47902

11 years agoTry to fix compilation on Windows.
Gerald Combs [Tue, 26 Feb 2013 07:14:44 +0000 (07:14 -0000)]
Try to fix compilation on Windows.

svn path=/trunk/; revision=47901

11 years agoPrint human-readable statistics by default. Raw values can be printed
Gerald Combs [Tue, 26 Feb 2013 06:40:25 +0000 (06:40 -0000)]
Print human-readable statistics by default. Raw values can be printed
using "-M". Based on a suggestion by Hansang Bae.

svn path=/trunk/; revision=47900

11 years agoFix spelling/typos found using a list of commonly misspelled words.
Bill Meier [Tue, 26 Feb 2013 04:42:26 +0000 (04:42 -0000)]
Fix spelling/typos found using a list of commonly misspelled words.

The misspellings were mostly in comments but some were
in text strings visible to the user.

svn path=/trunk/; revision=47899

11 years agoit's ==> its & its ==> it's as needed.
Bill Meier [Tue, 26 Feb 2013 02:38:52 +0000 (02:38 -0000)]
it's ==> its  &  its ==> it's as needed.

svn path=/trunk/; revision=47898

11 years agoRevert r44559: go back to using g_malloc()'d memory for SCTP reassembly. That
Jeff Morriss [Tue, 26 Feb 2013 02:36:05 +0000 (02:36 -0000)]
Revert r44559: go back to using g_malloc()'d memory for SCTP reassembly.  That
way we don't keep two copies of the fragments in memory until the file is
closed.

wmem is probably a better alternative to this.

svn path=/trunk/; revision=47897

11 years agoit's ==> its & its ==> it's as needed.
Bill Meier [Tue, 26 Feb 2013 02:19:57 +0000 (02:19 -0000)]
it's ==> its  &  its ==> it's as needed.

svn path=/trunk/; revision=47896

11 years agoits ==> it's
Bill Meier [Tue, 26 Feb 2013 01:50:44 +0000 (01:50 -0000)]
its ==> it's

svn path=/trunk/; revision=47895

11 years agoit's ==> its
Bill Meier [Tue, 26 Feb 2013 01:43:39 +0000 (01:43 -0000)]
it's ==> its

svn path=/trunk/; revision=47894

11 years agoit's ==> its & its == > it's as needed.
Bill Meier [Tue, 26 Feb 2013 01:30:56 +0000 (01:30 -0000)]
it's ==> its & its == > it's  as needed.

svn path=/trunk/; revision=47893

11 years agoits ==> it's & it's ==> its as needed.
Bill Meier [Tue, 26 Feb 2013 01:22:18 +0000 (01:22 -0000)]
its ==> it's  &  it's ==> its as needed.

svn path=/trunk/; revision=47892

11 years agoit's ==> its & its ==> it's as needed.
Bill Meier [Tue, 26 Feb 2013 01:06:19 +0000 (01:06 -0000)]
it's ==> its & its ==> it's  as needed.

svn path=/trunk/; revision=47891

11 years agoNo need for 'if (...initialized) {...}' in proto_reg_handoff...()
Bill Meier [Tue, 26 Feb 2013 01:00:25 +0000 (01:00 -0000)]
No need for 'if (...initialized) {...}' in proto_reg_handoff...()

svn path=/trunk/; revision=47890

11 years agoit's ==> its & its ==> it's as needed.
Bill Meier [Mon, 25 Feb 2013 23:35:13 +0000 (23:35 -0000)]
it's ==> its  & its ==> it's as needed.

In a few cases:
 Fix spelling;
 Clean up whitespace and formatting style.

svn path=/trunk/; revision=47889

11 years agoDissect more feedback options
Pascal Quantin [Mon, 25 Feb 2013 22:36:24 +0000 (22:36 -0000)]
Dissect more feedback options

svn path=/trunk/; revision=47887

11 years agoFrom Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395
Evan Huus [Mon, 25 Feb 2013 22:19:15 +0000 (22:19 -0000)]
From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395

Support AES-GCM ipsec encryption using CTR (since libgcrypt doesn't support
GCM). Using CTR instead gets us decryption, but does not verify authentication.

svn path=/trunk/; revision=47886

11 years agoFix typos/errors and make Lua API more consistent.
Michael Mann [Mon, 25 Feb 2013 22:05:28 +0000 (22:05 -0000)]
Fix typos/errors and make Lua API more consistent.

From Hadriel Kaplan, bug 8393 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8393)

svn path=/trunk/; revision=47885

11 years agoMake compare-abs.sh work on CMake builds
Balint Reczey [Mon, 25 Feb 2013 21:27:16 +0000 (21:27 -0000)]
Make compare-abs.sh work on CMake builds

svn path=/trunk/; revision=47884

11 years agoABI dumps don't have to depend on config.h directly
Balint Reczey [Mon, 25 Feb 2013 21:27:07 +0000 (21:27 -0000)]
ABI dumps don't have to depend on config.h directly

They depend on libs which need config.h already.

svn path=/trunk/; revision=47883

11 years agoLUA API improvements
Michael Mann [Mon, 25 Feb 2013 20:43:06 +0000 (20:43 -0000)]
LUA API improvements

1. Add col_set_fence() equivalent
2. Update __tostring function to actually return column text

From Hadriel Kaplan, bug 8295 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8295)

svn path=/trunk/; revision=47882

11 years agoFix Coverity CID 986569: Unused pointer value.
Chris Maynard [Mon, 25 Feb 2013 19:28:24 +0000 (19:28 -0000)]
Fix Coverity CID 986569: Unused pointer value.

svn path=/trunk/; revision=47881

11 years agoAdd a few comments to CMake TODO items
Balint Reczey [Mon, 25 Feb 2013 18:12:28 +0000 (18:12 -0000)]
Add a few comments to CMake TODO items

svn path=/trunk/; revision=47880

11 years agoAdd dumpabi targets to CMake builds
Balint Reczey [Mon, 25 Feb 2013 18:12:20 +0000 (18:12 -0000)]
Add dumpabi targets to CMake builds

Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8396
Evan Huus [Mon, 25 Feb 2013 17:55:32 +0000 (17:55 -0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8396

Add Bluetooth HCRP dissector.

From me: rename a preference to be a bit clearer.

svn path=/trunk/; revision=47878

11 years agoBugfix Lua pinfo.cols.protocol not holding value in postdissector
Michael Mann [Mon, 25 Feb 2013 17:32:25 +0000 (17:32 -0000)]
Bugfix Lua pinfo.cols.protocol not holding value in postdissector

From Hadriel Kaplan, bug 6020 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6020)

svn path=/trunk/; revision=47877

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8397 :
Pascal Quantin [Mon, 25 Feb 2013 16:39:43 +0000 (16:39 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8397 :
Prevent an out of bounds access when trying to call RRC sub dissectors and fallback to DATA dissector

svn path=/trunk/; revision=47876