------------------------------------------------------------------------
r47357 | gerald | 2013-01-29 13:38:12 -0800 (Tue, 29 Jan 2013) | 2 lines
Changed paths:
   M /trunk-1.8/ChangeLog

Prep for 1.8.6.

------------------------------------------------------------------------
r47358 | gerald | 2013-01-29 13:38:39 -0800 (Tue, 29 Jan 2013) | 2 lines
Changed paths:
   M /trunk-1.8/tools/git-compare-abis.sh

Add a check for BSD systems.

------------------------------------------------------------------------
r47361 | gerald | 2013-01-29 14:22:47 -0800 (Tue, 29 Jan 2013) | 2 lines
Changed paths:
   M /trunk-1.8/tools/git-compare-abis.sh

Use a sysctl that works on more OSes.

------------------------------------------------------------------------
r47381 | eapache | 2013-01-30 16:40:59 -0800 (Wed, 30 Jan 2013) | 3 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-tcp.c

Manually rediscover r43185 to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8274

------------------------------------------------------------------------
r47443 | pascal | 2013-02-02 03:29:28 -0800 (Sat, 02 Feb 2013) | 16 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-per.c
   M /trunk-1.8/epan/dissectors/packet-rsl.c

Copy over from trunk:
------------------------------------------------------------------------
r47401 | pascal | 2013-01-31 23:34:12 +0100 (Thu, 31 Jan 2013) | 3 lines

Fix dissection of SI6 when carried in a SACCH Info Modify message
Issue reported by damker: http://www.wireshark.org/lists/wireshark-users/201301/msg00067.html

------------------------------------------------------------------------
r47433 | pascal | 2013-02-01 23:44:14 +0100 (Fri, 01 Feb 2013) | 3 lines

Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8290 :
Allow up to 64 OPTIONAL / DEFAULT components per SEQUENCE

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


------------------------------------------------------------------------
r47452 | gerald | 2013-02-03 07:33:42 -0800 (Sun, 03 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.8/epan/enterprise-numbers
   M /trunk-1.8/manuf
   M /trunk-1.8/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-03]
------------------------------------------------------------------------
r47478 | pascal | 2013-02-04 13:33:12 -0800 (Mon, 04 Feb 2013) | 3 lines
Changed paths:
   M /trunk-1.8/ui/gtk/main_menubar.c

Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8297 :
Fix typo errors for 'apply as filter->selected' and 'apply as filter->not selected' menu items

------------------------------------------------------------------------
r47498 | wmeier | 2013-02-05 07:16:15 -0800 (Tue, 05 Feb 2013) | 15 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-fmp_notify.c

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

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

------------------------------------------------------------------------
r47563 | eapache | 2013-02-08 05:41:14 -0800 (Fri, 08 Feb 2013) | 6 lines
Changed paths:
   M /trunk-1.8/epan/dfilter/dfilter-macro.c

Put the dfilter macro into a category. Work-around fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8073
that doesn't break API/ABI compatibility on the 1.8 series.

(Guy already fixed this in trunk in a much nicer fashion).

------------------------------------------------------------------------
r47603 | gerald | 2013-02-10 07:33:48 -0800 (Sun, 10 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.8/epan/enterprise-numbers
   M /trunk-1.8/manuf
   M /trunk-1.8/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-10]
------------------------------------------------------------------------
r47610 | wmeier | 2013-02-10 08:56:48 -0800 (Sun, 10 Feb 2013) | 11 lines
Changed paths:
   M /trunk-1.8/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

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

------------------------------------------------------------------------
r47668 | guy | 2013-02-14 17:39:58 -0800 (Thu, 14 Feb 2013) | 2 lines
Changed paths:
   M /trunk-1.8/epan/wslua/wslua_pinfo.c

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

------------------------------------------------------------------------
r47671 | guy | 2013-02-14 19:00:19 -0800 (Thu, 14 Feb 2013) | 17 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/epan/Makefile.am
   M /trunk-1.8/epan/dfilter/Makefile.am
   M /trunk-1.8/plugins/mate/Makefile.am

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
Changed paths:
   M /trunk-1.8/plugins/mate/Makefile.am

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
Changed paths:
   M /trunk-1.8/epan/Makefile.am

Get rid of a duplicate dependency.

