------------------------------------------------------------------------
r38121 | gerald | 2011-07-19 11:39:41 -0700 (Tue, 19 Jul 2011) | 3 lines
Changed paths:
   M /trunk-1.4/config.nmake

Pull the Windows external library directory from WIRESHARK_LIB_DIR if
it's set.

------------------------------------------------------------------------
r38184 | gerald | 2011-07-24 09:04:58 -0700 (Sun, 24 Jul 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-07-24]
------------------------------------------------------------------------
r38290 | gerald | 2011-07-31 09:04:38 -0700 (Sun, 31 Jul 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-07-31]
------------------------------------------------------------------------
r38391 | gerald | 2011-08-07 09:04:46 -0700 (Sun, 07 Aug 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-08-07]
------------------------------------------------------------------------
r38534 | gerald | 2011-08-14 09:05:04 -0700 (Sun, 14 Aug 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-08-14]
------------------------------------------------------------------------
r38644 | gerald | 2011-08-21 09:06:06 -0700 (Sun, 21 Aug 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-08-21]
------------------------------------------------------------------------
r38654 | gerald | 2011-08-21 15:42:16 -0700 (Sun, 21 Aug 2011) | 8 lines
Changed paths:
   M /trunk-1.4/services
   M /trunk-1.4/tools/make-services.pl

The canonical IANA port number URL now returns XML. Update
make-services.pl to to use the old-style text URL and add a comment
about parsing the XML instead.

Update the services file. Due to format changes it generates a lot of
text that should be commented out, but it's apparently been doing that
for a while now.

------------------------------------------------------------------------
r38741 | etxrab | 2011-08-26 01:39:18 -0700 (Fri, 26 Aug 2011) | 2 lines
Changed paths:
   M /trunk-1.4/epan/dissectors/packet-gtpv2.c

