------------------------------------------------------------------------
r46269 | gerald | 2012-11-28 15:09:48 -0800 (Wed, 28 Nov 2012) | 2 lines
Changed paths:
   M /trunk-1.6/Makefile.am

Fix the patch filename.

------------------------------------------------------------------------
r46319 | guy | 2012-12-01 14:45:25 -0800 (Sat, 01 Dec 2012) | 8 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/frame_data_sequence.c

Copy over r46315 from trunk:

  ------------------------------------------------------------------------
  r46315 | eapache | 2012-12-01 10:19:08 -0800 (Sat, 01 Dec 2012) | 3 lines

  Fix potential copy-and-pasto in free_frame_data_sequence that may or may not
  be the cause of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8022

------------------------------------------------------------------------
r46330 | gerald | 2012-12-02 08:04:23 -0800 (Sun, 02 Dec 2012) | 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 2012-12-02]
------------------------------------------------------------------------
r46353 | gerald | 2012-12-03 13:36:48 -0800 (Mon, 03 Dec 2012) | 1 line
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml

Use GENERIC-MAP-NOMATCH as a CVE placeholder.
------------------------------------------------------------------------
r46392 | guy | 2012-12-05 01:05:21 -0800 (Wed, 05 Dec 2012) | 19 lines
Changed paths:
   M /trunk-1.6/tools/make-manuf
   M /trunk-1.6/tools/make-services.pl
   M /trunk-1.6/tools/make-sminmpec.pl

Copy over revisions from trunk:

  ------------------------------------------------------------------------
  r42522 | gerald | 2012-05-09 12:17:48 -0700 (Wed, 09 May 2012) | 2 lines

  Send a useful User-Agent header.

  ------------------------------------------------------------------------
  r42363 | gerald | 2012-04-30 14:32:51 -0700 (Mon, 30 Apr 2012) | 4 lines

  Switch to UTF-8 for remote encodings to match what the IEEE SA is
  almost-but-not-quite sending. Add a link to a page with common character
  encoding errors.

  ------------------------------------------------------------------------
  r42349 | gerald | 2012-04-30 08:40:39 -0700 (Mon, 30 Apr 2012) | 2 lines

  Update the IEEE OUI and IAB URLs.

------------------------------------------------------------------------
r46393 | guy | 2012-12-05 01:06:34 -0800 (Wed, 05 Dec 2012) | 17 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/manuf
   M /trunk-1.6/wka.tmpl

Copy over rev 46386 from trunk:

  ------------------------------------------------------------------------
  r46386 | guy | 2012-12-04 19:45:11 -0800 (Tue, 04 Dec 2012) | 12 lines

  Broadcom "donated" one of their OUIs for use in Fibre Channel over
  Ethernet group MAC-48 addresses:

	http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf

  so we add entries for the three group addresses in question and an entry
  to cover all unassigned group addresses in that range.

  Regenerate manuf file.

  Fixes bug 8046.

------------------------------------------------------------------------
r46417 | morriss | 2012-12-05 18:11:59 -0800 (Wed, 05 Dec 2012) | 10 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-assa_r3.c

Copy over (with manual intervention):

  ------------------------------------------------------------------------
  r46415 | morriss | 2012-12-05 20:43:37 -0500 (Wed, 05 Dec 2012) | 5 lines

  Fix inifite loop in the R3 dissector reported in
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8040 :

  If the alarm length is 0, raise an expert_info and break out of the loop.

------------------------------------------------------------------------
r46422 | wmeier | 2012-12-06 07:30:39 -0800 (Thu, 06 Dec 2012) | 12 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-pw-eth.c

Copy over from trunk:

------------------------------------------------------------------------
r46420 | wmeier | 2012-12-06 10:15:05 -0500 (Thu, 06 Dec 2012) | 6 lines

Fix "MPLS payload starting with valid-looking ethernet address dissected twice".

Fixes Bug #8043
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8043

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