------------------------------------------------------------------------
r47680 | guy | 2013-02-15 12:16:25 -0800 (Fri, 15 Feb 2013) | 2 lines
Changed paths:
   M /trunk-1.8/epan/dfilter/Makefile.am

Match the dependency structure of the top of the trunk.

------------------------------------------------------------------------
r47684 | guy | 2013-02-15 13:31:58 -0800 (Fri, 15 Feb 2013) | 2 lines
Changed paths:
   M /trunk-1.8/epan/dfilter/Makefile.nmake

Pick up one more dependency from the trunk.

------------------------------------------------------------------------
r47703 | gerald | 2013-02-17 07:33:41 -0800 (Sun, 17 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.8/epan/enterprise-numbers
   M /trunk-1.8/manuf
   M /trunk-1.8/services

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

Copy over from trunk that part relevant for 1.8.

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

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


------------------------------------------------------------------------
r47778 | eapache | 2013-02-20 13:26:27 -0800 (Wed, 20 Feb 2013) | 12 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-hartip.c

Backport with significant manual intervention:

------------------------------------------------------------------------
r47776 | eapache | 2013-02-20 15:49:36 -0500 (Wed, 20 Feb 2013) | 4 lines

From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8360

Bail out if length is less than the minimum required length.

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


------------------------------------------------------------------------
r47790 | cmaynard | 2013-02-20 19:57:38 -0800 (Wed, 20 Feb 2013) | 14 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-reload.c

Copy over from trunk.

  ------------------------------------------------------------------------
  r47789 | cmaynard | 2013-02-20 22:54:17 -0500 (Wed, 20 Feb 2013) | 6 lines

  Misc. fixes while looking at bug 8364 (which this patch does NOT address):
  1) hf_reload_dmflags is 8 bytes, not 64 bytes.
  2) Swap dissection order of dmflags and length.
  3) Register ett_reload_self_tuning_data and ett_reload_diagnosticrequest.
  #BACKPORT(1.8)
  
  ------------------------------------------------------------------------


------------------------------------------------------------------------
r47854 | gerald | 2013-02-24 07:33:54 -0800 (Sun, 24 Feb 2013) | 1 line
Changed paths:
   M /trunk-1.8/epan/enterprise-numbers
   M /trunk-1.8/manuf
   M /trunk-1.8/services

[Automatic manuf, services and enterprise-numbers update for 2013-02-24]
------------------------------------------------------------------------
r47888 | eapache | 2013-02-25 15:00:30 -0800 (Mon, 25 Feb 2013) | 18 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-csn1.c
   M /trunk-1.8/epan/dissectors/packet-csn1.h
   M /trunk-1.8/epan/dissectors/packet-gsm_rlcmac.c
   M /trunk-1.8/epan/dissectors/packet-gsm_rlcmac.h

Backport with non-trivial manual intervention to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8383

------------------------------------------------------------------------
r44899 | etxrab | 2012-09-14 10:05:50 -0400 (Fri, 14 Sep 2012) | 9 lines

From Mike Morrin:
Fix pedantic compiler warnings in csn.1 dissectors.

There is some tricky casting going on in csn.1 structures.  To eliminate all
the warnings, the function pointers needed to be moved out of the object
pointer unions.  Fortunately macros (mostly) hide these changes from the
protocol dissector tables.

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


------------------------------------------------------------------------
r47913 | etxrab | 2013-02-26 22:37:47 -0800 (Tue, 26 Feb 2013) | 6 lines
Changed paths:
   M /trunk-1.8/asn1/sabp/packet-sabp-template.c
   M /trunk-1.8/asn1/sabp/sabp.cnf
   M /trunk-1.8/epan/dissectors/packet-cell_broadcast.c
   M /trunk-1.8/epan/dissectors/packet-cell_broadcast.h
   M /trunk-1.8/epan/dissectors/packet-sabp.c

Revision 47273 - Remove non ASCII character
--------------------------------------------------------------------------------
Revision 47272 - Dissect Broadcast-Message-Content correctly.
--------------------------------------------------------------------------------
Copy over part of 
Revision 47177 - Dissect ETWS and CMAS notifications
------------------------------------------------------------------------
r47929 | eapache | 2013-02-27 18:23:04 -0800 (Wed, 27 Feb 2013) | 2 lines
Changed paths:
   M /trunk-1.8

Ignore cscope db (like ctags files).

------------------------------------------------------------------------
r47943 | morriss | 2013-02-28 08:57:23 -0800 (Thu, 28 Feb 2013) | 9 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-fcp.c