Copy over 38738 and 38739 Make dissection of AVP: 3GPP-User-Location-Info(22) l=15 f=V-- vnd=TGPP val=303231 more robust.
By hand.
------------------------------------------------------------------------
r38742 | etxrab | 2011-08-26 03:23:17 -0700 (Fri, 26 Aug 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/dissectors/packet-gtpv2.c

Complete the porting of code.
------------------------------------------------------------------------
r38759 | gerald | 2011-08-28 09:00:49 -0700 (Sun, 28 Aug 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-08-28]
------------------------------------------------------------------------
r38831 | gerald | 2011-08-31 16:14:39 -0700 (Wed, 31 Aug 2011) | 6 lines
Changed paths:
   M /trunk-1.4/services
   M /trunk-1.4/tools/make-services.pl

Copy over r38829 from the trunk:

 Fix the format of the services file. The output from make-services.pl is
 still uglier than a box of YouTube comments but transport name
 resolution seems to work now. Fixes bug 6274.

------------------------------------------------------------------------
r38870 | gerald | 2011-09-02 14:44:49 -0700 (Fri, 02 Sep 2011) | 14 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/dissectors/packet-isakmp.c

Copy over r38247 from the trunk:

  ------------------------------------------------------------------------
  r38247 | stig | 2011-07-28 15:19:46 -0700 (Thu, 28 Jul 2011) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-isakmp.c

  Avoid a possible infinite loop in dissect_delete().

  This may fix the "Malformed IKE Packet DoS" bug.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r38871 | gerald | 2011-09-02 15:11:07 -0700 (Fri, 02 Sep 2011) | 54 lines
Changed paths:
   M /trunk-1.4/AUTHORS
   M /trunk-1.4/asn1/h225/h225.cnf
   M /trunk-1.4/asn1/snmp/packet-snmp-template.c
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/dissectors/packet-h225.c
   M /trunk-1.4/epan/dissectors/packet-snmp.c
   M /trunk-1.4/epan/dissectors/packet-tcp.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38303 | cmaynard | 2011-08-01 18:54:03 -0700 (Mon, 01 Aug 2011) | 4 lines
  Changed paths:
     M /trunk/AUTHORS
     M /trunk/asn1/snmp/packet-snmp-template.c

  From Paul Stath via bug 5731:  The check for engineID length should only occur if the engineID has a non-zero length.

  Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731
  ------------------------------------------------------------------------
  r38304 | etxrab | 2011-08-01 21:17:45 -0700 (Mon, 01 Aug 2011) | 1 line
  Changed paths:
     M /trunk/epan/dissectors/packet-snmp.c

  Gnenerate the dissector for previous commit.
  ------------------------------------------------------------------------


Copy over by hand:

  ------------------------------------------------------------------------
  r38326 | gerald | 2011-08-03 12:11:07 -0700 (Wed, 03 Aug 2011) | 15 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-tcp.c

  From Dirk Jagdmann via bug 6194:

  The attachted patch fixes and enhances the SCPS TCP option dissection. Changes
  are:

  - fix order of reserved Bit 1,2,3
  - fix minimum TCP option length
  - fix proto items
  - add proto item for Connection ID
  - removed the verify_scps() function. It's logic was broken, because it did
  reset the scps_capable flag on both flows if one of them did not have it.
  However sometimes that flag is only enabled in one flow direction and that flow
  direction could see TCP options later on, which would get dissected as invalid.
  See the attachted capture file for an example.
  ------------------------------------------------------------------------
  r38399 | cmaynard | 2011-08-07 13:50:31 -0700 (Sun, 07 Aug 2011) | 3 lines
  Changed paths:
     M /trunk/asn1/h225/h225.cnf
     M /trunk/epan/dissectors/packet-h225.c

  Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848", which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287).  Regenerate the packet-h225.c dissector.  Patch from ericn1234@yahoo.com.
  Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r38872 | gerald | 2011-09-02 15:13:04 -0700 (Fri, 02 Sep 2011) | 13 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/packet.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38410 | gerald | 2011-08-08 10:25:35 -0700 (Mon, 08 Aug 2011) | 3 lines
  Changed paths:
     M /trunk/epan/packet.c

  Make sure our root tvb is initialized in case its creation fails.
  Untested fix for bug 6135.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r38873 | gerald | 2011-09-02 15:15:16 -0700 (Fri, 02 Sep 2011) | 12 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/wslua/template-init.lua

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38414 | gerald | 2011-08-08 12:10:19 -0700 (Mon, 08 Aug 2011) | 2 lines
  Changed paths:
     M /trunk/epan/wslua/template-init.lua

  Load console.lua and dtd-gen.lua from an explicit path.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r38889 | gerald | 2011-09-05 14:24:42 -0700 (Mon, 05 Sep 2011) | 1 line
Changed paths:
   M /trunk-1.4/epan/enterprise-numbers
   M /trunk-1.4/services

[Automatic manuf, services and enterprise-numbers update for 2011-09-05]
------------------------------------------------------------------------
r38901 | gerald | 2011-09-06 10:14:40 -0700 (Tue, 06 Sep 2011) | 96 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/dissectors/dcerpc/drsuapi/drsuapi.idl
   M /trunk-1.4/epan/dissectors/packet-bgp.c
   M /trunk-1.4/epan/dissectors/packet-dcerpc-drsuapi.c
   M /trunk-1.4/epan/dissectors/packet-dcerpc-drsuapi.h
   M /trunk-1.4/epan/dissectors/packet-dcom.c
   M /trunk-1.4/epan/dissectors/packet-fix.h
   M /trunk-1.4/epan/dissectors/packet-giop.c
   M /trunk-1.4/epan/dissectors/packet-gsm_a_rr.c
   M /trunk-1.4/epan/dissectors/packet-gvcp.c
   M /trunk-1.4/epan/dissectors/packet-lldp.c
   M /trunk-1.4/epan/dissectors/packet-olsr.c
   M /trunk-1.4/epan/dissectors/packet-ospf.c
   M /trunk-1.4/epan/dissectors/packet-pdcp-lte.c
   M /trunk-1.4/epan/dissectors/packet-ppp.c
   M /trunk-1.4/epan/dissectors/packet-sflow.c
   M /trunk-1.4/epan/dissectors/packet-sita.c
   M /trunk-1.4/fix/FIX.xml
   M /trunk-1.4/fix/FIX42.xml
   M /trunk-1.4/fix/FIX43.xml
   M /trunk-1.4/fix/FIX44.xml
   M /trunk-1.4/gtk/filter_autocomplete.c
   M /trunk-1.4/wiretap/README.airmagnet
   M /trunk-1.4/wiretap/pcapng.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38419 | cmaynard | 2011-08-08 13:34:18 -0700 (Mon, 08 Aug 2011) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-sflow.c

  From Andrew Feren via bug 6219: Offset calculated incorrectly for sFlow extended data.
  ------------------------------------------------------------------------
  r38444 | stig | 2011-08-10 00:39:18 -0700 (Wed, 10 Aug 2011) | 4 lines
  Changed paths:
     M /trunk/gtk/filter_autocomplete.c

  Apply filter if pressing enter when having a auto completion window
  and nothing is selected.

  This fixes bug 6228.
  ------------------------------------------------------------------------
  r38445 | stig | 2011-08-10 01:00:01 -0700 (Wed, 10 Aug 2011) | 1 line
  Changed paths:
     M /trunk/gtk/filter_autocomplete.c

  Simplified previous enter-fix.
  ------------------------------------------------------------------------
  r38491 | morriss | 2011-08-11 14:42:37 -0700 (Thu, 11 Aug 2011) | 13 lines
  Changed paths:
     M /trunk/wiretap/pcapng.c

  From Hanspeter via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6229 :

  If an EnhancedPacketBlock in a pcapng file contains a comment option the
  content isn't displayed. Instead "Malformed packet" is displayed with the
  reason Exception occurred.

  The reason for the problem is a bug in the pcapng.c, where for enhanced packet
  blocks, interface description blocks and interface statistics blocks the wrong
  union members are used to set the comment. This way required fields in the
  structures are overwritten.

  The attached patch solves the problem.
  ------------------------------------------------------------------------
  r38542 | etxrab | 2011-08-14 21:39:30 -0700 (Sun, 14 Aug 2011) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-gsm_a_rr.c

  From Jeremy Quirke:
  misdecoding 3G Neighbour Cell Information Element in SI2quater message due to a coding typo

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


Copy over by hand:

  ------------------------------------------------------------------------
  r38561 | morriss | 2011-08-16 06:16:33 -0700 (Tue, 16 Aug 2011) | 5 lines
  Changed paths:
     M /trunk/asn1/tetra/packet-tetra-template.c
     M /trunk/epan/dissectors/packet-dcom.c
     M /trunk/epan/dissectors/packet-fix.h
     M /trunk/epan/dissectors/packet-giop.c
     M /trunk/epan/dissectors/packet-gvcp.c
     M /trunk/epan/dissectors/packet-lldp.c
     M /trunk/epan/dissectors/packet-olsr.c
     M /trunk/epan/dissectors/packet-ospf.c
     M /trunk/epan/dissectors/packet-pdcp-lte.c
     M /trunk/epan/dissectors/packet-ppp.c
     M /trunk/epan/dissectors/packet-rohc.c
     M /trunk/epan/dissectors/packet-tetra.c
     M /trunk/fix/FIX.xml
     M /trunk/fix/FIX42.xml
     M /trunk/fix/FIX43.xml
     M /trunk/fix/FIX44.xml
     M /trunk/wiretap/README.airmagnet

  Based on patch from Denis Ovsienko via
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

  Fix typo: s/unkown/unknown/
  ------------------------------------------------------------------------
  r38565 | guy | 2011-08-16 09:26:50 -0700 (Tue, 16 Aug 2011) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/dcerpc/drsuapi/drsuapi.idl
     M /trunk/epan/dissectors/packet-bgp.c
     M /trunk/epan/dissectors/packet-dcerpc-drsuapi.c
     M /trunk/epan/dissectors/packet-dcerpc-drsuapi.h
     M /trunk/epan/dissectors/packet-homeplug-av.c
     M /trunk/epan/dissectors/packet-ppi-sensor.c
     M /trunk/epan/dissectors/packet-sita.c

  More misspellings of "unknown", for bug 6244.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r38902 | gerald | 2011-09-06 11:58:12 -0700 (Tue, 06 Sep 2011) | 119 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/column-utils.c
   M /trunk-1.4/epan/dissectors/packet-bgp.c
   M /trunk-1.4/epan/dissectors/packet-btl2cap.c
   M /trunk-1.4/epan/dissectors/packet-ndmp.c
   M /trunk-1.4/epan/dissectors/packet-rtps2.c
   M /trunk-1.4/gtk/rtp_stream_dlg.c
   M /trunk-1.4/wiretap/commview.c
   M /trunk-1.4/wiretap/pcap-common.c
   M /trunk-1.4/wiretap/pcapng.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38680 | etxrab | 2011-08-22 21:49:24 -0700 (Mon, 22 Aug 2011) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-btl2cap.c

  From Andrei Emeltchenko via Chris Maynard:
  btl2cap extended window shows wrong bit.
  Patch would not apply cleanly so added by hand.
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6257
  ------------------------------------------------------------------------
  r38723 | alagoutte | 2011-08-24 14:37:37 -0700 (Wed, 24 Aug 2011) | 8 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-bgp.c

  From astramax57 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6188
  In some BGP captures the AS_PATH attribute was decode wrong, if the asn length determines automatically

  From me:
  Fix some whitespace...
  Fix error: ‘for’ loop initial declarations are only allowed in C99 mode
  Replace unsigned by guint
  ------------------------------------------------------------------------
  r38728 | cmaynard | 2011-08-24 17:50:39 -0700 (Wed, 24 Aug 2011) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ndmp.c

  "Bytes left to read" is an unsigned quantity.  Changed FT_INT64 to FT_UINT64 as suggested by Rui Loura via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6262.
  ------------------------------------------------------------------------
  r38790 | guy | 2011-08-29 23:01:44 -0700 (Mon, 29 Aug 2011) | 7 lines
  Changed paths:
     M /trunk/wiretap/pcapng.c

  A zero snaplen means "snaplen unknown", as in "the file format from
  which we read the data to be written doesn't record the snapshot
  length".  A snapshot length of 0 in a pcap or pcap-ng file is not
  handled well by many programs reading those files; for pcap files, we
  write out WTAP_MAX_PACKET_SIZE as the snapshot length in that case, so
  do so for pcap-ng files as well.
  ------------------------------------------------------------------------
  r38792 | guy | 2011-08-30 01:09:40 -0700 (Tue, 30 Aug 2011) | 6 lines
  Changed paths:
     M /trunk/wiretap/pcap-common.c

  Handle multiple extension headers when calculating the pseudo-header
  length, and actually write out the extension headers when writing out
  the pseudo-header.

  Fixes bug 6265.
  ------------------------------------------------------------------------
  r38823 | etxrab | 2011-08-31 07:03:34 -0700 (Wed, 31 Aug 2011) | 2 lines
  Changed paths:
     M /trunk/gtk/rtp_stream_dlg.c

  COPY as CSV to clipboard from RTP stream analysis only copies 1st line many times.
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6279
  ------------------------------------------------------------------------
  r34079 | stig | 2010-09-08 03:29:06 -0700 (Wed, 08 Sep 2010) | 2 lines
  Changed paths:
     M /trunk/epan/column-utils.c

  Support negative values when viewing seconds with hours and minutes.
  ------------------------------------------------------------------------
  r38862 | stig | 2011-09-02 04:46:33 -0700 (Fri, 02 Sep 2011) | 1 line
  Changed paths:
     M /trunk/epan/column-utils.c

  Support negative nsecs when viewing seconds with hours and minutes.
  ------------------------------------------------------------------------
  r38865 | wmeier | 2011-09-02 11:00:10 -0700 (Fri, 02 Sep 2011) | 11 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-rtps2.c

  Increase MAX_BITMAP_SIZE from 200 to 256.
  See: Bug 6276: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6276

  Verified in the Spec:

  The Real-time Publish-Subscribe Wire Protocol
  DDS Interoperability Wire Protocol
  Specification
  Version 2.1
  ------------------------------------------------------------------------


Copy over by hand:

  ------------------------------------------------------------------------
  r38601 | alagoutte | 2011-08-18 06:43:24 -0700 (Thu, 18 Aug 2011) | 7 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-bgp.c

  From Ryan Hoffman via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6122
  Malformed Packet in decode for BGP-AD (autodiscovery) update (RFC6074)

  From me:
  Add support of RFC6074 (BGP-AD) in BGP dissector.
  Both BGP-AD and VPLS-BGP (RFC4761) use the same AFI/SAFI, The NLRI length must be used as a demultiplexer. (See RFC6074  Section 7 : BGP-AD and VPLS-BGP Interoperability)
  ------------------------------------------------------------------------
  r38833 | guy | 2011-08-31 21:14:54 -0700 (Wed, 31 Aug 2011) | 11 lines
  Changed paths:
     M /trunk/wiretap/commview.c

  Set eth.fcs_len in the pseudo-header for Ethernet packets.

  Set the pseudo-header when doing the sequential read as well as when
  doing random reads.

  When writing packets to a CommView file, use a slightly less contorted
  way to get the year/month/day/hour/minute/second values.

  commview_dump() uses the pseudo_header argument; don't mark it as
  unused.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r38903 | gerald | 2011-09-06 13:00:01 -0700 (Tue, 06 Sep 2011) | 2 lines
Changed paths:
   M /trunk-1.4/epan/dissectors/packet-bgp.c

tvb_ip_to_str doesn't exist in 1.4. Revert back to ip_to_str+tvb_get_ptr.

------------------------------------------------------------------------
r38922 | gerald | 2011-09-07 11:40:40 -0700 (Wed, 07 Sep 2011) | 2 lines
Changed paths:
   M /trunk-1.4/config.nmake
   M /trunk-1.4/tools/win32-setup.sh

Update GTK+

------------------------------------------------------------------------
r38927 | gerald | 2011-09-07 15:36:19 -0700 (Wed, 07 Sep 2011) | 19 lines
Changed paths:
   M /trunk-1.4/docbook/release-notes.xml
   M /trunk-1.4/epan/gcp.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r38910 | etxrab | 2011-09-06 22:02:43 -0700 (Tue, 06 Sep 2011) | 7 lines
  Changed paths:
     M /trunk/epan/gcp.c

  From Václav Horčák:
  When context id is reused by another termination, initial packet containing $
  (=choose one) is not added to context but belongs to context 0xfffffffe(context
  id value used in wireshark for choose one). This affects context listing in
  MEGACO packet contents and Telephony->Voip Calls listings for MEGACO.

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


Update the release notes.

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