------------------------------------------------------------------------
r24741 | gerald | 2008-03-27 16:25:48 -0700 (Thu, 27 Mar 2008) | 14 lines
Changed paths:
   M /trunk-1.0/NEWS
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-sccp.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r24740 | gerald | 2008-03-27 16:09:22 -0700 (Thu, 27 Mar 2008) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-sccp.c

Make sure we reset a pointer to ephemeral memory when we're done processing
our packet, otherwise someone might try to use it later on.

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

Update the release notes.

------------------------------------------------------------------------
r24744 | gerald | 2008-03-27 22:57:26 -0700 (Thu, 27 Mar 2008) | 11 lines
Changed paths:
   M /trunk-1.0/epan/dissectors/packet-sccp.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r24743 | gerald | 2008-03-27 22:56:02 -0700 (Thu, 27 Mar 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-sccp.c

Fix compilation under Windows.

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

------------------------------------------------------------------------
r24745 | gerald | 2008-03-28 08:32:15 -0700 (Fri, 28 Mar 2008) | 22 lines
Changed paths:
   M /trunk-1.0/editcap.c
   M /trunk-1.0/gtk/follow_stream.c
   M /trunk-1.0/gtk/follow_tcp.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r24727 | lego | 2008-03-25 14:07:52 -0700 (Tue, 25 Mar 2008) | 5 lines
Changed paths:
   M /trunk/editcap.c

Long time ago, I added these to troubleshoot a problem a user was seeing but I could not reproduce, as I had no feedback I forgot about removing these prints. 

This must be copied over to the release branch.

------------------------------------------------------------------------
r24742 | sfisher | 2008-03-27 21:42:29 -0700 (Thu, 27 Mar 2008) | 5 lines
Changed paths:
   M /trunk/gtk/follow_stream.c
   M /trunk/gtk/follow_tcp.c

Fix bug #2286: Folow TCP stream window [needs line wrapping turned back on]
wrapped lines

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

------------------------------------------------------------------------
r24750 | gerald | 2008-03-28 14:14:55 -0700 (Fri, 28 Mar 2008) | 30 lines
Changed paths:
   M /trunk-1.0/configure.in
   M /trunk-1.0/packaging/Makefile.am
   M /trunk-1.0/packaging/macosx/Read me first.rtf
   M /trunk-1.0/packaging/macosx/osx-dmg.sh

Copy over OS X packaging fixes from the trunk:

------------------------------------------------------------------------
r24747 | gerald | 2008-03-28 11:49:49 -0700 (Fri, 28 Mar 2008) | 2 lines
Changed paths:
   M /trunk/packaging/Makefile.am
   A /trunk/packaging/macosx/Makefile.am

Add the OS X packaging files to the distribution.

------------------------------------------------------------------------
r24748 | stig | 2008-03-28 12:37:53 -0700 (Fri, 28 Mar 2008) | 2 lines
Changed paths:
   M /trunk/configure.in

Add the OS X packaging Makefile to configure.

------------------------------------------------------------------------
r24749 | gerald | 2008-03-28 14:11:53 -0700 (Fri, 28 Mar 2008) | 3 lines
Changed paths:
   M /trunk/packaging/macosx/Makefile.am
   D /trunk/packaging/macosx/Read me first.rtf
   A /trunk/packaging/macosx/Read_me_first.rtf (from /trunk/packaging/macosx/Read me first.rtf:24748)
   M /trunk/packaging/macosx/osx-dmg.sh

Trying to feed file names with spaces to GNU make will just end in tears.
Don't do that.

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

------------------------------------------------------------------------
r24751 | gerald | 2008-03-28 15:00:04 -0700 (Fri, 28 Mar 2008) | 2 lines
Changed paths:
   A /trunk-1.0/packaging/macosx/Makefile.am
   D /trunk-1.0/packaging/macosx/Read me first.rtf
   A /trunk-1.0/packaging/macosx/Read_me_first.rtf (from /trunk-1.0/packaging/macosx/Read me first.rtf:24750)

Add and rename needed files.

------------------------------------------------------------------------
r24753 | gerald | 2008-03-28 17:55:52 -0700 (Fri, 28 Mar 2008) | 36 lines
Changed paths:
   M /trunk-1.0/configure.in
   M /trunk-1.0/packaging/Makefile.am
   M /trunk-1.0/packaging/macosx/Makefile.am

Copy over r24752 from the trunk:

------------------------------------------------------------------------
r24752 | gerald | 2008-03-28 17:54:58 -0700 (Fri, 28 Mar 2008) | 25 lines
Changed paths:
   M /trunk/configure.in
   M /trunk/packaging/Makefile.am
   M /trunk/packaging/macosx/Makefile.am

Remove most of the OS X packaging files from the distribution. The
files in Resources/themes/Clearlooks-Quicksilver-OSX overrun the
99-character file name length limitation imposed by the default tar
format (V7). We can fix this by

  - Feeding "tar-ustar" to AM_INIT_AUTOMAKE, which apparently means
    changing

AM_INIT_AUTOMAKE(wireshark, x.y.z)

    in configure.in to
  
AC_INIT(wireshark, x.y.z)
AM_INIT_AUTOMAKE(tar-ustar)

    Although the automake documentation recommends this, it means
    updating make-version.pl and possibly other scripts.

  - Shortening everything in the Clearlooks-Quicksilver-OSX path.

  - Skipping tar distributions altogether in favor of zip.

None of these fixes are trivial, and version 1.0 awaits. For now,
you'll have to build OS X packages from SVN.

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

------------------------------------------------------------------------
r24754 | gerald | 2008-03-29 10:17:18 -0700 (Sat, 29 Mar 2008) | 2 lines
Changed paths:
   M /trunk-1.0/version.conf

Build version 1.0. Commence with the verklemptitude.

------------------------------------------------------------------------
r25140 | gerald | 2008-04-21 14:31:41 -0700 (Mon, 21 Apr 2008) | 2 lines
Changed paths:
   M /trunk-1.0/config.nmake
   M /trunk-1.0/configure.in
   M /trunk-1.0/version.conf

Bump to version 1.0.1

------------------------------------------------------------------------
r25141 | gerald | 2008-04-21 14:31:54 -0700 (Mon, 21 Apr 2008) | 2 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml

Update the release notes.

------------------------------------------------------------------------
r25463 | gerald | 2008-06-16 16:29:12 -0700 (Mon, 16 Jun 2008) | 2 lines
Changed paths:
   M /trunk-1.0/Makefile.am
   M /trunk-1.0/asn1/ldap/packet-ldap-template.c
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-bootp.c
   M /trunk-1.0/epan/dissectors/packet-e212.c
   M /trunk-1.0/epan/dissectors/packet-ieee802154.c
   M /trunk-1.0/epan/dissectors/packet-ldap.c
   M /trunk-1.0/epan/dissectors/packet-tcp.c
   M /trunk-1.0/gtk/mcast_stream.c
   M /trunk-1.0/image/capinfos.rc.in
   M /trunk-1.0/image/dumpcap.rc.in
   M /trunk-1.0/image/editcap.rc.in
   M /trunk-1.0/image/libwireshark.rc.in
   M /trunk-1.0/image/mergecap.rc.in
   M /trunk-1.0/image/rawshark.rc.in
   M /trunk-1.0/image/text2pcap.rc.in
   M /trunk-1.0/image/tshark.rc.in
   M /trunk-1.0/image/wireshark.rc.in
   M /trunk-1.0/image/wiretap.rc.in
   M /trunk-1.0/packaging/svr4/mkpkg
   M /trunk-1.0/plugins/agentx/plugin.rc.in
   M /trunk-1.0/plugins/artnet/plugin.rc.in
   M /trunk-1.0/plugins/asn1/plugin.rc.in
   M /trunk-1.0/plugins/ciscosm/plugin.rc.in
   M /trunk-1.0/plugins/docsis/plugin.rc.in
   M /trunk-1.0/plugins/easy_codec/plugin.rc.in
   M /trunk-1.0/plugins/enttec/plugin.rc.in
   M /trunk-1.0/plugins/ethercat/plugin.rc.in
   M /trunk-1.0/plugins/gryphon/plugin.rc.in
   M /trunk-1.0/plugins/infiniband/plugin.rc.in
   M /trunk-1.0/plugins/irda/plugin.rc.in
   M /trunk-1.0/plugins/lwres/plugin.rc.in
   M /trunk-1.0/plugins/m2m/plugin.rc.in
   M /trunk-1.0/plugins/mate/plugin.rc.in
   M /trunk-1.0/plugins/opcua/plugin.rc.in
   M /trunk-1.0/plugins/opsi/plugin.rc.in
   M /trunk-1.0/plugins/pcli/plugin.rc.in
   M /trunk-1.0/plugins/profinet/plugin.rc.in
   M /trunk-1.0/plugins/rlm/plugin.rc.in
   M /trunk-1.0/plugins/rtnet/plugin.rc.in
   M /trunk-1.0/plugins/rudp/plugin.rc.in
   M /trunk-1.0/plugins/sbus/plugin.rc.in
   M /trunk-1.0/plugins/stats_tree/plugin.rc.in
   M /trunk-1.0/plugins/unistim/plugin.rc.in
   M /trunk-1.0/plugins/v5ua/plugin.rc.in
   M /trunk-1.0/plugins/wimax/plugin.rc.in
   M /trunk-1.0/plugins/wimaxasncp/plugin.rc.in
   M /trunk-1.0/util.c
   M /trunk-1.0/wiretap/catapult_dct2000.c

Copy over some pending revisions. Update the release notes.

------------------------------------------------------------------------
r25464 | gerald | 2008-06-16 16:59:40 -0700 (Mon, 16 Jun 2008) | 54 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-dplay.c
   M /trunk-1.0/epan/dissectors/packet-per.c
   M /trunk-1.0/epan/dissectors/packet-rtcp.c
   M /trunk-1.0/wiretap/erf.c

Copy over more revisions:

------------------------------------------------------------------------
r24874 | jake | 2008-04-09 23:47:31 -0700 (Wed, 09 Apr 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rtcp.c

Fix for bug 2440 and 2187:
Properly promote the result to a float by dividing by a float i.s.o. elaborate casts
------------------------------------------------------------------------
r24877 | stig | 2008-04-10 11:22:59 -0700 (Thu, 10 Apr 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rtcp.c

Added some casts from double to float.

------------------------------------------------------------------------
r24929 | sake | 2008-04-12 03:21:51 -0700 (Sat, 12 Apr 2008) | 6 lines
Changed paths:
   M /trunk/wiretap/erf.c

From Stephen Donnelly (bug 2359):

- add support for ERF files created with a snaplength
- tighten heuristics (rlen>=16, time_delta < 1 week)

------------------------------------------------------------------------
r24965 | jake | 2008-04-12 16:45:25 -0700 (Sat, 12 Apr 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-dplay.c

Fix for bug 2452:
Tighten heuristics on DirectPlay player to player messages, so that RTP isn't mistaken as such.
------------------------------------------------------------------------
r24992 | stig | 2008-04-13 09:42:41 -0700 (Sun, 13 Apr 2008) | 12 lines
Changed paths:
   M /trunk/epan/dissectors/packet-per.c

Fix the crash from bug 2432.  I don't really like that we use a new tvb
and a new data source for displaying unaligned octet strings, because the
user cannot easily see where in the data package the values are from.

Maybe we should implement a "Packet Bits" pane for bit protocols?
Or just an option to turn the Bytes pane to a Bits pane?

Another problem is that the generated pdml (from the bug report) does not
generate correct data for these fields, as the "pos" value is always zero
(because we use a new tvb with offset 0).  But I suppose it's difficult to
fix this with byte values...

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

Update the release notes.

------------------------------------------------------------------------
r25465 | gerald | 2008-06-17 10:10:51 -0700 (Tue, 17 Jun 2008) | 227 lines
Changed paths:
   M /trunk-1.0/config.h.win32
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dfilter/scanner.l
   M /trunk-1.0/epan/diam_dict.l
   M /trunk-1.0/epan/dissectors/packet-diameter_3gpp.c
   M /trunk-1.0/epan/dissectors/packet-kismet.c
   M /trunk-1.0/epan/dissectors/packet-mikey.c
   M /trunk-1.0/epan/dissectors/packet-pana.c
   M /trunk-1.0/epan/dissectors/packet-rpc.c
   M /trunk-1.0/epan/dissectors/packet-rtp.c
   M /trunk-1.0/epan/dissectors/packet-tpncp.c
   M /trunk-1.0/epan/dtd_parse.l
   M /trunk-1.0/epan/dtd_preparse.l
   M /trunk-1.0/epan/oids.c
   M /trunk-1.0/epan/radius_dict.l
   M /trunk-1.0/epan/uat_load.l
   M /trunk-1.0/manuf
   M /trunk-1.0/plugins/mate/mate_parser.l
   M /trunk-1.0/plugins/unistim/packet-unistim.c
   M /trunk-1.0/plugins/wimax/msg_reg_rsp.c
   M /trunk-1.0/plugins/wimaxasncp/wimaxasncp_dict.l
   M /trunk-1.0/text2pcap-scanner.l
   M /trunk-1.0/tools/lemon/lemonflex-tail.inc
   M /trunk-1.0/wiretap/ascend-scanner.l
   M /trunk-1.0/wiretap/k12text.l
   M /trunk-1.0/wka.tmpl

Copy over revisions from the trunk:

------------------------------------------------------------------------
r25014 | jake | 2008-04-13 23:43:42 -0700 (Sun, 13 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-diameter_3gpp.c

From Jim Young:
Within the packet-diameter_3gpp.c module, the call to proto_register_protocol()
comes AFTER the proto_register_field_array() call. 
While the delayed call to proto_register_protocol() does not appear to impair the use 
of the display filters, it DOES effect the generation of the wireshark-filter man page.
------------------------------------------------------------------------
r25015 | jake | 2008-04-14 00:16:37 -0700 (Mon, 14 Apr 2008) | 2 lines
Changed paths:
   M /trunk/manuf
   M /trunk/wka.tmpl

Fix for bug 2456:
IPv6 multicast MAC address incorrectly resolved to neighborhood discovery.
------------------------------------------------------------------------
r25039 | stig | 2008-04-14 23:57:56 -0700 (Mon, 14 Apr 2008) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-pana.c

Call DISSECTOR_ASSERT instead of g_assert in dissector code.

This fixes bug 2464.

------------------------------------------------------------------------
r25068 | guy | 2008-04-16 00:18:08 -0700 (Wed, 16 Apr 2008) | 14 lines
Changed paths:
   M /trunk/epan/dissectors/packet-pana.c

The right length to use when scanning all the data in a packet is the
*reported* length, so that if the packet was cut short by a snapshot
length, we get an exception because we run past the end, and the packet
is marked as having been cut short.

Do not use DISSECTOR_ASSERT() to check for the validity of packet data;
dissectors should try to handle even malformed packets, they shouldn't
report malformed packets as dissector bugs (if DISSECTOR_ASSERT(), that
is *ipso facto* evidence of a dissector bug, *even if the packet is
malformed*).

Update the offset when scanning the packet even if we *aren't* building
the protocol tree.

------------------------------------------------------------------------
r25040 | stig | 2008-04-14 23:58:37 -0700 (Mon, 14 Apr 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-kismet.c

Call DISSECTOR_ASSERT instead of g_assert in dissector code.

------------------------------------------------------------------------
r25069 | guy | 2008-04-16 00:23:56 -0700 (Wed, 16 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-kismet.c

tvb_get_ephemeral_string() is defined never to return null (currently,
it aborts - even if we don't make it abort, we should make it throw an
assertion, so we abort the dissection of the packet and let the user
know that we ran out of memory).

------------------------------------------------------------------------
r25055 | sake | 2008-04-15 14:12:38 -0700 (Tue, 15 Apr 2008) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rpc.c

From Didier (bug 1392):

Add port to conversation key so that RPC reassembly works when relative
sequence numbers are used.

------------------------------------------------------------------------
r25058 | sake | 2008-04-15 15:53:34 -0700 (Tue, 15 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rpc.c

Fix for the "Malformed packet: RPC" that is encountered in bug 1392:

Don't call a RPC subdissector if there is no more data in the packet.

------------------------------------------------------------------------
r25118 | jake | 2008-04-19 03:41:45 -0700 (Sat, 19 Apr 2008) | 2 lines
Changed paths:
   M /trunk/plugins/unistim/packet-unistim.c

Fix for bug 2475:
Add a preference to the UNISTIM dissector so that you can set the default port back to 5000, even though this conflicts with other dissectors.
------------------------------------------------------------------------
r25134 | etxrab | 2008-04-21 11:23:23 -0700 (Mon, 21 Apr 2008) | 3 lines
Changed paths:
   M /trunk/epan/oids.c

TimeStamp are derived from timeticks_type (See SNMPv2-TC).
Fixes Bug:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2442
------------------------------------------------------------------------
r25135 | etxrab | 2008-04-21 11:38:01 -0700 (Mon, 21 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/oids.c

TimeTicks ::= [APPLICATION 3] IMPLICIT INTEGER (0..4294967295)
  If the BER encoding should not have the top bit set as to not become a negative number
  the ber encoding may take 5 octets to encode.
Fixes BUG:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2253
------------------------------------------------------------------------
r25137 | stig | 2008-04-21 13:25:50 -0700 (Mon, 21 Apr 2008) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-tpncp.c

Add "tpncp." before all filter names so we don't crash with others.

This fixes solution 1 from bug 2402.

------------------------------------------------------------------------
r25146 | jake | 2008-04-21 23:36:15 -0700 (Mon, 21 Apr 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-mikey.c

Fix for bug 2481:
Remove debug code
------------------------------------------------------------------------
r25148 | etxrab | 2008-04-22 12:31:03 -0700 (Tue, 22 Apr 2008) | 16 lines
Changed paths:
   M /trunk/epan/oids.c

Fix Dissector bug, protocol SNMP: proto.c:932: failed assertion
From LEGO:
DISSECTOR_ASSERT_NOT_REACHED() is a Bug regardless, it is triggered because we
are proto_add_item()ing an FT_UINT32 of 5 bytes in length.

IF-MIB:ifInOctets is a Counter32 so the value should (and is) application
encoded using tag 41.

the value's value (!) is  H'00d49e69fa (D'3567151610).

the assertion is triggered because there's an error in oids.c:59 
where states the ft_type as being an FT_UINT32 with a length of 1 to 4 bytes,
It should be FT_UINT64 and the length from 1 to 5 bytes considering that
integers bigger than 2^31 will be ber encoded in 5 bytes.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2468
------------------------------------------------------------------------
r25150 | jake | 2008-04-22 23:51:15 -0700 (Tue, 22 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rtp.c

From Peter Fuller:
If a UDP packet is submitted to the RTP heuristic dissector with either odd src
or dst ports, the heuristic will correctly return FALSE.  However, that
interferes with the next few lines of code that can potentially treat version 0
RTP packets as either STUN or T38 depending on preference settings.
------------------------------------------------------------------------
r25168 | stig | 2008-04-24 14:51:14 -0700 (Thu, 24 Apr 2008) | 3 lines
Changed paths:
   M /trunk/plugins/wimax/msg_reg_rsp.c

From Mohan (bug 2501):
Add a missing break statement.

------------------------------------------------------------------------
r25170 | etxrab | 2008-04-24 23:42:37 -0700 (Thu, 24 Apr 2008) | 1 line
Changed paths:
   M /trunk/config.h.win32

Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
------------------------------------------------------------------------
r25172 | wmeier | 2008-04-25 10:24:29 -0700 (Fri, 25 Apr 2008) | 5 lines
Changed paths:
   M /trunk/tools/lemon/lemonflex-tail.inc

Bug 2493: Fix (Part 1): 
-TEXT_FUNC (const char *text) --> -TEXT_FUNC (char *text)
To prevent Windows compiler error when using flex 2.5.35.
(This also compiles OK for *NIX flex and for windows flex 2.5.4) 

------------------------------------------------------------------------
r25173 | wmeier | 2008-04-25 10:40:29 -0700 (Fri, 25 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dfilter/scanner.l
   M /trunk/epan/diam_dict.l
   M /trunk/epan/dtd_parse.l
   M /trunk/epan/dtd_preparse.l
   M /trunk/epan/radius_dict.l
   M /trunk/epan/uat_load.l
   M /trunk/plugins/mate/mate_parser.l
   M /trunk/plugins/wimaxasncp/wimaxasncp_dict.l
   M /trunk/text2pcap-scanner.l
   M /trunk/wiretap/ascend-scanner.l
   M /trunk/wiretap/k12text.l

 Bug 2493: Fix (Part 2): 
 To prevent Windows compiler errors when using flex 2.5.35.
 Fixes "missing unistd.h" and yywrap "mismatched parameter" warnings
 [Upcoming Part 3: ignore 'signed /unsigned mismatch' errors]

------------------------------------------------------------------------
r25174 | wmeier | 2008-04-25 11:26:54 -0700 (Fri, 25 Apr 2008) | 5 lines
Changed paths:
   M /trunk/epan/dfilter/scanner.l
   M /trunk/epan/dtd_preparse.l
   M /trunk/epan/radius_dict.l
   M /trunk/epan/uat_load.l
   M /trunk/plugins/mate/mate_parser.l
   M /trunk/text2pcap-scanner.l

 Bug 2493: Fix (Part 3 of 3): 
  To prevent Windows compiler errors when using flex 2.5.35.
  Ignore 'signed /unsigned mismatch' warnings

------------------------------------------------------------------------
r25184 | jake | 2008-04-27 04:10:57 -0700 (Sun, 27 Apr 2008) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rtp.c

From Alon Tal:
RTP header extensions that are longer than 4 bytes (rtp.ext.len > 1)
get dissected incorrectly. The first 4 bytes of the header extension are
repeated rtp.ext.len times, and the remaining bytes are ignored.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r25467 | gerald | 2008-06-17 12:09:35 -0700 (Tue, 17 Jun 2008) | 206 lines
Changed paths:
   M /trunk-1.0/Makefile.am
   M /trunk-1.0/capture.c
   M /trunk-1.0/debian/changelog
   M /trunk-1.0/debian/compat
   M /trunk-1.0/debian/control
   A /trunk-1.0/debian/headers-check.c
   M /trunk-1.0/debian/patches/00list
   D /trunk-1.0/debian/patches/01_idl2deb.dpatch
   D /trunk-1.0/debian/patches/02_asn2deb.dpatch
   M /trunk-1.0/debian/patches/03_preferences.dpatch
   D /trunk-1.0/debian/patches/04_drop-capabilities.dpatch
   D /trunk-1.0/debian/patches/05_plugin-libdir.dpatch
   D /trunk-1.0/debian/patches/06_giop-buffer.dpatch
   D /trunk-1.0/debian/patches/07_gcc4.dpatch
   D /trunk-1.0/debian/patches/08_wireshark-desktop-menu.dpatch
   D /trunk-1.0/debian/patches/09_idl2wrs.dpatch
   D /trunk-1.0/debian/patches/10_wireshark_gen.dpatch
   D /trunk-1.0/debian/prerm
   M /trunk-1.0/debian/rules
   M /trunk-1.0/debian/tshark.manpages
   M /trunk-1.0/debian/wireshark-common.files
   M /trunk-1.0/debian/wireshark-common.manpages
   A /trunk-1.0/debian/wireshark-common.shlibs
   M /trunk-1.0/debian/wireshark-dev.docs
   M /trunk-1.0/debian/wireshark-dev.files
   M /trunk-1.0/debian/wireshark-dev.header-files
   M /trunk-1.0/debian/wireshark-dev.manpages
   D /trunk-1.0/debian/wireshark-dev.postinst
   M /trunk-1.0/debian/wireshark-dev.prerm
   M /trunk-1.0/debian/wireshark-root.desktop
   A /trunk-1.0/debian/wireshark.desktop
   M /trunk-1.0/debian/wireshark.files
   M /trunk-1.0/debian/wireshark.manpages
   M /trunk-1.0/debian/wireshark.menu
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-bacapp.c
   M /trunk-1.0/epan/dissectors/packet-bvlc.c
   M /trunk-1.0/epan/dissectors/packet-e212.c
   M /trunk-1.0/epan/dissectors/packet-fcp.c
   M /trunk-1.0/epan/dissectors/packet-gsm_sms.c
   M /trunk-1.0/epan/dissectors/packet-h264.c
   M /trunk-1.0/epan/dissectors/packet-ifcp.c
   M /trunk-1.0/epan/etypes.h
   M /trunk-1.0/epan/t35.c
   M /trunk-1.0/gtk/capture_if_details_dlg.c
   M /trunk-1.0/gtk/expert_dlg.c
   M /trunk-1.0/gtk/packet_list.c
   M /trunk-1.0/gtk/proto_draw.c
   M /trunk-1.0/gtk/proto_draw.h
   M /trunk-1.0/gtk/range_utils.c
   M /trunk-1.0/gtk/recent.c
   M /trunk-1.0/gtk/recent.h
   M /trunk-1.0/gtk/rtp_analysis.c
   M /trunk-1.0/gtk/voip_calls_dlg.c
   M /trunk-1.0/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj
   M /trunk-1.0/print.c

Manually apply revisions from the trunk (gasp!):
------------------------------------------------------------------------
r25207 | stig | 2008-05-01 04:02:14 -0700 (Thu, 01 May 2008) | 6 lines
Changed paths:
   M /trunk/gtk/main_proto_draw.c

From Frederic Peters (bug 1735):
Force foreground when background is forced.

From me:
Do the same for expert info's.

------------------------------------------------------------------------
r25211 | stig | 2008-05-01 11:03:46 -0700 (Thu, 01 May 2008) | 2 lines
Changed paths:
   M /trunk/gtk/expert_dlg.c
   M /trunk/gtk/main_proto_draw.c
   M /trunk/gtk/main_proto_draw.h

Force foreground when background is forced in expert info dialogs.

------------------------------------------------------------------------
r25212 | stig | 2008-05-01 11:26:01 -0700 (Thu, 01 May 2008) | 2 lines
Changed paths:
   M /trunk/gtk/rtp_analysis.c
   M /trunk/gtk/voip_calls_dlg.c

Force foreground when background is forced in RTP analysis and VOIP calls.

------------------------------------------------------------------------
r25214 | jake | 2008-05-02 01:23:21 -0700 (Fri, 02 May 2008) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-e212.c
   M /trunk/epan/dissectors/packet-h264.c
   M /trunk/epan/t35.c
   M /trunk/gtk/capture_if_details_dlg_win32.c

From Shinsuke SUZUKI:
Since this leads to a compilation failure (Warning C4819: unexpected character
in the current code page) on non-european Windows, I'd like you to avoid using
non-ASCII characters in Wireshark code (even in comment).
------------------------------------------------------------------------
r25373 | stig | 2008-05-23 07:51:17 -0700 (Fri, 23 May 2008) | 2 lines
Changed paths:
   M /trunk/gtk/range_utils.c

Print correct number of packets for captured "From first to last marked packet".

------------------------------------------------------------------------
r25406 | jake | 2008-05-31 09:44:02 -0700 (Sat, 31 May 2008) | 4 lines
Changed paths:
   D /trunk/debian/README.debian
   M /trunk/debian/changelog
   M /trunk/debian/compat
   M /trunk/debian/control
   D /trunk/debian/docs
   A /trunk/debian/headers-check.c
   D /trunk/debian/menu
   M /trunk/debian/patches/00list
   D /trunk/debian/patches/01_idl2deb.dpatch
   D /trunk/debian/patches/02_asn2deb.dpatch
   M /trunk/debian/patches/03_preferences.dpatch
   D /trunk/debian/patches/04_drop-capabilities.dpatch
   D /trunk/debian/patches/05_plugin-libdir.dpatch
   D /trunk/debian/patches/06_giop-buffer.dpatch
   D /trunk/debian/patches/07_gcc4.dpatch
   D /trunk/debian/patches/08_wireshark-desktop-menu.dpatch
   D /trunk/debian/patches/09_idl2wrs.dpatch
   D /trunk/debian/patches/10_wireshark_gen.dpatch
   D /trunk/debian/prerm
   M /trunk/debian/rules
   M /trunk/debian/tshark.manpages
   M /trunk/debian/wireshark-common.files
   M /trunk/debian/wireshark-common.manpages
   A /trunk/debian/wireshark-common.shlibs
   M /trunk/debian/wireshark-dev.docs
   M /trunk/debian/wireshark-dev.files
   M /trunk/debian/wireshark-dev.header-files
   M /trunk/debian/wireshark-dev.manpages
   D /trunk/debian/wireshark-dev.postinst
   M /trunk/debian/wireshark-dev.prerm
   M /trunk/debian/wireshark-root.desktop
   A /trunk/debian/wireshark.desktop
   M /trunk/debian/wireshark.files
   M /trunk/debian/wireshark.manpages
   M /trunk/debian/wireshark.menu

Update Debian packaging files for Wireshark 1.0.
These files build the package with all features and
minimum changes from the released sources.

------------------------------------------------------------------------
r25408 | jake | 2008-06-02 00:26:34 -0700 (Mon, 02 Jun 2008) | 2 lines
Changed paths:
   M /trunk/debian/wireshark-root.desktop
   M /trunk/debian/wireshark.desktop

Clean up desktop files based on changes made by Stig.

------------------------------------------------------------------------
r25439 | jake | 2008-06-09 22:41:29 -0700 (Mon, 09 Jun 2008) | 4 lines

From Joe Eykholt:
The Fibre-channel FCP dissector shows the wrong byte as the response info
response code byte.  The byte with offset 2 in the FCP frame is shown
instead of byte 3 inside the response info.
------------------------------------------------------------------------
r25462 | gerald | 2008-06-16 14:55:37 -0700 (Mon, 16 Jun 2008) | 4 lines

Fix an off-by-one bug reported by David Ceccanti, as suggested by Guy at
http://www.wireshark.org/lists/wireshark-users/200806/msg00077.html.
Add a comment about the usage of gsm_sms_char_7bit_unpack().

------------------------------------------------------------------------
r25466 | gerald | 2008-06-17 12:05:48 -0700 (Tue, 17 Jun 2008) | 3 lines

Fully implement Guy's suggested fix. Rename ADDRBUF_MAX_MESSAGE_SIZE to
MAX_ADDR_SIZE, to be more in line with a suggestion by Abhik Sarkar.

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


Copy over revisions from the trunk:

------------------------------------------------------------------------
r25221 | jake | 2008-05-03 01:31:50 -0700 (Sat, 03 May 2008) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-bvlc.c

From Steve Karg:
Corrected packet-bvlc.c dissector which was not decoding BACnet BVLC NAK result
code text correctly.
------------------------------------------------------------------------
r25223 | wmeier | 2008-05-03 15:33:51 -0700 (Sat, 03 May 2008) | 2 lines
Changed paths:
   M /trunk/print.c

Fix for bug #2518: 'tshark -Tfields -e data' Omits Last Character of Data

------------------------------------------------------------------------
r25351 | stig | 2008-05-22 03:34:32 -0700 (Thu, 22 May 2008) | 3 lines
Changed paths:
   M /trunk/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj

Set SYMROOT to make osx-package work correctly on my computers.
Hopefully this will not break the buildbot.

------------------------------------------------------------------------
r25409 | stig | 2008-06-02 00:32:55 -0700 (Mon, 02 Jun 2008) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-bacapp.c

From Rudolf Weidmann (bug 2583):
Fixed enumeration type for new-mode in change-of-life-safety.

------------------------------------------------------------------------
r25410 | stig | 2008-06-02 10:17:24 -0700 (Mon, 02 Jun 2008) | 2 lines
Changed paths:
   M /trunk/capture.c

Don't include \r in linktype on win32, it looks weird in the combo box.

------------------------------------------------------------------------
r25415 | jake | 2008-06-03 13:41:12 -0700 (Tue, 03 Jun 2008) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ifcp.c

From Frank Schorr:
RFC 4172 section 5.3.1 shows a chart of the iFCP encapsulated Header Format.
It says that bytes 4-7 MUST be zeros.  In reality most vendors are putting some
information in these 4 bytes, particularly Nishon. This caused almost all iFCP
packets to not be decoded for this vendor.

------------------------------------------------------------------------
r25416 | jake | 2008-06-03 14:24:25 -0700 (Tue, 03 Jun 2008) | 5 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ifcp.c

From Frank Schorr:
The get_ifcp_pdu_len() call used for the tcp_dissect_pdus() call does not mask
off the frame length properly.  The result is that the "Flags" field
incorrectly becomes the high order part of the Frame Length.

------------------------------------------------------------------------
r25442 | jake | 2008-06-11 11:20:02 -0700 (Wed, 11 Jun 2008) | 3 lines

Fix for bug 2396:
Wireshark expects 802.1ah Instance tags to have ethernet type 0x88f0, but latest 
802.1ah draft 4.1 defines the 802.1ah Instance tag ethernet type to 0x88e7.
------------------------------------------------------------------------
r25448 | guy | 2008-06-12 22:54:22 -0700 (Thu, 12 Jun 2008) | 2 lines

Fix list of files in the debian directory.

------------------------------------------------------------------------
r25451 | stig | 2008-06-14 09:45:06 -0700 (Sat, 14 Jun 2008) | 3 lines

Save the column width in the recent list on every change so we can
pick the correct width when changing the time precision.

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


Update the release notes.


------------------------------------------------------------------------
r25473 | gerald | 2008-06-18 09:49:49 -0700 (Wed, 18 Jun 2008) | 2 lines
Changed paths:
   M /trunk-1.0/gtk/recent.c
   M /trunk-1.0/gtk/recent.h

Add missing column width code.

------------------------------------------------------------------------
r25474 | gerald | 2008-06-18 10:07:04 -0700 (Wed, 18 Jun 2008) | 15 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-iscsi.c
   M /trunk-1.0/packaging/macosx/Read_me_first.rtf

Copy over revisions from the trunk:

------------------------------------------------------------------------
r25470 | jake | 2008-06-17 23:27:02 -0700 (Tue, 17 Jun 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-iscsi.c

Fix for bug 2616:
According to RFC 3720 the login command doesn't require either T or C, just (C => !T)
------------------------------------------------------------------------

Copy over packaging/macosx/Read_me_first.rtf from the trunk.

Update the release notes.

------------------------------------------------------------------------
r25477 | gerald | 2008-06-18 11:23:47 -0700 (Wed, 18 Jun 2008) | 23 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/gtk/packet_list.c
   M /trunk-1.0/gtk/recent.c
   M /trunk-1.0/gtk/recent.h
   M /trunk-1.0/make-manuf
   M /trunk-1.0/manuf
   M /trunk-1.0/services

Copy over revisions from the trunk:

------------------------------------------------------------------------
r25475 | jake | 2008-06-18 10:32:35 -0700 (Wed, 18 Jun 2008) | 3 lines
Changed paths:
   M /trunk/make-manuf
   M /trunk/manuf

Fix for bug 2619:
Current OUI registery has changed location (again). Adjusting script to fetch current file.
Generated dataset based on this current file.
------------------------------------------------------------------------
r25476 | guy | 2008-06-18 10:50:01 -0700 (Wed, 18 Jun 2008) | 3 lines
Changed paths:
   M /trunk/services

Comment out the "shilp" entry in the services file, so that port 2049
gets reported as NFS rather than "shilp", whatever *that* is.

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

Back out the column width changes. Update the release notes.

------------------------------------------------------------------------
r25497 | gerald | 2008-06-20 13:25:04 -0700 (Fri, 20 Jun 2008) | 9 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/tvbuff.c

Flip the order of the arguments passed to add_to_used_in_list() in
tvb_composite_append() and tvb_composite_prepend(). The used_in list
determines the order in which tvbuffs are freed, and composite tvbuffs
were being freed in the wrong order. Luckily, the RTMPT dissector was
the only one using composite tvbuffs. Fixes bug 2620.

Add checks for composite tvbuffs in a couple of places, so we don't
accidently munge a non-composite tvbuff.

------------------------------------------------------------------------
r25534 | gerald | 2008-06-23 11:46:29 -0700 (Mon, 23 Jun 2008) | 72 lines
Changed paths:
   M /trunk-1.0/docbook/release-notes.xml
   M /trunk-1.0/epan/dissectors/packet-actrace.c
   M /trunk-1.0/epan/dissectors/packet-mgcp.c
   M /trunk-1.0/epan/dissectors/packet-ms-mms.c
   M /trunk-1.0/gtk/capture_dlg.c
   M /trunk-1.0/manuf
   M /trunk-1.0/packaging/macosx/osx-app.sh
   M /trunk-1.0/plugins/profinet/packet-pn-dcp.c
   M /trunk-1.0/services

Copy over revisions from the trunk:

------------------------------------------------------------------------
r25443 | stig | 2008-06-11 13:10:19 -0700 (Wed, 11 Jun 2008) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ms-mms.c

Return 0 if we don't dissect any bytes.
Set desegment_len = DESEGMENT_ONE_MORE_SEGMENT.

------------------------------------------------------------------------
r25483 | stig | 2008-06-18 15:47:58 -0700 (Wed, 18 Jun 2008) | 4 lines
Changed paths:
   M /trunk/packaging/macosx/osx-app.sh

Do not overwrite existing files when copying dependencies, as this will
overwrite the wireshark libs with libs installed in /opt/local, which is
probably not the ones we want.

------------------------------------------------------------------------
r25490 | ulfl | 2008-06-19 11:44:23 -0700 (Thu, 19 Jun 2008) | 1 line
Changed paths:
   M /trunk/plugins/profinet/packet-pn-dcp.c

fix BlockError strings
------------------------------------------------------------------------
r25516 | stig | 2008-06-21 16:02:01 -0700 (Sat, 21 Jun 2008) | 2 lines
Changed paths:
   M /trunk/services

Update the services file from IANA's port-numbers.

------------------------------------------------------------------------
r25517 | stig | 2008-06-21 16:07:33 -0700 (Sat, 21 Jun 2008) | 2 lines
Changed paths:
   M /trunk/manuf

Update manuf

------------------------------------------------------------------------
r25525 | stig | 2008-06-22 11:36:33 -0700 (Sun, 22 Jun 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-mgcp.c

Make the MGCP dissector give away the package if it knows its not a MGCP.

------------------------------------------------------------------------
r25526 | stig | 2008-06-22 11:42:37 -0700 (Sun, 22 Jun 2008) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-actrace.c

Make the ACTRACE dissector give away the package if it knows its not a ACTRACE.

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


Copy over r25489 by hand:
------------------------------------------------------------------------
r25489 | stig | 2008-06-19 10:25:34 -0700 (Thu, 19 Jun 2008) | 5 lines
Changed paths:
   M /trunk/gtk/capture_dlg.c

Make storage-based and time-based "Next file every" checkboxes behave equal
in "Use multiple files".  Also default to storage-based if not time-based.

This fixes the initial problem in bug #2599.

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


Update the release notes.

------------------------------------------------------------------------
r25535 | gerald | 2008-06-23 12:41:49 -0700 (Mon, 23 Jun 2008) | 2 lines
Changed paths:
   M /trunk-1.0/make-version.pl

When we're run with -p, set VERSION_BUILD no matter what.

------------------------------------------------------------------------
r25536 | gerald | 2008-06-23 12:42:33 -0700 (Mon, 23 Jun 2008) | 2 lines
Changed paths:
   M /trunk-1.0/Makefile.nmake
   M /trunk-1.0/config.nmake
   M /trunk-1.0/packaging/nsis/wireshark.nsi
   M /trunk-1.0/tools/win32-setup.sh

Update the GNUTLS and libsmi versions.

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