Copy over from trunk (in order to solve warnings introduced with r46464 and
backported to trunk-1.8 with r46672):

  ------------------------------------------------------------------------
  r46466 | eapache | 2012-12-07 22:04:55 -0500 (Fri, 07 Dec 2012) | 2 lines

  Fix some compiler warnings under gcc.


------------------------------------------------------------------------
r47981 | eapache | 2013-03-01 11:17:13 -0800 (Fri, 01 Mar 2013) | 10 lines
Changed paths:
   M /trunk-1.8/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.

------------------------------------------------------------------------
r48036 | gerald | 2013-03-03 07:33:48 -0800 (Sun, 03 Mar 2013) | 1 line
Changed paths:
   M /trunk-1.8/epan/enterprise-numbers
   M /trunk-1.8/manuf
   M /trunk-1.8/services

[Automatic manuf, services and enterprise-numbers update for 2013-03-03]
------------------------------------------------------------------------
r48073 | gerald | 2013-03-04 15:22:53 -0800 (Mon, 04 Mar 2013) | 2 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml

Update to match completed items on the roadmap.

------------------------------------------------------------------------
r48074 | gerald | 2013-03-04 15:54:48 -0800 (Mon, 04 Mar 2013) | 15 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-mpls-echo.c

Copy over r46391 by hand:

  ------------------------------------------------------------------------
  r46391 | etxrab | 2012-12-05 01:04:37 -0800 (Wed, 05 Dec 2012) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-mpls-echo.c

  From Martin Kaiser:
  Looking at RFC 6424, the whole approach is unclear to me. We seem to read subtlv_type and _length only once and then do the while loop. Section 3.3 of RFC6424 says that there's a list of subtlvs, I'd expect type and length to be read in the while loop...

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

Update the release notes.

------------------------------------------------------------------------
r48076 | gerald | 2013-03-04 17:04:00 -0800 (Mon, 04 Mar 2013) | 16 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-bacapp.c
   M /trunk-1.8/epan/dissectors/packet-ieee80211.c
   M /trunk-1.8/epan/dissectors/packet-ieee802154.c
   M /trunk-1.8/epan/dissectors/packet-rtps.c
   M /trunk-1.8/epan/dissectors/packet-rtps2.c
   M /trunk-1.8/epan/dissectors/packet-sll.c
   M /trunk-1.8/epan/dissectors/packet-sll.h
   M /trunk-1.8/ui/gtk/main.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.

------------------------------------------------------------------------
r48078 | gerald | 2013-03-04 17:11:22 -0800 (Mon, 04 Mar 2013) | 18 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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.

------------------------------------------------------------------------
r48080 | gerald | 2013-03-04 17:16:54 -0800 (Mon, 04 Mar 2013) | 23 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-bacapp.c
   M /trunk-1.8/ui/gtk/rtp_player.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r47674 | mmann | 2013-02-15 07:31:24 -0800 (Fri, 15 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/ui/gtk/rtp_player.c

  Fix Voice RTP player crash if player is closed while playing

  Bug 8065 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8065)
  ------------------------------------------------------------------------
  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.

------------------------------------------------------------------------
r48090 | gerald | 2013-03-05 11:14:31 -0800 (Tue, 05 Mar 2013) | 15 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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.

------------------------------------------------------------------------
r48092 | gerald | 2013-03-05 11:31:10 -0800 (Tue, 05 Mar 2013) | 17 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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.

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

Copy over r47708 from the trunk:

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