------------------------------------------------------------------------
r46425 | pascal | 2012-12-06 09:14:05 -0800 (Thu, 06 Dec 2012) | 9 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-bthci_cmd.c

Copy over from trunk with manual intervention:
------------------------------------------------------------------------
r46345 | pascal | 2012-12-03 15:44:12 +0100 (Mon, 03 Dec 2012) | 3 lines

Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8038 :
Prevent a counter overflow in while loops

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

------------------------------------------------------------------------
r46483 | gerald | 2012-12-09 08:04:16 -0800 (Sun, 09 Dec 2012) | 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 2012-12-09]
------------------------------------------------------------------------
r46563 | gerald | 2012-12-16 08:04:36 -0800 (Sun, 16 Dec 2012) | 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 2012-12-16]
------------------------------------------------------------------------
r46581 | morriss | 2012-12-17 18:28:55 -0800 (Mon, 17 Dec 2012) | 32 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-dtn.c

Copy over with manual intervention:

  ------------------------------------------------------------------------
  r46579 | morriss | 2012-12-17 21:20:38 -0500 (Mon, 17 Dec 2012) | 3 lines

  Get rid of another tvb_get_ptr() abuse (just like r46577 but in a different
  function).

  ------------------------------------------------------------------------
  r46577 | morriss | 2012-12-17 21:02:28 -0500 (Mon, 17 Dec 2012) | 20 lines

  Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7945 
  (or at least the complaints from Valgrind; I couldn't reproduce the crash).

  What part of:

  ~~~
   * If you're thinking of using tvb_get_ptr, STOP WHAT YOU ARE DOING
   * IMMEDIATELY. Go take a break. Consider that tvb_get_ptr hands you
   * a raw, unprotected pointer that you can easily use to create a
   * security vulnerability or otherwise crash Wireshark. Then consider
   * that you can probably find a function elsewhere in this file that
   * does exactly what you want in a much more safe and robust manner.
  ~~~

  did someone not read?

  Use tvb_get_ephemeral_stringz() instead of adding (apparently not sufficiently
  checked!) offsets to the result of tvb_get_ptr() and assuming that the result
  is a) in bounds and b) a NULL-terminated string.


------------------------------------------------------------------------
r46721 | gerald | 2012-12-23 08:04:14 -0800 (Sun, 23 Dec 2012) | 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 2012-12-23]
------------------------------------------------------------------------
r46726 | eapache | 2012-12-24 07:23:34 -0800 (Mon, 24 Dec 2012) | 13 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-clnp.c

Copy over from trunk:
------------------------------------------------------------------------
r45646 | martink | 2012-10-18 16:57:02 -0400 (Thu, 18 Oct 2012) | 6 lines

