tools/wireshark, branch wireshark-1.6.14

Build 1.6.14.

2013-03-06T18:27:10+00:00

svn path=/trunk-1.6/; revision=48143

Copy over r48062 from the trunk:

2013-03-06T17:56:25+00:00

  ------------------------------------------------------------------------
  r48062 | alagoutte | 2013-03-04 09:16:26 -0800 (Mon, 04 Mar 2013) | 5 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ieee80211.c

  From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8432 BE (3) AC is wrongly named as "Video" in (qos_acs)

  In the array of WME AC names, the name for tid 3 is wrongly named as "Video" it should be "Best Effort" instead.

  #BACKPORT(1.8,1.6)
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=48139

Manually backport more of r48011.

2013-03-06T12:33:43+00:00

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8441 for 1.6 branch

svn path=/trunk-1.6/; revision=48131

------------------------------------------------------------------------

2013-03-06T07:19:59+00:00

r47729 | jake | 2013-02-18 07:19:04 +0100 (Mon, 18 Feb 2013) | 4 lines

Fix for bug 8321:
Feed the tap before trying to dissect the payload. This prevents a malformed 
payload from blocking the tap, resulting in incorrect RTP statistics.

------------------------------------------------------------------------

svn path=/trunk-1.6/; revision=48130

Copy over from trunk

2013-03-06T00:55:13+00:00

------------------------------------------------------------------------
r48123 | eapache | 2013-03-05 19:39:35 -0500 (Tue, 05 Mar 2013) | 5 lines

Followup to r48011, answering my own XXX comment:

No, ReportedBoundsError is not the right thing to throw, ReassemblyError is.
That's why I added it in the first place!

------------------------------------------------------------------------


svn path=/trunk-1.6/; revision=48125

Copy over revisions from the trunk:

2013-03-06T00:32:48+00:00

  ------------------------------------------------------------------------
  r47966 | cmaynard | 2013-02-28 21:40:49 -0800 (Thu, 28 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dcerpc-netlogon.c

  Fix Coverity CID 280365: Logically dead code.
  #BACKPORT (1.8, 1.6)
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r47921 | pascal | 2013-02-27 13:19:37 -0800 (Wed, 27 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-netflow.c

  From J. Schoenwaelder via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8410 :
  Fix dissection of flowDurationMicroseconds in Netflow dissector
  ------------------------------------------------------------------------
  r47936 | pascal | 2013-02-28 00:13:40 -0800 (Thu, 28 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-sip.c

  From Hadriel Kaplan via https://www.wireshark.org/lists/wireshark-dev/201302/msg00216.html :
  Fix dissection of method name in case of RAck header
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=48121

Copy over revisions from the trunk:

2013-03-06T00:23:42+00:00

  ------------------------------------------------------------------------
  r47725 | mmann | 2013-02-17 16:58:21 -0800 (Sun, 17 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ssl.c

  Bugfix data combined via ssl_desegment_app_data not visible via "Follow SSL Stream"

  From Joe McEachern, bug 6434 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6434)
  ------------------------------------------------------------------------
  r47872 | jake | 2013-02-24 22:48:35 -0800 (Sun, 24 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-json.c

  Fix for bug 7939:
  Register application/json-rpc and application/jsonrequest media types for JSON.
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r47877 | mmann | 2013-02-25 09:32:25 -0800 (Mon, 25 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/epan.c
     M /trunk/epan/wslua/wslua.h
     M /trunk/epan/wslua/wslua_field.c

  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)
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=48120

Copy over revisions from the trunk:

2013-03-06T00:12:40+00:00

  ------------------------------------------------------------------------
  r47568 | cmaynard | 2013-02-08 08:23:02 -0800 (Fri, 08 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/ui/gtk/main.c

  Fix Coverity CID 973548: Dereference null return value.
  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------
  r47646 | eapache | 2013-02-12 16:01:38 -0800 (Tue, 12 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ieee80211.c

  From Chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8320

  Fix typo in case value that led to misdissection of TSPEC IEs.
  ------------------------------------------------------------------------
  r47675 | eapache | 2013-02-15 08:59:20 -0800 (Fri, 15 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-bacapp.c

  From Lori Tribble via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8331

  Fix UCS-2 string decoding for strings longer than 127 characters.
  ------------------------------------------------------------------------

Update the release notes.

svn path=/trunk-1.6/; revision=48119

Copy over r45355 from the trunk:

2013-03-06T00:01:41+00:00

  ------------------------------------------------------------------------
  r45355 | pascal | 2012-10-06 14:07:34 -0700 (Sat, 06 Oct 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-sctp.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7802 :
  Avoid an infinite loop when number_of_dup_tsns is equal to 65535
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=48117

Copy over r45324 by hand:

2013-03-05T23:54:30+00:00

  ------------------------------------------------------------------------
  r45324 | martink | 2012-10-04 12:51:00 -0700 (Thu, 04 Oct 2012) | 7 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-sflow.c

  fix fuzz test failures in sflow

  in dissect_sflow_245_address_type(), don't reset the offset to 0 when
  the address family is unkown
  bring up an expert info instead and increment offset by the number of
  bytes processed
  ------------------------------------------------------------------------

svn path=/trunk-1.6/; revision=48116