------------------------------------------------------------------------
r47353 | gerald | 2013-01-29 11:59:20 -0800 (Tue, 29 Jan 2013) | 2 lines
Changed paths:
   M /trunk-1.6/ChangeLog

Prep for 1.6.14.

------------------------------------------------------------------------
r47453 | gerald | 2013-02-03 08:04:03 -0800 (Sun, 03 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-03]
------------------------------------------------------------------------
r47480 | pascal | 2013-02-04 14:57:36 -0800 (Mon, 04 Feb 2013) | 11 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-bacapp.c

Copy over from trunk:
------------------------------------------------------------------------
r42893 | etxrab | 2012-05-29 09:31:38 +0200 (Tue, 29 May 2012) | 7 lines

From Evan Huus:
Fix to
BACapp item length causes Buildbot crash output: randpkt-2011-04-13-1899.pcap

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

------------------------------------------------------------------------
r47495 | wmeier | 2013-02-05 07:12:03 -0800 (Tue, 05 Feb 2013) | 15 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-fmp_notify.c

Copy over from trunk ...

------------------------------------------------------------------------
r47494 | wmeier | 2013-02-05 10:04:22 -0500 (Tue, 05 Feb 2013) | 9 lines

Add missing hf[] entries found by checkhf.

 ERROR: NO ARRAY: packet-fmp_notify.c, hf_fmp_extentList_len
 ERROR: NO ARRAY: packet-fmp_notify.c, hf_fmp_extent_state
 ERROR: NO ARRAY: packet-fmp_notify.c, hf_fmp_numBlks
 ERROR: NO ARRAY: packet-fmp_notify.c, hf_fmp_startOffset
 ERROR: NO ARRAY: packet-fmp_notify.c, hf_fmp_volID

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

------------------------------------------------------------------------
r47604 | gerald | 2013-02-10 08:04:09 -0800 (Sun, 10 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-10]
------------------------------------------------------------------------
r47609 | wmeier | 2013-02-10 08:55:16 -0800 (Sun, 10 Feb 2013) | 11 lines
Changed paths:
   M /trunk-1.6/plugins/docsis/packet-tlv.c

Copy over from trunk

------------------------------------------------------------------------
r47605 | wmeier | 2013-02-10 11:18:18 -0500 (Sun, 10 Feb 2013) | 5 lines

Fix ERROR: NO ARRAY: packet-tlv.c, hf_docsis_rcv_mod_enc_ctr_freq_asgn

##Backport 1.6, 1.8

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

------------------------------------------------------------------------
r47669 | guy | 2013-02-14 17:41:15 -0800 (Thu, 14 Feb 2013) | 2 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/wslua/wslua_pinfo.c

Fix the spelling of "prepend", but leave a compatibility alias in place.

------------------------------------------------------------------------
r47682 | guy | 2013-02-15 13:10:47 -0800 (Fri, 15 Feb 2013) | 38 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/Makefile.am
   M /trunk-1.6/epan/dfilter/Makefile.am
   M /trunk-1.6/plugins/mate/Makefile.am

Copy over from 1.8 branch with manual intervention:

  ------------------------------------------------------------------------
  r47671 | guy | 2013-02-14 19:00:19 -0800 (Thu, 14 Feb 2013) | 17 lines

  Copy over some changes from trunk, with manual intervention:
 
    ------------------------------------------------------------------------
    r47429 | gerald | 2013-02-01 10:20:17 -0800 (Fri, 01 Feb 2013) | 4 lines

    Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
    distcheck. Add some rules recommended by the Automake manual in order
    to avoid duplicate actions.
 
  ------------------------------------------------------------------------
    r47430 | gerald | 2013-02-01 12:16:31 -0800 (Fri, 01 Feb 2013) | 3 lines

    Go far enough down a rabbit hole and you will encounter libtool. See
    if changing .o to .lo works.

  in the hopes of fixing some occasional build failures.

  ------------------------------------------------------------------------
  r47678 | guy | 2013-02-15 12:11:04 -0800 (Fri, 15 Feb 2013) | 3 lines

  Clean up a bit, matching the trunk's version; this eliminates a
  redundant dependency.

  ------------------------------------------------------------------------
  r47679 | guy | 2013-02-15 12:14:29 -0800 (Fri, 15 Feb 2013) | 2 lines

  Get rid of a duplicate dependency.

  ------------------------------------------------------------------------
  r47680 | guy | 2013-02-15 12:16:25 -0800 (Fri, 15 Feb 2013) | 2 lines

  Match the dependency structure of the top of the trunk.