------------------------------------------------------------------------
r48100 | gerald | 2013-03-05 13:21:49 -0800 (Tue, 05 Mar 2013) | 23 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-rtp.c
   M /trunk-1.8/epan/dissectors/packet-ssl.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)
  ------------------------------------------------------------------------
  r47729 | jake | 2013-02-17 22:19:04 -0800 (Sun, 17 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-rtp.c

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


Update the release notes.

------------------------------------------------------------------------
r48101 | gerald | 2013-03-05 13:27:34 -0800 (Tue, 05 Mar 2013) | 17 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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.

------------------------------------------------------------------------
r48104 | gerald | 2013-03-05 13:35:18 -0800 (Tue, 05 Mar 2013) | 18 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-ieee80211.c

Copy over r47795 from the trunk:

  ------------------------------------------------------------------------
  r47795 | alagoutte | 2013-02-21 07:20:25 -0800 (Thu, 21 Feb 2013) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ieee80211.c

  From report of Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8345 Malformed IEEE80211 frame triggers DISSECTOR_ASSERT

  In some cases these malformed frames trigger a DISSECTOR_ASSERT() in proto.c's proto_item_set_len().  This happens when packet-ieee80211.c's dissect_ieee80211_mgt() calls packet-ieee80211.c's get_tagged_parameter_tree() with a "size" parameter value of -1.

  From me:
  Replace by proto_tree_add_item with -1 length (and use FT_NONE ftype)
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48107 | gerald | 2013-03-05 14:14:41 -0800 (Tue, 05 Mar 2013) | 28 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-reload.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r47805 | eapache | 2013-02-21 10:53:18 -0800 (Thu, 21 Feb 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-reload.c

  From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8364

  Pacify the fuzz-bots for now, though a better fix is needed.
  ------------------------------------------------------------------------


Copy over with manual intervention:
  ------------------------------------------------------------------------
  r47808 | eapache | 2013-02-21 13:18:46 -0800 (Thu, 21 Feb 2013) | 5 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-reload.c

  Fix some issues potentially similar in nature to the one found in
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8364

  There are probably some still left.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r48111 | gerald | 2013-03-05 14:34:53 -0800 (Tue, 05 Mar 2013) | 56 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/asn1/gsm_map/gsm_map.cnf
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-cisco-erspan.c
   M /trunk-1.8/epan/dissectors/packet-dcerpc-netlogon.c
   M /trunk-1.8/epan/dissectors/packet-fmtp.c
   M /trunk-1.8/epan/dissectors/packet-gsm_map.c
   M /trunk-1.8/epan/dissectors/packet-json.c
   M /trunk-1.8/epan/dissectors/packet-netflow.c
   M /trunk-1.8/epan/dissectors/packet-sip.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r47915 | mmann | 2013-02-27 08:08:48 -0800 (Wed, 27 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-fmtp.c

  Protocol is ENC_BIG_ENDIAN, adjust accordingly.

  Bug 8407 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8407)
  ------------------------------------------------------------------------
  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
  ------------------------------------------------------------------------
  r47965 | cmaynard | 2013-02-28 21:29:12 -0800 (Thu, 28 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-cisco-erspan.c

  Fix Coverity CID 280362: Logically dead code.
  #BACKPORT (1.8, 1.6)
  ------------------------------------------------------------------------
  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:

  ------------------------------------------------------------------------
  r47927 | pascal | 2013-02-27 15:08:17 -0800 (Wed, 27 Feb 2013) | 3 lines
  Changed paths:
     M /trunk/asn1/gsm_map/gsm_map.cnf
     M /trunk/epan/dissectors/packet-gsm_map.c

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


Update the release notes.

------------------------------------------------------------------------
r48112 | gerald | 2013-03-05 15:17:21 -0800 (Tue, 05 Mar 2013) | 48 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/dissectors/packet-dtls.c
   M /trunk-1.8/epan/exceptions.h
   M /trunk-1.8/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.

------------------------------------------------------------------------
r48114 | gerald | 2013-03-05 15:37:19 -0800 (Tue, 05 Mar 2013) | 11 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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)
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r48124 | eapache | 2013-03-05 16:53:55 -0800 (Tue, 05 Mar 2013) | 13 lines
Changed paths:
   M /trunk-1.8/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!

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


------------------------------------------------------------------------
r48126 | gerald | 2013-03-05 17:46:40 -0800 (Tue, 05 Mar 2013) | 14 lines
Changed paths:
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/epan/epan.c
   M /trunk-1.8/epan/wslua/wslua.h
   M /trunk-1.8/epan/wslua/wslua_field.c

Copy over r47877 by hand:

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

------------------------------------------------------------------------
r48132 | eapache | 2013-03-06 04:39:35 -0800 (Wed, 06 Mar 2013) | 4 lines
Changed paths:
   M /trunk-1.8/epan/dissectors/packet-frame.c

Manually backport more of r48011.

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

------------------------------------------------------------------------
r48138 | gerald | 2013-03-06 09:47:14 -0800 (Wed, 06 Mar 2013) | 16 lines
Changed paths:
   M /trunk-1.8
   M /trunk-1.8/docbook/release-notes.xml
   M /trunk-1.8/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.

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