------------------------------------------------------------------------
r34834 | gerald | 2010-11-10 09:26:38 -0800 (Wed, 10 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2010-11-10]
------------------------------------------------------------------------
r34871 | gerald | 2010-11-14 10:05:50 -0800 (Sun, 14 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-11-14]
------------------------------------------------------------------------
r34923 | etxrab | 2010-11-17 00:03:17 -0800 (Wed, 17 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/diameter/TGPPGmb.xml
   M /trunk-1.2/diameter/TGPPSh.xml
   M /trunk-1.2/diameter/dictionary.xml
   M /trunk-1.2/diameter/etsie2e4.xml
   M /trunk-1.2/diameter/gqpolicy.xml
   M /trunk-1.2/diameter/mobileipv4.xml
   M /trunk-1.2/diameter/mobileipv6.xml
   M /trunk-1.2/diameter/nasreq.xml

Update Diameter AVP:s
------------------------------------------------------------------------
r34936 | etxrab | 2010-11-17 14:00:15 -0800 (Wed, 17 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/diameter/dictionary.xml
   M /trunk-1.2/diameter/nasreq.xml

Update Diameter AVP:s
------------------------------------------------------------------------
r34940 | gerald | 2010-11-17 16:23:16 -0800 (Wed, 17 Nov 2010) | 21 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-bootp.c
   M /trunk-1.2/epan/packet.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r30119 | wmeier | 2009-09-24 12:01:42 -0700 (Thu, 24 Sep 2009) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-bootp.c

Add what appear to be missing breaks in two cases of a switch () {...}.
------------------------------------------------------------------------
r30158 | guy | 2009-09-25 14:29:36 -0700 (Fri, 25 Sep 2009) | 5 lines
Changed paths:
   M /trunk/epan/packet.c

The data sources can be used even if the protocol tree isn't being built
or isn't visible.

Clean up some indentation.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r34941 | gerald | 2010-11-17 16:27:49 -0800 (Wed, 17 Nov 2010) | 14 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-ldss.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34581 | morriss | 2010-10-19 18:49:32 -0700 (Tue, 19 Oct 2010) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ldss.c

Fix SE memory corruption reported in  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5318 :

Ensure the digest is smaller than our buffer before copying it.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r34942 | gerald | 2010-11-17 17:06:19 -0800 (Wed, 17 Nov 2010) | 41 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-nbns.c
   M /trunk-1.2/epan/libwireshark.def
   M /trunk-1.2/epan/nstime.c
   M /trunk-1.2/epan/nstime.h
   M /trunk-1.2/gtk/file_dlg_win32.c
   M /trunk-1.2/gtk/io_stat.c
   M /trunk-1.2/gtk/sctp_graph_dlg.c
   M /trunk-1.2/gtk/uat_gui.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34661 | stig | 2010-10-27 00:45:31 -0700 (Wed, 27 Oct 2010) | 4 lines
Changed paths:
   M /trunk/gtk/io_stat.c

Calculate correct io->start_time.

This fixes bug 5340.
------------------------------------------------------------------------
r34709 | stig | 2010-10-30 04:43:11 -0700 (Sat, 30 Oct 2010) | 3 lines
Changed paths:
   M /trunk/gtk/uat_gui.c

Redissect packets instead of reload file on UAT changes.
This way we can do changes while capturing.
------------------------------------------------------------------------
r34823 | tuexen | 2010-11-09 08:29:15 -0800 (Tue, 09 Nov 2010) | 4 lines
Changed paths:
   M /trunk/gtk/sctp_graph_dlg.c

Bugfix from Irene Ruengeler to improve the TSN plot for SCTP
when large gap reports are present.
------------------------------------------------------------------------


Copy over with manual intervention:

------------------------------------------------------------------------
r34660 | stig | 2010-10-27 00:44:26 -0700 (Wed, 27 Oct 2010) | 2 lines
Changed paths:
   M /trunk/epan/libwireshark.def
   M /trunk/epan/nstime.c
   M /trunk/epan/nstime.h

Added two new functions: nstime_diff() and nstime_subtract().
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r34950 | gerald | 2010-11-18 10:17:26 -0800 (Thu, 18 Nov 2010) | 11 lines
Changed paths:
   M /trunk-1.2/packaging/macosx/osx-app.sh

Copy over r34583 from the trunk:

------------------------------------------------------------------------
r34583 | stig | 2010-10-20 03:37:11 -0700 (Wed, 20 Oct 2010) | 2 lines
Changed paths:
   M /trunk/packaging/macosx/osx-app.sh

Copy GDK pixbuf loaders libs to the Wireshark.app.
------------------------------------------------------------------------


------------------------------------------------------------------------
r34951 | gerald | 2010-11-18 10:18:02 -0800 (Thu, 18 Nov 2010) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml

Update the release notes / NEWS and ChangeLog.

------------------------------------------------------------------------
r34953 | gerald | 2010-11-18 10:19:26 -0800 (Thu, 18 Nov 2010) | 2 lines
Changed paths:
   M /trunk-1.2/version.conf

Build 1.2.13.

------------------------------------------------------------------------
r34958 | gerald | 2010-11-18 13:16:49 -0800 (Thu, 18 Nov 2010) | 2 lines
Changed paths:
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml

Fix version info.

------------------------------------------------------------------------
r34960 | gerald | 2010-11-18 13:21:10 -0800 (Thu, 18 Nov 2010) | 2 lines
Changed paths:
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml

More release note fixes.

------------------------------------------------------------------------
r34980 | gerald | 2010-11-19 11:47:01 -0800 (Fri, 19 Nov 2010) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.13 → 1.2.14.

------------------------------------------------------------------------
r34994 | gerald | 2010-11-21 10:05:07 -0800 (Sun, 21 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-11-21]
------------------------------------------------------------------------
r35053 | gerald | 2010-11-28 10:05:13 -0800 (Sun, 28 Nov 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-11-28]
------------------------------------------------------------------------
r35124 | gerald | 2010-12-05 11:33:48 -0800 (Sun, 05 Dec 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-12-05]
------------------------------------------------------------------------
r35157 | gerald | 1998-09-15 19:39:18 -0700 (Tue, 15 Sep 1998) | 2 lines
Changed paths:
   M /trunk-1.2/epan/dissectors/packet-gsm_a_rr.c
   M /trunk-1.2/epan/tvbuff.c
   M /trunk-1.2/epan/tvbuff.h

Initial import.  Ethereal version: 0.3.15.

------------------------------------------------------------------------
r35158 | etxrab | 2010-12-08 12:14:57 -0800 (Wed, 08 Dec 2010) | 2 lines
Changed paths:
   M /trunk-1.2/epan/dissectors/packet-cups.c
   M /trunk-1.2/epan/dissectors/packet-sdp.c
   M /trunk-1.2/epan/dissectors/packet-sip.c
   M /trunk-1.2/epan/tvbuff.c

Copy over r32144 from trunk
Make tvb_pbrk_guint8() return the found nedle
------------------------------------------------------------------------
r35159 | etxrab | 2010-12-08 14:48:31 -0800 (Wed, 08 Dec 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/tvbuff.h

Remove a patch not due yet.
------------------------------------------------------------------------
r35161 | etxrab | 2010-12-09 06:29:39 -0800 (Thu, 09 Dec 2010) | 9 lines
Changed paths:
   M /trunk-1.2/epan/addr_resolv.c
   M /trunk-1.2/epan/addr_resolv.h
   M /trunk-1.2/epan/to_str.c
   M /trunk-1.2/epan/to_str.h

Copy over:
r 28842 Unsigned does not have msign.
r 29130 Optimize column fill path.
r 29133 Fix an ep buffer overrun introduced in r29130.
r 29146 Fix regressions in r29130 and r29133
In r29130 formating for DSECS was changed. (old: %01d now: %02d)
In r29133 adding sign was removed (old: buf[0] = '-' now: buf[0] = '\0')

Manly to make future bug fixing easier.
------------------------------------------------------------------------
r35168 | etxrab | 2010-12-10 04:13:53 -0800 (Fri, 10 Dec 2010) | 4 lines
Changed paths:
   M /trunk-1.2/asn1/ansi-tcap/packet-ansi_tcap-template.c
   M /trunk-1.2/asn1/ansi_map/packet-ansi_map-template.c
   M /trunk-1.2/asn1/h245/packet-h245-template.c
   M /trunk-1.2/epan/addr_resolv.c
   M /trunk-1.2/epan/addr_resolv.h
   M /trunk-1.2/epan/dissectors/packet-acn.c
   M /trunk-1.2/epan/dissectors/packet-ansi_map.c
   M /trunk-1.2/epan/dissectors/packet-ansi_tcap.c
   M /trunk-1.2/epan/dissectors/packet-dtls.c
   M /trunk-1.2/epan/dissectors/packet-h245.c
   M /trunk-1.2/epan/dissectors/packet-http.c
   M /trunk-1.2/epan/dissectors/packet-iax2.c
   M /trunk-1.2/epan/dissectors/packet-ieee802154.c
   M /trunk-1.2/epan/dissectors/packet-ipx.c
   M /trunk-1.2/epan/dissectors/packet-jxta.c
   M /trunk-1.2/epan/dissectors/packet-pagp.c
   M /trunk-1.2/epan/dissectors/packet-rtcp.c
   M /trunk-1.2/epan/dissectors/packet-rtp.c
   M /trunk-1.2/epan/dissectors/packet-sccp.c
   M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
   M /trunk-1.2/epan/dissectors/packet-ssl-utils.h
   M /trunk-1.2/epan/dissectors/packet-ssl.c
   M /trunk-1.2/epan/dissectors/packet-tacacs.c
   M /trunk-1.2/epan/gcp.c
   M /trunk-1.2/epan/libwireshark.def
   M /trunk-1.2/epan/tcap-persistentdata.c
   M /trunk-1.2/epan/to_str.c
   M /trunk-1.2/epan/to_str.h
   M /trunk-1.2/gtk/compare_stat.c
   M /trunk-1.2/gtk/conversations_table.c
   M /trunk-1.2/gtk/hostlist_table.c
   M /trunk-1.2/gtk/mcast_stream_dlg.c
   M /trunk-1.2/gtk/rtp_stream_dlg.c
   M /trunk-1.2/gtk/sctp_chunk_stat.c
   M /trunk-1.2/gtk/tcp_graph.c
   M /trunk-1.2/gtk/wlan_stat_dlg.c
   M /trunk-1.2/plugins/stats_tree/pinfo_stats_tree.c
   M /trunk-1.2/tap-iousers.c
   M /trunk-1.2/tap-sctpchunkstat.c

Copy over:
r 29747 Rename address_to_str() to ep_address_to_str().

Manly to make future bug fixing easier.
------------------------------------------------------------------------
r35174 | etxrab | 2010-12-10 07:56:20 -0800 (Fri, 10 Dec 2010) | 4 lines
Changed paths:
   M /trunk-1.2/epan/to_str.c

Copy over:
Revision 29753 Reorder file to group related functionality

Manly to make future bug fixing easier.
------------------------------------------------------------------------
r35180 | gerald | 2010-12-12 10:05:14 -0800 (Sun, 12 Dec 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-12-12]
------------------------------------------------------------------------
r35222 | gerald | 2010-12-19 10:04:53 -0800 (Sun, 19 Dec 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-12-19]
------------------------------------------------------------------------
r35265 | gerald | 2010-12-26 10:05:07 -0800 (Sun, 26 Dec 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2010-12-26]
------------------------------------------------------------------------
r35327 | gerald | 2011-01-02 10:05:06 -0800 (Sun, 02 Jan 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-01-02]
------------------------------------------------------------------------
r35437 | gerald | 2011-01-09 10:05:00 -0800 (Sun, 09 Jan 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-01-09]
------------------------------------------------------------------------
r35469 | gerald | 2011-01-10 16:27:42 -0800 (Mon, 10 Jan 2011) | 13 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-mac-lte.c

Copy over r35292 by hand.

------------------------------------------------------------------------
r35292 | gerald | 2010-12-28 12:47:48 -0800 (Tue, 28 Dec 2010) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-mac-lte.c

From non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
dissector.  From me: Add a define, ep_allocate the buffer.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r35470 | gerald | 2011-01-10 16:33:23 -0800 (Mon, 10 Jan 2011) | 13 lines
Changed paths:
   M /trunk-1.2/asn1/snmp/packet-snmp-template.c
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-snmp.c

Copy over r35298 by hand.

------------------------------------------------------------------------
r35298 | gerald | 2010-12-29 12:09:27 -0800 (Wed, 29 Dec 2010) | 2 lines
Changed paths:
   M /trunk/asn1/snmp/packet-snmp-template.c
   M /trunk/epan/dissectors/packet-snmp.c

Fix a buffer overflow in the engineId preferences. Fixes bug 5530.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r35471 | gerald | 2011-01-10 16:37:43 -0800 (Mon, 10 Jan 2011) | 17 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-enttec.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r35318 | gerald | 2010-12-31 14:24:06 -0800 (Fri, 31 Dec 2010) | 7 lines
Changed paths:
   M /trunk/epan/dissectors/packet-enttec.c

From FRAsse via bug 5539:

There's a buffer overflow in ENTTEC DMX Data RLE, leading to crashes and
potential code execution.

From me: ep_allocate our buffers.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r35473 | gerald | 2011-01-10 18:00:26 -0800 (Mon, 10 Jan 2011) | 131 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-amqp.c
   M /trunk-1.2/epan/dissectors/packet-ber.c
   M /trunk-1.2/epan/dissectors/packet-catapult-dct2000.c
   M /trunk-1.2/epan/dissectors/packet-dcerpc-samr.c
   M /trunk-1.2/epan/dissectors/packet-diameter.c
   M /trunk-1.2/epan/dissectors/packet-tcp.c
   M /trunk-1.2/epan/dissectors/pidl/samr.cnf
   M /trunk-1.2/epan/dissectors/pidl/samr.idl
   M /trunk-1.2/epan/ftypes/ftypes.h
   M /trunk-1.2/epan/reassemble.c
   M /trunk-1.2/gtk/gui_utils.c
   M /trunk-1.2/packaging/macosx/Info.plist.in
   M /trunk-1.2/plugins/unistim/packet-unistim.c
   M /trunk-1.2/version_info.c
   M /trunk-1.2/wiretap/vms.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34265 | sfisher | 2010-09-27 13:02:54 -0700 (Mon, 27 Sep 2010) | 1 line
Changed paths:
   M /trunk/gtk/gui_utils.c

Fix bug #553 by ensuring that the upper-left corner of Wireshark is within the viewable area of the monitor.
------------------------------------------------------------------------
r35154 | etxrab | 2010-12-08 00:26:40 -0800 (Wed, 08 Dec 2010) | 1 line
Changed paths:
   M /trunk/epan/reassemble.c

fragment_free_key to be used only if Glib >= 2.10
------------------------------------------------------------------------
r35156 | etxrab | 2010-12-08 03:25:22 -0800 (Wed, 08 Dec 2010) | 2 lines
Changed paths:
   M /trunk/epan/reassemble.c

Mark parameter as unused.
reassemble.c:220: warning: unused parameter 'key_arg'
------------------------------------------------------------------------
r35175 | wmeier | 2010-12-10 19:22:09 -0800 (Fri, 10 Dec 2010) | 4 lines
Changed paths:
   M /trunk/epan/reassemble.c

Fix bug #5477: fuzz-test failure found by using G_SLICE=debug-blocks.
Essentially: doing g_slice_free with the wrong 'type' for the data to be freed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5477
------------------------------------------------------------------------
r35228 | martinm | 2010-12-20 03:26:50 -0800 (Mon, 20 Dec 2010) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-catapult-dct2000.c

From Papan Kumar Singh (bug 5504 & 5505):
Add missing break so that PDCP-LTE direction is set properly.
------------------------------------------------------------------------
r35313 | guy | 2010-12-30 16:02:54 -0800 (Thu, 30 Dec 2010) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-tcp.c

It's not a good idea to use tcph->th_seglen if you haven't set it.

Fixes bug 4211.
------------------------------------------------------------------------
r35322 | stig | 2011-01-01 04:23:21 -0800 (Sat, 01 Jan 2011) | 2 lines
Changed paths:
   M /trunk/packaging/macosx/Info.plist.in
   M /trunk/version_info.c

New Year.
------------------------------------------------------------------------
r35328 | guy | 2011-01-02 11:39:24 -0800 (Sun, 02 Jan 2011) | 2 lines
Changed paths:
   M /trunk/plugins/unistim/packet-unistim.c

Fix some cut-and-pasteos and other typoes.
------------------------------------------------------------------------


Copy over by hand:

------------------------------------------------------------------------
r35153 | etxrab | 2010-12-07 22:32:04 -0800 (Tue, 07 Dec 2010) | 2 lines
Changed paths:
   M /trunk/epan/reassemble.c

Reassemble.c leaks memory for GLIB > 2.8
Free fragment data and fragment keys in fragment_table when neccessary. reassembled_table remains to be fixed.
------------------------------------------------------------------------
r35155 | etxrab | 2010-12-08 01:12:03 -0800 (Wed, 08 Dec 2010) | 2 lines
Changed paths:
   M /trunk/epan/reassemble.c

reassemble.c: In function 'free_all_fragments':
reassemble.c:222: warning: unused variable 'key'
------------------------------------------------------------------------
r35176 | wmeier | 2010-12-10 20:11:31 -0800 (Fri, 10 Dec 2010) | 2 lines
Changed paths:
   M /trunk/epan/reassemble.c

Rework some comments.
------------------------------------------------------------------------
r35304 | guy | 2010-12-29 18:56:51 -0800 (Wed, 29 Dec 2010) | 9 lines
Changed paths:
   M /trunk/epan/dissectors/packet-dcerpc-samr.c
   M /trunk/epan/dissectors/pidl/samr.cnf
   M /trunk/epan/dissectors/pidl/samr.idl

The rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
an array of samr_RidWithAttributeArray structures.  Don't equate it to
hf_samr_rid; that causes hf_samr_rid to be added as an item with a
length of -1, but, as hf_samr_rid is an FT_UINT32 field, that causes a
dissector bug error.

The version of Yapp I was using, at least, didn't like C++-style
comments in the IDL file; replace them with C-style comments.
------------------------------------------------------------------------
r35330 | guy | 2011-01-02 13:27:57 -0800 (Sun, 02 Jan 2011) | 12 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ber.c

For those cases where we interpret the contents of an OCTET STRING,
which could be of arbitrary length - even if it's not supposed to be! -
as a value of some other type, by adding them as a registered field,
first check to make sure the length of the field is appropriate for the
type and, if not, show a dissection error, rather than showing a
dissector-bug assertion when we call proto_tree_add_item().

This fixes a bunch of dissector-bug assertions that show up with
malformed BER-encoded packets.

Also, fix a typo, and expand a comment.
------------------------------------------------------------------------
r35357 | guy | 2011-01-04 00:04:27 -0800 (Tue, 04 Jan 2011) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-amqp.c

Don't use DISSECTOR_ASSERT() to catch malformed packets.  Fixes bug
4048.
------------------------------------------------------------------------
r35369 | guy | 2011-01-04 22:11:10 -0800 (Tue, 04 Jan 2011) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-amqp.c

Put end-of-field-table checks back into dissect_amqp_field_table().
------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r35479 | gerald | 2011-01-11 09:16:06 -0800 (Tue, 11 Jan 2011) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/version.conf

Build 1.2.14.

------------------------------------------------------------------------
r35481 | gerald | 2011-01-11 10:02:47 -0800 (Tue, 11 Jan 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Fix a link.

------------------------------------------------------------------------
r35490 | gerald | 2011-01-11 15:01:44 -0800 (Tue, 11 Jan 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.14 → 1.2.15.

------------------------------------------------------------------------
r35492 | gerald | 2011-01-11 15:10:19 -0800 (Tue, 11 Jan 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Remove a link.

------------------------------------------------------------------------
r35554 | gerald | 2011-01-16 10:05:35 -0800 (Sun, 16 Jan 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-01-16]
------------------------------------------------------------------------
r35630 | gerald | 2011-01-23 10:05:33 -0800 (Sun, 23 Jan 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-01-23]
------------------------------------------------------------------------
r35636 | gerald | 2011-01-24 09:21:07 -0800 (Mon, 24 Jan 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Clear out old items.

------------------------------------------------------------------------
r35702 | gerald | 2011-01-30 10:06:58 -0800 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-01-30]
------------------------------------------------------------------------
r35793 | gerald | 2011-02-03 14:56:04 -0800 (Thu, 03 Feb 2011) | 16 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/tshark.c
   M /trunk-1.2/wiretap/pcapng.c

Copy over r35791 from the trunk.

------------------------------------------------------------------------
r35791 | gerald | 2011-02-03 14:50:49 -0800 (Thu, 03 Feb 2011) | 5 lines
Changed paths:
   M /trunk/tshark.c
   M /trunk/wiretap/pcapng.c

From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't
free uninitialized memory.

See also: bug 5652.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r35799 | morriss | 2011-02-03 18:16:49 -0800 (Thu, 03 Feb 2011) | 8 lines
Changed paths:
   M /trunk-1.2/wiretap/pcapng.c

Copy over revision from trunk:

------------------------------------------------------------------------
r35796 | morriss | 2011-02-03 21:08:47 -0500 (Thu, 03 Feb 2011) | 1 line

Use g_strdup() instead of strdup()


------------------------------------------------------------------------
r35801 | guy | 2011-02-03 18:27:00 -0800 (Thu, 03 Feb 2011) | 12 lines
Changed paths:
   M /trunk-1.2/wiretap/pcapng.c

Copy over revision from trunk:

------------------------------------------------------------------------
r35800 | guy | 2011-02-03 18:24:33 -0800 (Thu, 03 Feb 2011) | 7 lines

Put more data into the "additional error information" messages.

Get rid of debugging printouts that are equivalent to the "additional
error information" messages.

Return additional error info for all WTAP_ERR_BAD_RECORD errors.

------------------------------------------------------------------------
r35803 | guy | 2011-02-03 19:10:36 -0800 (Thu, 03 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/wiretap/pcapng.c

That fix didn't quite port over without change.

------------------------------------------------------------------------
r35811 | guy | 2011-02-04 02:19:01 -0800 (Fri, 04 Feb 2011) | 7 lines
Changed paths:
   M /trunk-1.2/wiretap/k12.c

Copy over revision from trunk:

------------------------------------------------------------------------
r35809 | guy | 2011-02-04 01:45:39 -0800 (Fri, 04 Feb 2011) | 2 lines

Set the error code and additional information string in more cases.

------------------------------------------------------------------------
r35827 | gerald | 2011-02-04 08:24:49 -0800 (Fri, 04 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Add a CVE ID.

------------------------------------------------------------------------
r35839 | gerald | 2011-02-06 10:05:30 -0800 (Sun, 06 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-02-06]
------------------------------------------------------------------------
r35858 | gerald | 2011-02-07 11:40:34 -0800 (Mon, 07 Feb 2011) | 5 lines
Changed paths:
   M /trunk-1.2/wiretap/pcapng.c

Check for a large packet_len. Fixes a bug reported by Huzaifa
Sidhpurwala of the Red Hat Security Response Team.

See also: bug 5661.

------------------------------------------------------------------------
r35860 | gerald | 2011-02-07 11:43:17 -0800 (Mon, 07 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Update the release notes.

------------------------------------------------------------------------
r35924 | gerald | 2011-02-11 16:06:23 -0800 (Fri, 11 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake

Check for Python 2.7.

------------------------------------------------------------------------
r35931 | gerald | 2011-02-12 09:57:11 -0800 (Sat, 12 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/packaging/portableapps/win32/makefile.nmake

Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.

------------------------------------------------------------------------
r35942 | gerald | 2011-02-13 10:05:31 -0800 (Sun, 13 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-02-13]
------------------------------------------------------------------------
r36015 | gerald | 2011-02-20 10:04:59 -0800 (Sun, 20 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-02-20]
------------------------------------------------------------------------
r36040 | etxrab | 2011-02-23 22:16:13 -0800 (Wed, 23 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/dissectors/packet-isup.c

Register the BICC dissector by name.
------------------------------------------------------------------------
r36044 | etxrab | 2011-02-23 22:24:50 -0800 (Wed, 23 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/diameter/dictionary.dtd
   M /trunk-1.2/diameter/dictionary.xml

Update Diameter files.
------------------------------------------------------------------------
r36051 | gerald | 2011-02-24 10:37:39 -0800 (Thu, 24 Feb 2011) | 12 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/wiretap/dct3trace.c

Copy over r35953 from the trunk:

------------------------------------------------------------------------
r35953 | gerald | 2011-02-15 16:42:06 -0800 (Tue, 15 Feb 2011) | 2 lines
Changed paths:
   M /trunk/wiretap/dct3trace.c

Fix a buffer overflow found by the Visual C++ analyzer.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36054 | gerald | 2011-02-24 12:07:23 -0800 (Thu, 24 Feb 2011) | 27 lines
Changed paths:
   M /trunk-1.2/asn1/ldap/packet-ldap-template.c
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-dns.c
   M /trunk-1.2/epan/dissectors/packet-dns.h
   M /trunk-1.2/epan/dissectors/packet-ldap.c
   M /trunk-1.2/epan/dissectors/packet-smb-common.c
   M /trunk-1.2/epan/dissectors/packet-smb-common.h
   M /trunk-1.2/epan/dissectors/packet-smb-logon.c

Copy over r36029 with manual assistance:

------------------------------------------------------------------------
r36029 | gerald | 2011-02-22 16:51:02 -0800 (Tue, 22 Feb 2011) | 9 lines
Changed paths:
   M /trunk/asn1/ldap/packet-ldap-template.c
   M /trunk/asn1/ldap/packet-ldap-template.h
   M /trunk/epan/dissectors/packet-dns.c
   M /trunk/epan/dissectors/packet-dns.h
   M /trunk/epan/dissectors/packet-ldap.c
   M /trunk/epan/dissectors/packet-ldap.h
   M /trunk/epan/dissectors/packet-smb-common.c
   M /trunk/epan/dissectors/packet-smb-common.h
   M /trunk/epan/dissectors/packet-smb-logon.c

Split get_dns_name() into get_dns_name() and expand_dns_name().

In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36062 | gerald | 2011-02-24 17:04:46 -0800 (Thu, 24 Feb 2011) | 42 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/gtk/capture_dlg.c
   M /trunk-1.2/tools/win32-setup.sh
   M /trunk-1.2/wiretap/lanalyzer.c

Copy over with manual intervention:

------------------------------------------------------------------------
r35633 | wmeier | 2011-01-23 12:59:12 -0800 (Sun, 23 Jan 2011) | 7 lines
Changed paths:
   M /trunk/gtk/capture_dlg.c

Fix a crash which can occur if a user hits "Capture:Options" immediately followed by "Capture:Start"

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

Essentially: The "Capture Start" code "interrupted" the "Capture Options" code and attempted
 to use not yet initialized "Capture Options" state.
------------------------------------------------------------------------
r35788 | wmeier | 2011-02-03 11:33:48 -0800 (Thu, 03 Feb 2011) | 12 lines
Changed paths:
   M /trunk/tools/win-setup.sh

Fix: Cygwin make fails after updating to bash v 4.1.9.2

Extracts from the cygwin Bash 4.1.9.2 release announcement:

4a. For a single affected script, add this line just after the she-bang:
 (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed

4e. bash-4.1.9-1 dropped support for 'shopt -s igncr';

I'm assuming this is backwards compatible; If not, we'll know quite shortly :) 
------------------------------------------------------------------------
r36061 | wmeier | 2011-02-24 16:40:22 -0800 (Thu, 24 Feb 2011) | 6 lines
Changed paths:
   M /trunk/wiretap/lanalyzer.c

From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698

(Note from me: Before the fix "File ! Save As" in Lanalyzer format
                crashed quite consistently on my Windows 7)
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36063 | gerald | 2011-02-24 17:08:12 -0800 (Thu, 24 Feb 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Add LANalyzer.

------------------------------------------------------------------------
r36082 | gerald | 2011-02-27 10:05:20 -0800 (Sun, 27 Feb 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-02-27]
------------------------------------------------------------------------
r36103 | gerald | 2011-02-28 17:09:32 -0800 (Mon, 28 Feb 2011) | 17 lines
Changed paths:
   M /trunk-1.2/asn1/ldap/ldap.cnf
   M /trunk-1.2/asn1/ldap/packet-ldap-template.c
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-ldap.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r36101 | gerald | 2011-02-28 16:50:17 -0800 (Mon, 28 Feb 2011) | 5 lines
Changed paths:
   M /trunk/asn1/ldap/ldap.cnf
   M /trunk/asn1/ldap/packet-ldap-template.c
   M /trunk/epan/dissectors/packet-ldap.c

If we encounter an excessively long filter string or one with too many
elements, add an expert item and throw a ReportedBoundsError. We may
want to handle this more cleanly in the future but this avoids
allocating a huge amount of memory.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36105 | gerald | 2011-02-28 17:14:28 -0800 (Mon, 28 Feb 2011) | 12 lines
Changed paths:
   M /trunk-1.2/epan/uat_load.l

Copy over r36096 from the trunk:

------------------------------------------------------------------------
r36096 | stig | 2011-02-28 08:11:20 -0800 (Mon, 28 Feb 2011) | 4 lines
Changed paths:
   M /trunk/epan/uat_load.l

Close UAT file after loading.

Open files may prevent deleting a used profile with UAT files.
------------------------------------------------------------------------

------------------------------------------------------------------------
r36111 | gerald | 2011-03-01 08:55:28 -0800 (Tue, 01 Mar 2011) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

Build 1.2.15.

------------------------------------------------------------------------
r36117 | gerald | 2011-03-01 14:23:15 -0800 (Tue, 01 Mar 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.14 → 1.2.15.

------------------------------------------------------------------------
r36146 | gerald | 2011-03-06 10:05:31 -0800 (Sun, 06 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-06]
------------------------------------------------------------------------
r36185 | gerald | 2011-03-13 10:05:27 -0700 (Sun, 13 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-13]
------------------------------------------------------------------------
r36218 | gerald | 2011-03-20 10:05:36 -0700 (Sun, 20 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-20]
------------------------------------------------------------------------
r36374 | gerald | 2011-03-27 10:05:13 -0700 (Sun, 27 Mar 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-03-27]
------------------------------------------------------------------------
r36439 | gerald | 2011-04-03 10:05:35 -0700 (Sun, 03 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-04-03]
------------------------------------------------------------------------
r36541 | gerald | 2011-04-10 10:05:22 -0700 (Sun, 10 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-04-10]
------------------------------------------------------------------------
r36574 | gerald | 2011-04-11 17:43:52 -0700 (Mon, 11 Apr 2011) | 46 lines
Changed paths:
   M /trunk-1.2/Makefile.nmake
   M /trunk-1.2/config.nmake
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
   M /trunk-1.2/epan/dissectors/packet-tcp.c
   M /trunk-1.2/packaging/nsis/wireshark.nsi
   M /trunk-1.2/text2pcap.c
   M /trunk-1.2/tools/win32-setup.sh
   M /trunk-1.2/tools/win64-setup.sh
   M /trunk-1.2/wiretap/netscreen.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r36174 | wmeier | 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ssl-utils.c

Check that imported private key is RSA; Prevents a crash.

Fixes Bug #5662

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662
------------------------------------------------------------------------
r36232 | sake | 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) | 3 lines
Changed paths:
   M /trunk/wiretap/netscreen.c

Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off).
------------------------------------------------------------------------



Copy over with manual intervention:

------------------------------------------------------------------------
r36162 | sake | 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-tcp.c

Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
------------------------------------------------------------------------
r36190 | gerald | 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) | 2 lines
Changed paths:
   M /trunk/asn1/ldap/ldap.cnf
   M /trunk/epan/dissectors/packet-ldap.c

Properly initialize our filter counters.
------------------------------------------------------------------------
r36471 | tuexen | 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) | 3 lines
Changed paths:
   M /trunk/text2pcap.c

Fix a typo in the help message.
Reported by Matthias Wellmeyer.
------------------------------------------------------------------------

------------------------------------------------------------------------
r36613 | gerald | 2011-04-12 14:21:40 -0700 (Tue, 12 Apr 2011) | 18 lines
Changed paths:
   M /trunk-1.2/asn1/x509if/packet-x509if-template.c
   M /trunk-1.2/asn1/x509if/x509if.cnf
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-x509if.c

Copy over r36608 from the trunk:

------------------------------------------------------------------------
r36608 | gerald | 2011-04-12 13:39:48 -0700 (Tue, 12 Apr 2011) | 5 lines
Changed paths:
   M /trunk/asn1/x509if/packet-x509if-template.c
   M /trunk/asn1/x509if/x509if.cnf
   M /trunk/epan/dissectors/packet-x509if.c
   M /trunk/epan/dissectors/packet-x509if.h

Add x509if_frame_end() which is passed to register_frame_end_routine()
and which resets our global variables. Remove a boolean which was used
to track a char *; just check if the pointer is NULL instead. Fixes bugs
5754 and 5793, hopefully without breaking anything.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36647 | gerald | 2011-04-14 14:29:30 -0700 (Thu, 14 Apr 2011) | 20 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/gtk/export_object.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34805 | cmaynard | 2010-11-08 08:53:11 -0800 (Mon, 08 Nov 2010) | 4 lines
Changed paths:
   M /trunk/gtk/export_object.c

Allow objects to be saved that otherwise couldn't be due to invalid characters
in the filename, excessive filename lengths or duplicate filenames.  Fixes
bug 1671.
------------------------------------------------------------------------
r34808 | cmaynard | 2010-11-08 09:53:13 -0800 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/gtk/export_object.c

Make maxlen a gsize instead of a guint.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r36651 | gerald | 2011-04-15 10:24:43 -0700 (Fri, 15 Apr 2011) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/version.conf

Build 1.2.16.

------------------------------------------------------------------------
r36655 | gerald | 2011-04-15 15:14:51 -0700 (Fri, 15 Apr 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.16 → 1.2.17.

------------------------------------------------------------------------
r36679 | gerald | 2011-04-17 10:05:31 -0700 (Sun, 17 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-04-17]
------------------------------------------------------------------------
r36836 | gerald | 2011-04-24 10:05:18 -0700 (Sun, 24 Apr 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf, services and enterprise-numbers update for 2011-04-24]
------------------------------------------------------------------------
r36961 | gerald | 2011-05-01 10:05:35 -0700 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-05-01]
------------------------------------------------------------------------
r37019 | gerald | 2011-05-08 10:05:27 -0700 (Sun, 08 May 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-05-08]
------------------------------------------------------------------------
r37164 | gerald | 2011-05-15 11:06:24 -0700 (Sun, 15 May 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-05-15]
------------------------------------------------------------------------
r37213 | gerald | 2011-05-17 14:30:50 -0700 (Tue, 17 May 2011) | 69 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/diam_dict.l
   M /trunk-1.2/epan/dissectors/packet-dcm.c
   M /trunk-1.2/epan/tvbuff.c
   M /trunk-1.2/packaging/macosx/Info.plist.in
   M /trunk-1.2/wireshark.desktop
   M /trunk-1.2/wiretap/snoop.c
   M /trunk-1.2/wiretap/visual.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r36958 | gerald | 2011-04-30 10:43:05 -0700 (Sat, 30 Apr 2011) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dcm.c

  Check our PDU length. Fixes the infinite loop found in bug 5876.
  ------------------------------------------------------------------------
  r37011 | gerald | 2011-05-06 12:39:47 -0700 (Fri, 06 May 2011) | 7 lines
  Changed paths:
     M /trunk/epan/diam_dict.l

  Huzaifa Sidhpurwala of Red Hat Security Response Team discovered that we
  could dereferene a NULL pointer if we had a corrupted Diameter
  dictionary.

  Additionally, it was possible to push an invalid input buffer onto the
  include stack.
  ------------------------------------------------------------------------
  r37068 | gerald | 2011-05-11 15:36:59 -0700 (Wed, 11 May 2011) | 3 lines
  Changed paths:
     M /trunk/wiretap/snoop.c

  Check our original record length. Fixes a crash bug found by Huzaifa
  Sidhpurwala of the Red Hat Security Response Team.
  ------------------------------------------------------------------------
  r37115 | guy | 2011-05-12 23:23:58 -0700 (Thu, 12 May 2011) | 2 lines
  Changed paths:
     M /trunk/wireshark.desktop

  Pcap files now have an official MIME type.
  ------------------------------------------------------------------------
  r37081 | darkjames | 2011-05-12 09:31:42 -0700 (Thu, 12 May 2011) | 6 lines
  Changed paths:
     M /trunk/epan/tvbuff.c

  Fix double free.

  compr is also freed outside loop. So free it only when returning.

  Might be related with bug #5908, but I don't have access to that bug ;-)
  ------------------------------------------------------------------------
  r37128 | gerald | 2011-05-13 10:12:44 -0700 (Fri, 13 May 2011) | 3 lines
  Changed paths:
     M /trunk/wiretap/visual.c

  From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Fix an
  integer overflow in wiretap/visual.c.
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r37114 | guy | 2011-05-12 23:11:19 -0700 (Thu, 12 May 2011) | 2 lines
  Changed paths:
     M /trunk/packaging/macosx/Info.plist.in

  Pcap files now have an official MIME type.
  ------------------------------------------------------------------------
  r37116 | guy | 2011-05-12 23:55:11 -0700 (Thu, 12 May 2011) | 2 lines
  Changed paths:
     M /trunk/packaging/macosx/Info.plist.in
     M /trunk/wireshark.desktop

  That's *application*/vnd.tcpdump.pcap to you.
  ------------------------------------------------------------------------

------------------------------------------------------------------------
r37220 | gerald | 2011-05-17 15:54:17 -0700 (Tue, 17 May 2011) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Set the advisory link.

------------------------------------------------------------------------
r37349 | gerald | 2011-05-22 11:06:51 -0700 (Sun, 22 May 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-05-22]
------------------------------------------------------------------------
r37465 | gerald | 2011-05-29 11:06:41 -0700 (Sun, 29 May 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-05-29]
------------------------------------------------------------------------
r37481 | gerald | 2011-05-31 08:48:55 -0700 (Tue, 31 May 2011) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

Build 1.2.17.

------------------------------------------------------------------------
r37484 | gerald | 2011-05-31 09:37:53 -0700 (Tue, 31 May 2011) | 2 lines
Changed paths:
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml

Add some missing text.

------------------------------------------------------------------------
r37502 | gerald | 2011-05-31 16:14:05 -0700 (Tue, 31 May 2011) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.17 → 1.2.18.

------------------------------------------------------------------------
r37534 | gerald | 2011-06-03 15:57:29 -0700 (Fri, 03 Jun 2011) | 3 lines
Changed paths:
   M /trunk-1.2/Makefile.nmake
   M /trunk-1.2/config.nmake
   M /trunk-1.2/packaging/nsis/wireshark.nsi
   M /trunk-1.2/tools/win32-setup.sh

Revert back to GNUTLS 2.8.5-4.12 in order to fix Windows 2000
support. Make sure libintl-8.dll exists in order to prevent hijacking.

------------------------------------------------------------------------
r37535 | gerald | 2011-06-03 19:17:52 -0700 (Fri, 03 Jun 2011) | 4 lines
Changed paths:
   M /trunk-1.2/packaging/nsis/wireshark.nsi

Trying to create a copy of an existing file with "File /oname=..." causes
unhappiness in the lands of U3 and PortableApps. Simply copy libintl-8.dll
from the wireshark-gtk2 directory.

------------------------------------------------------------------------
r37552 | gerald | 2011-06-05 11:06:55 -0700 (Sun, 05 Jun 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-06-05]
------------------------------------------------------------------------
r37659 | gerald | 2011-06-12 11:06:03 -0700 (Sun, 12 Jun 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-06-12]
------------------------------------------------------------------------
r37715 | gerald | 2011-06-19 11:06:27 -0700 (Sun, 19 Jun 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-06-19]
------------------------------------------------------------------------
r37792 | gerald | 2011-06-26 11:06:29 -0700 (Sun, 26 Jun 2011) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2011-06-26]
------------------------------------------------------------------------
r37809 | gerald | 2011-06-27 15:43:24 -0700 (Mon, 27 Jun 2011) | 13 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/wiretap/ascend-scanner.l

Copy over r37625 from the trunk:

  ------------------------------------------------------------------------
  r37625 | gerald | 2011-06-08 13:58:44 -0700 (Wed, 08 Jun 2011) | 3 lines
  Changed paths:
     M /trunk/wiretap/ascend_scanner.l

  Limit the lengths of some of our patterns. Fixes an infinite loop found
  when trying to read a TPNCP data file.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r37810 | gerald | 2011-06-27 16:17:21 -0700 (Mon, 27 Jun 2011) | 96 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/proto.c
   M /trunk-1.2/epan/range.c
   M /trunk-1.2/epan/wslua/wslua_gui.c
   M /trunk-1.2/epan/wslua/wslua_proto.c
   M /trunk-1.2/epan/wslua/wslua_tvb.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r37236 | guy | 2011-05-18 00:20:45 -0700 (Wed, 18 May 2011) | 3 lines
  Changed paths:
     M /trunk/epan/proto.c

  You cannot just make the "len" field of a GByteArray larger, if there's
  no data to back that length; you can only make it smaller.
  ------------------------------------------------------------------------
  r37761 | stig | 2011-06-23 03:43:49 -0700 (Thu, 23 Jun 2011) | 5 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_tvb.c

  Rename Tvb_new_real to ByteArray_tvb, as it's a ByteArray function.
  Documentation is generated from code.

  This fixes bug 5199.
  ------------------------------------------------------------------------
  r37763 | stig | 2011-06-23 04:06:34 -0700 (Thu, 23 Jun 2011) | 4 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_tvb.c

  From Tony Trinh via bug 5960:
  Fix TvbRange:string() so that it returns a string that contains all bytes
  of the range, including zeroes (instead of being truncated at first zero).
  ------------------------------------------------------------------------
  r37783 | stig | 2011-06-25 07:58:06 -0700 (Sat, 25 Jun 2011) | 8 lines
  Changed paths:
     M /trunk/epan/proto.c

  Make guy's fix in revision 37236 actually work:
  "You cannot just make the "len" field of a GByteArray larger, if there's
  no data to back that length; you can only make it smaller."

  Two equal values are always equal!

  This fixes bug 5941.
  ------------------------------------------------------------------------
  r37785 | stig | 2011-06-25 08:24:55 -0700 (Sat, 25 Jun 2011) | 3 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_proto.c

  From Tony Trinh via bug 5894:
  Added argument validation to Pref.range.
  ------------------------------------------------------------------------
  r37786 | stig | 2011-06-25 08:42:41 -0700 (Sat, 25 Jun 2011) | 5 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_proto.c

  Remove "range" from Lua's Pref.range(), as this value shall be fetched from
  the "default".

  This fixes bug 5896.
  ------------------------------------------------------------------------


Copy over by hand:
  ------------------------------------------------------------------------
  r37760 | stig | 2011-06-23 03:28:53 -0700 (Thu, 23 Jun 2011) | 5 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_tvb.c

  Rename Tvb_tvb to TvbRange_tvb, as it's a TvbRange function.
  Documentation is generated from code.

  This fixes bug 5006.
  ------------------------------------------------------------------------
  r37784 | stig | 2011-06-25 08:21:17 -0700 (Sat, 25 Jun 2011) | 3 lines
  Changed paths:
     M /trunk/epan/range.c

  From Tony Trinh via bug 5895:
  Add sanity checks in range.c
  ------------------------------------------------------------------------
  r37787 | stig | 2011-06-25 12:39:16 -0700 (Sat, 25 Jun 2011) | 4 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_proto.c

  Added check for invalid chars in abbrev in ProtoField functions.

  This fixes bug 5569.
  ------------------------------------------------------------------------
  r37788 | stig | 2011-06-25 13:47:13 -0700 (Sat, 25 Jun 2011) | 6 lines
  Changed paths:
     M /trunk/epan/wslua/wslua_gui.c

  From Tony Trinh via bug 6018:
  Add NULL checks and fix typos in Lua error print-outs

  From me:
  Use the error message "GUI not available" when using GUI functions in tshark.
  ------------------------------------------------------------------------

Update the release notes.

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