------------------------------------------------------------------------
r47683 | guy | 2013-02-15 13:21:07 -0800 (Fri, 15 Feb 2013) | 10 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/wiretap/Makefile.am
   M /trunk-1.6/wiretap/Makefile.nmake

Copy over r43387 from trunk, with manual intervention:

  ------------------------------------------------------------------------
  r43387 | gerald | 2012-06-19 12:53:03 -0700 (Tue, 19 Jun 2012) | 5 lines

  ascend_scanner.c includes ascend.h. Add corresponding makefile
  dependencies, otherwise we might have a race condition when doing
  parallel makes. Hopefully this will fix intermitten buildbot failures
  we've been getting lately.

------------------------------------------------------------------------
r47685 | guy | 2013-02-15 13:34:05 -0800 (Fri, 15 Feb 2013) | 7 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dfilter/Makefile.nmake

Copy over r47684 from the 1.8 branch:

  ------------------------------------------------------------------------
  r47684 | guy | 2013-02-15 13:31:58 -0800 (Fri, 15 Feb 2013) | 2 lines

  Pick up one more dependency from the trunk.

------------------------------------------------------------------------
r47704 | gerald | 2013-02-17 08:04:08 -0800 (Sun, 17 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-17]
------------------------------------------------------------------------
r47765 | cmaynard | 2013-02-19 20:07:21 -0800 (Tue, 19 Feb 2013) | 14 lines
Changed paths:
   M /trunk-1.6/doc/tshark.pod

Copy over from trunk that part relevant for 1.6.

  ------------------------------------------------------------------------
  r47763 | cmaynard | 2013-02-19 22:06:46 -0500 (Tue, 19 Feb 2013) | 6 lines

  From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8353 : Document http-related '-z' statistics; also add document -z help.

  From me: Don't print an error message for "-z help".

  (Only "http,stat," is suitable for backport to 1.8 and 1.6)

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


------------------------------------------------------------------------
r47855 | gerald | 2013-02-24 08:04:26 -0800 (Sun, 24 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-24]
------------------------------------------------------------------------
r47982 | eapache | 2013-03-01 11:21:53 -0800 (Fri, 01 Mar 2013) | 10 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-ms-mms.c

Backport the workaround with manual intervention:
------------------------------------------------------------------------
r47979 | eapache | 2013-03-01 14:08:30 -0500 (Fri, 01 Mar 2013) | 3 lines

Add a much better workaround for bug #8382 and some expert info.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382

------------------------------------------------------------------------
The actual fix (when it comes) will be too intrusive to backport.

------------------------------------------------------------------------
r47983 | eapache | 2013-03-01 11:22:51 -0800 (Fri, 01 Mar 2013) | 2 lines
Changed paths:
   M /trunk-1.6

Ignore cscope files.

------------------------------------------------------------------------
r47985 | morriss | 2013-03-01 12:04:50 -0800 (Fri, 01 Mar 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-mpls-echo.c

Close a comment (to avoid a '/* within a comment' warning).
------------------------------------------------------------------------
r47986 | morriss | 2013-03-01 12:05:06 -0800 (Fri, 01 Mar 2013) | 10 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-dcerpc-epm.c

Copy over from trunk (in order to eliminate a warning which was back-ported):

  ------------------------------------------------------------------------
  r40003 | sfisher | 2011-11-25 12:19:00 -0500 (Fri, 25 Nov 2011) | 5 lines


  Mark drep parameter as unused in the epm_dissect_tower_data function
  since its use was removed in r40002.


------------------------------------------------------------------------
r48037 | gerald | 2013-03-03 08:04:19 -0800 (Sun, 03 Mar 2013) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2013-03-03]
------------------------------------------------------------------------
r48077 | gerald | 2013-03-04 17:04:07 -0800 (Mon, 04 Mar 2013) | 16 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-rtps.c
   M /trunk-1.6/epan/dissectors/packet-rtps2.c