(try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871

increment offset to point to the first byte after the options
(the code used to set an absolute position, if that was 0, we were stuck
  in an endless loop)

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


------------------------------------------------------------------------
r46777 | guy | 2012-12-26 04:07:29 -0800 (Wed, 26 Dec 2012) | 8 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/wiretap/file_access.c

Copy over r46773 from trunk:

  ------------------------------------------------------------------------
  r46773 | guy | 2012-12-26 03:59:47 -0800 (Wed, 26 Dec 2012) | 3 lines

  On I/O errors when opening a file, use wtap_close() to clean up, to make
  sure we clean up everything.

------------------------------------------------------------------------
r46778 | guy | 2012-12-26 04:08:12 -0800 (Wed, 26 Dec 2012) | 9 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/wiretap/commview.c

Copy over r46774 from trunk:

  ------------------------------------------------------------------------
  r46774 | guy | 2012-12-26 04:01:14 -0800 (Wed, 26 Dec 2012) | 4 lines

  If the attempt to read the record header fails because we hit the EOF,
  treat that as "this isn't a CommView file" rather than "this is a bad
  file".

------------------------------------------------------------------------
r46797 | guy | 2012-12-26 14:22:48 -0800 (Wed, 26 Dec 2012) | 20 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-gsm_a_bssmap.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r46795 | guy | 2012-12-26 14:13:34 -0800 (Wed, 26 Dec 2012) | 2 lines

  Update a comment.
  ------------------------------------------------------------------------
  r46793 | guy | 2012-12-26 14:05:41 -0800 (Wed, 26 Dec 2012) | 2 lines

  Do array bounds checking.

  ------------------------------------------------------------------------
  r46747 | guy | 2012-12-25 15:14:05 -0800 (Tue, 25 Dec 2012) | 6 lines

  bssmap_msg_fcn[] is a dense array, not a sparse array, so *every* entry
  must be filled in - even if we don't happen to have dissectors for
  particular message types.  Just put NULL in there, so we don't index
  past the end of the array, grab a random location in memory's contents
  as a function pointer, and crash when we call through that pointer.

------------------------------------------------------------------------
r46813 | eapache | 2012-12-27 11:42:55 -0800 (Thu, 27 Dec 2012) | 14 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/tvbuff.c

Copy over from trunk:
------------------------------------------------------------------------
r46705 | martink | 2012-12-22 17:35:07 -0500 (Sat, 22 Dec 2012) | 8 lines

check the length parameter for tvb_get_unicode_string() and
tvb_get_ephemeral_unicode_string(), throw an exception for invalid
lengths (including -1, but length==-1 does not work for other tvb string
        functions either)

I believe this is the proper fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112

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

------------------------------------------------------------------------
r46841 | eapache | 2012-12-29 06:18:32 -0800 (Sat, 29 Dec 2012) | 13 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-dtls.c

Copy over from trunk to shut up the fuzzbot until we can agree on a proper fix
for bug #8111:
------------------------------------------------------------------------
r46739 | martink | 2012-12-25 13:44:14 -0500 (Tue, 25 Dec 2012) | 6 lines

set the dtls record length for reassembly _before_ adding a fragment

this is a workaround for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8111
it does not fully fix the underlying issue

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

------------------------------------------------------------------------
r46862 | gerald | 2012-12-30 08:04:07 -0800 (Sun, 30 Dec 2012) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf

[Automatic manuf, services and enterprise-numbers update for 2012-12-30]
------------------------------------------------------------------------
r46866 | guy | 2012-12-30 12:43:03 -0800 (Sun, 30 Dec 2012) | 11 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/doc/rawshark.pod

Copy over r46864 from trunk:

  ------------------------------------------------------------------------
  r46864 | guy | 2012-12-30 12:39:45 -0800 (Sun, 30 Dec 2012) | 6 lines

  Fix description of -p input - show the packet data the same way it's
  shown for the previous input format (showing "data" as a pointer is a
  bit confusing, as it's just in-line data in the input), and give a more
  detailed description of the issues with that file format (the size of
  the seconds field of the time stamp is platform-dependent).

------------------------------------------------------------------------
r46884 | pascal | 2013-01-01 07:02:41 -0800 (Tue, 01 Jan 2013) | 13 lines
Changed paths:
   M /trunk-1.6/version_info.c

Copy over from trunk:
------------------------------------------------------------------------
r46881 | pascal | 2013-01-01 15:20:17 +0100 (Tue, 01 Jan 2013) | 2 lines

Add detection of Windows 8 and Windows Server 2012

------------------------------------------------------------------------
r46882 | pascal | 2013-01-01 15:20:49 +0100 (Tue, 01 Jan 2013) | 2 lines

Welcome in 2013

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

------------------------------------------------------------------------
r46973 | gerald | 2013-01-06 08:04:36 -0800 (Sun, 06 Jan 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-01-06]
------------------------------------------------------------------------
r47050 | gerald | 2013-01-13 08:04:40 -0800 (Sun, 13 Jan 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-01-13]
------------------------------------------------------------------------
r47056 | eapache | 2013-01-13 18:25:16 -0800 (Sun, 13 Jan 2013) | 9 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/plugins/docsis/packet-cmstatus.c

Copy over from trunk:
------------------------------------------------------------------------
r47045 | mmann | 2013-01-12 21:03:55 -0500 (Sat, 12 Jan 2013) | 3 lines

guint16 needed to prevent rollover.  Bug 8199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8199)

#BACKPORT
------------------------------------------------------------------------

------------------------------------------------------------------------
r47057 | eapache | 2013-01-13 18:26:25 -0800 (Sun, 13 Jan 2013) | 7 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-rtps.c

Copy over from trunk:
------------------------------------------------------------------------
r47046 | mmann | 2013-01-12 21:58:42 -0500 (Sat, 12 Jan 2013) | 1 line

bugfix nested loop that wasn't breaking out of the main loop when subloop really wanted it to.  Bug 8198 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8198)
------------------------------------------------------------------------

------------------------------------------------------------------------
r47080 | jake | 2013-01-14 13:37:47 -0800 (Mon, 14 Jan 2013) | 3 lines
Changed paths:
   M /trunk-1.6/debian/control
   M /trunk-1.6/debian/patches/03_preferences.dpatch
   M /trunk-1.6/debian/wireshark-common.files
   M /trunk-1.6/debian/wireshark-common.manpages

Bring preference patch up to date.
Add missing files to package.
Allow more recent automake.
------------------------------------------------------------------------
r47176 | gerald | 2013-01-20 08:04:51 -0800 (Sun, 20 Jan 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-01-20]
------------------------------------------------------------------------
r47246 | morriss | 2013-01-23 19:40:21 -0800 (Wed, 23 Jan 2013) | 24 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-dcp-etsi.c

Copy over from trunk:

    ------------------------------------------------------------------------
    r47125 | martink | 2013-01-16 16:57:34 -0500 (Wed, 16 Jan 2013) | 2 lines

    no need for if (tree)

    ------------------------------------------------------------------------
    r47123 | martink | 2013-01-16 16:51:16 -0500 (Wed, 16 Jan 2013) | 5 lines

    don't attempt reassembly if more than 1000 consecutive fragments are
    missing

    this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8222

    ------------------------------------------------------------------------
    r47098 | eapache | 2013-01-15 11:51:55 -0500 (Tue, 15 Jan 2013) | 5 lines

    Don't run past the end of a fragment array, either in the loop or by putting a
    useless sentinel in.

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


------------------------------------------------------------------------
r47288 | gerald | 2013-01-25 15:38:34 -0800 (Fri, 25 Jan 2013) | 11 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-slowprotocols.c

Copy over r46336 from the trunk:

  ------------------------------------------------------------------------
  r46336 | pascal | 2012-12-02 14:19:37 -0800 (Sun, 02 Dec 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-slowprotocols.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8036 :
  Check length of Slow Protocol OAM Vendor Specific Event Notification and add an expert info if it is not at least 2 bytes long
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r47289 | gerald | 2013-01-25 16:36:00 -0800 (Fri, 25 Jan 2013) | 27 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-dtls.c
   M /trunk-1.6/epan/reassemble.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r46999 | martink | 2013-01-08 14:18:52 -0800 (Tue, 08 Jan 2013) | 9 lines
  Changed paths:
     M /trunk/epan/reassemble.c

  From Evan:
  sanity checks before setting a packet's total length in
  fragment_set_tot_len()

  (from me: check if fragments exist for the given id)

  hopefully, this fixes #8111 and #8163 without causing troubles for other
  protocols that use fragmentation and reassembly
  ------------------------------------------------------------------------
  r47000 | martink | 2013-01-08 14:24:42 -0800 (Tue, 08 Jan 2013) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dtls.c

  revert r46739

  call fragment_add() before fragment_set_tot_len()
  (the latter has no effect if no fragments are present, so we don't set
   the total length correctly when it's in the first fragment)
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r47290 | gerald | 2013-01-25 16:52:37 -0800 (Fri, 25 Jan 2013) | 11 lines
Changed paths:
   M /trunk-1.6/epan/proto.c

Copy over r47114 by hand.

  ------------------------------------------------------------------------
  r47114 | eapache | 2013-01-16 06:14:05 -0800 (Wed, 16 Jan 2013) | 3 lines
  Changed paths:
     M /trunk/epan/proto.c

  Null the finfo pointer after we free it. Reduces (but does not completely fix)
  the errors from bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r47291 | gerald | 2013-01-25 17:02:31 -0800 (Fri, 25 Jan 2013) | 10 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/dissectors/packet-ntlmssp.c

Copy over r47248 from the trunk:

  ------------------------------------------------------------------------
  r47248 | rbalint | 2013-01-24 01:34:54 -0800 (Thu, 24 Jan 2013) | 1 line
  Changed paths:
     M /trunk/epan/dissectors/packet-ntlmssp.c

  Prevent copying longer than expected NTLM SSP key
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r47293 | gerald | 2013-01-25 17:16:32 -0800 (Fri, 25 Jan 2013) | 31 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-dis-pdus.c
   M /trunk-1.6/epan/dissectors/packet-isup.c
   M /trunk-1.6/epan/dissectors/packet-ssl.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r46334 | pascal | 2012-12-02 12:49:19 -0800 (Sun, 02 Dec 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-isup.c

  From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8035 :
  Wrong packet bytes are selected for ISUP CUG binary code
  ------------------------------------------------------------------------
  r46510 | eapache | 2012-12-11 16:02:34 -0800 (Tue, 11 Dec 2012) | 5 lines
  Changed paths:
     M /trunk
     M /trunk/epan/dissectors/packet-ssl.c

  Use the complete fragment length to reassembly SSL frames. The old method
  of picking them up one at a time failed on jumbo frames.

  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8075
  ------------------------------------------------------------------------
  r47132 | pascal | 2013-01-17 05:20:45 -0800 (Thu, 17 Jan 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dis-pdus.c

  From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8227 :
   Electromagnetic Emission Parser parses field Event Id as Entity Id
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r47316 | gerald | 2013-01-27 08:04:22 -0800 (Sun, 27 Jan 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-01-27]
------------------------------------------------------------------------
r47332 | gerald | 2013-01-28 14:34:37 -0800 (Mon, 28 Jan 2013) | 94 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/asn1/snmp/packet-snmp-template.c
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/docbook/wsug_src/WSUG_chapter_capture.xml
   M /trunk-1.6/epan/crypt/airpdcap.c
   M /trunk-1.6/epan/dissectors/packet-fcp.c
   M /trunk-1.6/epan/dissectors/packet-gtpv2.c
   M /trunk-1.6/epan/dissectors/packet-jxta.c
   M /trunk-1.6/epan/dissectors/packet-lapd.c
   M /trunk-1.6/epan/dissectors/packet-snmp.c
   M /trunk-1.6/gtk/main_proto_draw.c
   M /trunk-1.6/plugins/wimax/packet-wmx.c
   M /trunk-1.6/tempfile.c
   M /trunk-1.6/tempfile.h

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r47136 | jake | 2013-01-17 14:06:22 -0800 (Thu, 17 Jan 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-jxta.c

  Fix for bug 8212.
  Disable speed optimization which otherwise cause dissector asserts due to
  appending text and setting lengths.
  ------------------------------------------------------------------------
  r47144 | jake | 2013-01-17 22:22:01 -0800 (Thu, 17 Jan 2013) | 2 lines
  Changed paths:
     M /trunk/docbook/wsug_src/WSUG_chapter_capture.xml

  Replace SESSIONNAME with the use of an API call, just as in the code.
  ------------------------------------------------------------------------
  r47173 | grahamb | 2013-01-20 02:01:34 -0800 (Sun, 20 Jan 2013) | 1 line
  Changed paths:
     M /trunk/asn1/snmp/packet-snmp-template.c
     M /trunk/epan/dissectors/packet-snmp.c

  snmp dissector did not correctly set length of pdu's of more than 127 bytes.  The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
  ------------------------------------------------------------------------
  r47223 | jake | 2013-01-22 22:11:18 -0800 (Tue, 22 Jan 2013) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-lapd.c

  Fix for CID 280286:
  Take negative value into account, avoid all casting in the process.
  ------------------------------------------------------------------------
  r47294 | jake | 2013-01-26 03:34:55 -0800 (Sat, 26 Jan 2013) | 3 lines
  Changed paths:
     M /trunk/plugins/wimax/packet-wmx.c

  Fix for CID 280529 and 280530.
  Check the validity of the TLV before using its retreived data.
  ------------------------------------------------------------------------
  r47298 | cmaynard | 2013-01-26 07:41:16 -0800 (Sat, 26 Jan 2013) | 4 lines
  Changed paths:
     M /trunk/tempfile.c
     M /trunk/tempfile.h

  Replace disallowed filename characters to '-'.
  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7877
  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------
  r47300 | eapache | 2013-01-26 07:51:01 -0800 (Sat, 26 Jan 2013) | 2 lines
  Changed paths:
     M /trunk/tempfile.c
     M /trunk/tempfile.h

  The const was important, take a copy of the suffix to sanitize instead.
  ------------------------------------------------------------------------
  r47314 | mmann | 2013-01-27 07:28:55 -0800 (Sun, 27 Jan 2013) | 1 line
  Changed paths:
     M /trunk/epan/crypt/airpdcap.c

  Bugfix crash caused by AirPDcap decryption.  Bug 8177 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177)
  ------------------------------------------------------------------------
  r47328 | mmann | 2013-01-28 13:08:14 -0800 (Mon, 28 Jan 2013) | 2 lines
  Changed paths:
     M /trunk/asn1/snmp/packet-snmp-template.c
     M /trunk/epan/dissectors/packet-snmp.c

  Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
  Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)
  ------------------------------------------------------------------------



Copy over by hand:

  ------------------------------------------------------------------------
  r46556 | pascal | 2012-12-16 00:58:46 -0800 (Sun, 16 Dec 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-gtpv2.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
  Incorrect dissection of SAC and RAC in 3GPP ULI AVP
  ------------------------------------------------------------------------
  r47277 | cmaynard | 2013-01-25 11:01:57 -0800 (Fri, 25 Jan 2013) | 5 lines
  Changed paths:
     M /trunk/ui/gtk/packet_panes.c

  When searching for hex bytes from the "Find Packet" dialog, highlight the correct number of bytes.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085
  #BACKPORT
  1.8: ui/gtk/main_proto_draw.c:packet_hex_print()
  1.6: gtk/main_proto_draw.c:packet_hex_print()
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r47333 | gerald | 2013-01-28 14:43:29 -0800 (Mon, 28 Jan 2013) | 12 lines
Changed paths:
   M /trunk-1.6
   M /trunk-1.6/epan/Makefile.am
   M /trunk-1.6/wiretap/Makefile.am
   M /trunk-1.6/wsutil/Makefile.am

Copy over r47329 from the trunk:

  ------------------------------------------------------------------------
  r47329 | rbalint | 2013-01-28 13:45:44 -0800 (Mon, 28 Jan 2013) | 1 line
  Changed paths:
     M /trunk/epan/Makefile.am
     M /trunk/wiretap/Makefile.am
     M /trunk/wsutil/Makefile.am

  make dumpabi target build with multiple digits in library version numbers
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r47339 | gerald | 2013-01-28 17:08:08 -0800 (Mon, 28 Jan 2013) | 2 lines
Changed paths:
   M /trunk-1.6/epan/Makefile.am
   M /trunk-1.6/wiretap/Makefile.am
   M /trunk-1.6/wsutil/Makefile.am

Use readlink instead of ls.

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