Copy over r47658 from the trunk:

  ------------------------------------------------------------------------
  r47658 | mmann | 2013-02-14 11:42:58 -0800 (Thu, 14 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-rtps.c
     M /trunk/epan/dissectors/packet-rtps2.c

  Fix potential buffer overflow in RTPS and RTPS2 dissectors by allocating enough memory to fit the "indentation space".

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


Update the release notes.

------------------------------------------------------------------------
r48079 | gerald | 2013-03-04 17:11:26 -0800 (Mon, 04 Mar 2013) | 18 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-mount.c

Copy over r47672 from the trunk:

  ------------------------------------------------------------------------
  r47672 | eapache | 2013-02-15 05:10:06 -0800 (Fri, 15 Feb 2013) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-mount.c

  From Alyssa Milburn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8335

  Make length field unsigned so that negative values fail the bounds check and
  throw a regular exception before getting passed to glib (where they cause a
  program-ending assert failure instead).

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


Update the release notes.

------------------------------------------------------------------------
r48091 | gerald | 2013-03-05 11:14:37 -0800 (Tue, 05 Mar 2013) | 15 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-amqp.c

Copy over r47681 from the trunk:

  ------------------------------------------------------------------------
  r47681 | eapache | 2013-02-15 12:58:59 -0800 (Fri, 15 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-amqp.c

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

  Make offset unsigned and add an additional sanity check.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48094 | gerald | 2013-03-05 11:32:09 -0800 (Tue, 05 Mar 2013) | 17 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-acn.c

Copy over r47692 from the trunk:

  ------------------------------------------------------------------------
  r47692 | jake | 2013-02-16 05:49:42 -0800 (Sat, 16 Feb 2013) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-acn.c

  From Alyssa Milburn:
  This patch adds a check for a zero count to the existing sanity check code.

  From me:
  In addition drop superfluous sanity check.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48099 | gerald | 2013-03-05 13:15:51 -0800 (Tue, 05 Mar 2013) | 13 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-cimd.c

Copy over r47708 with manual intervention:

  ------------------------------------------------------------------------
  r47708 | mmann | 2013-02-17 11:07:14 -0800 (Sun, 17 Feb 2013) | 1 line
  Changed paths:
     M /trunk/epan/dissectors/packet-cimd.c

  Bugfix DoS in CIMD dissector.  Bug 8346 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8346)
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48102 | gerald | 2013-03-05 13:27:47 -0800 (Tue, 05 Mar 2013) | 17 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-fcsp.c

Copy over r47775 from the trunk:

  ------------------------------------------------------------------------
  r47775 | eapache | 2013-02-20 12:41:33 -0800 (Wed, 20 Feb 2013) | 5 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-fcsp.c

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

  Prevent an infinite loop if we don't recognize the param type and
  the length is 0.

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


Update the release notes.

------------------------------------------------------------------------
r48113 | gerald | 2013-03-05 15:17:26 -0800 (Tue, 05 Mar 2013) | 48 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-dtls.c
   M /trunk-1.6/epan/exceptions.h
   M /trunk-1.6/epan/reassemble.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r48010 | eapache | 2013-03-02 08:23:21 -0800 (Sat, 02 Mar 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dtls.c

  Pass the same offset to tvb_ensure_bytes_exist and fragment_add.

  One minor part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r48011 | eapache | 2013-03-02 08:39:56 -0800 (Sat, 02 Mar 2013) | 23 lines
  Changed paths:
     M /trunk/epan/exceptions.h
     M /trunk/epan/reassemble.c
     M /trunk/epan/show_exception.c

  Define a new exception for reassembly errors, and throw it in several cases
  instead of using DISSECTOR_ASSERT. When a dissector passes bad data to the
  reassembly machine, that isn't necessarily the dissector's fault - the data may
  come straight from the packet, and the dissector may not have enough information
  to know it's bad without telling the reassembly machine in the first place.

  Also fix a bug in the reassembly machine. If it were given a fragment and all of
  the following conditions were met:
  - the other associated fragments were already marked as done (reassembled)
  - the fragment went beyond the end of the conceptual reassembled buffer
  - the dissector had not set the PARTIAL_REASSEMBLY flag
  then the reassembly machine would incorrectly think there was an overlap and
  run past the end of the already-reassembled buffer.

  Should fix the rest of
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380

  #BACKPORT
  This is probably too big and intrusive to backport directly, and parts of it
  will need adapting anyways since reassemble.c has changed. But the bug exists
  and crashes in 1.6 and 1.8, so we'll have to do something.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48115 | gerald | 2013-03-05 15:37:26 -0800 (Tue, 05 Mar 2013) | 11 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/image/file_dlg_win32.rc

Copy over r48047 by hand:

  ------------------------------------------------------------------------
  r48047 | cmaynard | 2013-03-03 22:58:40 -0800 (Sun, 03 Mar 2013) | 3 lines
  Changed paths:
     M /trunk/image/file_dlg_win32.rc

  Change "Display filter:" to "Read filter:".  They are not the same.
  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r48116 | gerald | 2013-03-05 15:54:30 -0800 (Tue, 05 Mar 2013) | 15 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-sflow.c

Copy over r45324 by hand:

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

------------------------------------------------------------------------
r48117 | gerald | 2013-03-05 16:01:41 -0800 (Tue, 05 Mar 2013) | 14 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-sctp.c

Copy over r45355 from the trunk:

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

------------------------------------------------------------------------
r48119 | gerald | 2013-03-05 16:12:40 -0800 (Tue, 05 Mar 2013) | 29 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-bacapp.c
   M /trunk-1.6/epan/dissectors/packet-ieee80211.c
   M /trunk-1.6/gtk/main.c

Copy over revisions from the trunk:

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

------------------------------------------------------------------------
r48120 | gerald | 2013-03-05 16:23:42 -0800 (Tue, 05 Mar 2013) | 37 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-json.c
   M /trunk-1.6/epan/dissectors/packet-ssl.c
   M /trunk-1.6/epan/epan.c
   M /trunk-1.6/epan/wslua/wslua.h
   M /trunk-1.6/epan/wslua/wslua_field.c

Copy over revisions from the trunk:

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

------------------------------------------------------------------------
r48121 | gerald | 2013-03-05 16:32:48 -0800 (Tue, 05 Mar 2013) | 33 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-dcerpc-netlogon.c
   M /trunk-1.6/epan/dissectors/packet-netflow.c
   M /trunk-1.6/epan/dissectors/packet-sip.c

Copy over revisions from the trunk:

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

------------------------------------------------------------------------
r48125 | eapache | 2013-03-05 16:55:13 -0800 (Tue, 05 Mar 2013) | 13 lines
Changed paths:
   M /trunk-1.6/epan/reassemble.c

Copy over from trunk

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

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


------------------------------------------------------------------------
r48130 | jake | 2013-03-05 23:19:59 -0800 (Tue, 05 Mar 2013) | 9 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-rtp.c

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

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

------------------------------------------------------------------------
r48131 | eapache | 2013-03-06 04:33:43 -0800 (Wed, 06 Mar 2013) | 4 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-frame.c

Manually backport more of r48011.

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

------------------------------------------------------------------------
r48139 | gerald | 2013-03-06 09:56:25 -0800 (Wed, 06 Mar 2013) | 17 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-ieee80211.c

Copy over r48062 from the trunk:

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

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