------------------------------------------------------------------------
r30722 | gerald | 2009-10-26 12:32:09 -0700 (Mon, 26 Oct 2009) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/version.conf

Build 1.2.3.

------------------------------------------------------------------------
r30730 | gerald | 2009-10-27 07:20:57 -0700 (Tue, 27 Oct 2009) | 2 lines
Changed paths:
   M /trunk-1.2/packaging/Makefile.am
   A /trunk-1.2/packaging/portableapps/win32/installer.ini

Add a missing file.

------------------------------------------------------------------------
r30738 | gerald | 2009-10-27 13:25:24 -0700 (Tue, 27 Oct 2009) | 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

Bump the version to 1.2.4.

------------------------------------------------------------------------
r30739 | gerald | 2009-10-27 14:57:04 -0700 (Tue, 27 Oct 2009) | 2 lines
Changed paths:
   M /trunk-1.2/version.conf

Switch back to interim versions.

------------------------------------------------------------------------
r30742 | gerald | 2009-10-27 15:05:22 -0700 (Tue, 27 Oct 2009) | 1 line
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Simplify the download text as recommended by Ulf.
------------------------------------------------------------------------
r30794 | gerald | 2009-11-01 08:04:39 -0800 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2009-11-01]
------------------------------------------------------------------------
r30863 | gerald | 2009-11-08 08:04:25 -0800 (Sun, 08 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2009-11-08]
------------------------------------------------------------------------
r30867 | etxrab | 2009-11-08 12:26:37 -0800 (Sun, 08 Nov 2009) | 4 lines
Changed paths:
   M /trunk-1.2/asn1/nbap/nbap.cnf
   M /trunk-1.2/asn1/nbap/packet-nbap-template.c
   M /trunk-1.2/asn1/s1ap/s1ap.cnf
   M /trunk-1.2/asn1/x2ap/packet-x2ap-template.c
   M /trunk-1.2/asn1/x2ap/x2ap.cnf
   M /trunk-1.2/epan/dissectors/packet-nbap.c
   M /trunk-1.2/epan/dissectors/packet-s1ap.c
   M /trunk-1.2/epan/dissectors/packet-sctp.c
   M /trunk-1.2/epan/dissectors/packet-x2ap.c
   M /trunk-1.2/epan/sctpppids.h

Copy over
Rev 30744 - Rev 30745 - Update SCTP ppids, fix a faulty #define. 
Rev 30746 - Make X2AP dissection work.
With manual intervention.
------------------------------------------------------------------------
r30927 | gerald | 2009-11-10 14:09:20 -0800 (Tue, 10 Nov 2009) | 89 lines
Changed paths:
   M /trunk-1.2/doc/README.developer
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-dcerpc.c
   M /trunk-1.2/epan/dissectors/packet-iax2.c
   M /trunk-1.2/epan/dissectors/packet-ip.c
   M /trunk-1.2/epan/dissectors/packet-nas_eps.c
   M /trunk-1.2/epan/dissectors/packet-netflow.c
   M /trunk-1.2/epan/dissectors/packet-rtcp.c
   M /trunk-1.2/epan/dissectors/packet-tipc.c
   M /trunk-1.2/gtk/capture_if_dlg.c
   M /trunk-1.2/image/wssplash.xpm

Copy over revisions from the trunk:

------------------------------------------------------------------------
r29969 | etxrab | 2009-09-17 06:53:52 -0700 (Thu, 17 Sep 2009) | 1 line
Changed paths:
   M /trunk/epan/dissectors/packet-nas_eps.c

Fix bug in IE decoding.
------------------------------------------------------------------------
r30747 | guy | 2009-10-28 11:19:54 -0700 (Wed, 28 Oct 2009) | 4 lines
Changed paths:
   M /trunk/doc/README.developer

From Nemeth Marton: in an example of a valid (at least at the C language
level) way to handle passing the result of strlen() to a routine
expecting a int-sized value, mark it as "OK", not "Compiler warning".
------------------------------------------------------------------------
r30764 | jake | 2009-10-29 15:14:54 -0700 (Thu, 29 Oct 2009) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rtcp.c

Handle padded RTCP packets ending with SDES correctly as well.
------------------------------------------------------------------------
r30790 | jake | 2009-11-01 03:52:32 -0800 (Sun, 01 Nov 2009) | 2 lines
Changed paths:
   M /trunk/epan/dissectors/packet-dcerpc.c

From Markus Koetter:
Wireshark fails dissecting dce rpc bind acks, if the bind request had more than 1 ctx.
------------------------------------------------------------------------
r30809 | jake | 2009-11-03 15:01:03 -0800 (Tue, 03 Nov 2009) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-netflow.c

From Jason Rusmisel:
The netflow implementation has a bug where the code exists to extract four
fields from a packet, however, the decoder for these fields has not been
registered in proto_register_netflow in the hf_register_info array. 
The fix is to include decoders for the fields in the proto_register_netflow.
------------------------------------------------------------------------
r30822 | etxrab | 2009-11-04 08:39:52 -0800 (Wed, 04 Nov 2009) | 1 line
Changed paths:
   M /trunk/epan/dissectors/packet-tipc.c

Register by name.
------------------------------------------------------------------------
r30823 | etxrab | 2009-11-04 08:40:52 -0800 (Wed, 04 Nov 2009) | 1 line
Changed paths:
   M /trunk/epan/dissectors/packet-iax2.c

Check if we have a handle for "v110".
------------------------------------------------------------------------
r30839 | gerald | 2009-11-05 14:23:41 -0800 (Thu, 05 Nov 2009) | 2 lines
Changed paths:
   M /trunk/gtk/capture_if_dlg.c

Draw little wireless icons for AirPcap adapters.
------------------------------------------------------------------------
r30846 | gerald | 2009-11-06 10:08:59 -0800 (Fri, 06 Nov 2009) | 2 lines
Changed paths:
   M /trunk/gtk/capture_if_dlg.c

Add some null pointer checks. This is a blind attempt to fix bug 4155.
------------------------------------------------------------------------


Apply by hand:
------------------------------------------------------------------------
r30829 | jake | 2009-11-04 22:59:27 -0800 (Wed, 04 Nov 2009) | 1 line
Changed paths:
   M /trunk/image/wssplash-dev.xpm

Fix the property list.
------------------------------------------------------------------------
r30855 | jake | 2009-11-07 03:24:05 -0800 (Sat, 07 Nov 2009) | 8 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ip.c

From Filipe David Borba Manana:
Since it was named Ethereal and up to today, Wireshark wrongly parses 
the IPv4 header flags field:
* it considers it as a 4 bits wide field - according to RFC 791 its a 3 bits
wide field (first 3 bits of the 6th octect of the IPv4 header).
* if for example the DF bit is set, Wireshark displays the flag value as 0x04
(0100) when it should be 0x02 (010), idem for the MF flag.
Attached to this bug report, you can find a patch to fix the issue.
------------------------------------------------------------------------


------------------------------------------------------------------------
r30935 | gerald | 2009-11-11 15:07:19 -0800 (Wed, 11 Nov 2009) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS

Updates for 1.2.4.

------------------------------------------------------------------------
r30938 | etxrab | 2009-11-12 01:02:42 -0800 (Thu, 12 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/diameter/dictionary.xml
   M /trunk-1.2/diameter/imscxdx.xml

3GPP AVP updates.
------------------------------------------------------------------------
r30949 | etxrab | 2009-11-13 00:35:19 -0800 (Fri, 13 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/diameter/etsie2e4.xml

Update ETSI AVP:s
------------------------------------------------------------------------
r30952 | gerald | 2009-11-13 09:58:16 -0800 (Fri, 13 Nov 2009) | 11 lines
Changed paths:
   M /trunk-1.2/epan/oids.c

Copy over r30951 from the trunk:

------------------------------------------------------------------------
r30951 | gerald | 2009-11-13 09:55:55 -0800 (Fri, 13 Nov 2009) | 3 lines
Changed paths:
   M /trunk/epan/oids.c

On OS X, prepend /usr/share/snmp/mibs to the SMI path. Partial fix for
bug 3163.
------------------------------------------------------------------------

------------------------------------------------------------------------
r30954 | gerald | 2009-11-13 12:20:40 -0800 (Fri, 13 Nov 2009) | 17 lines
Changed paths:
   M /trunk-1.2/Makefile.nmake
   M /trunk-1.2/airpcap_loader.c
   M /trunk-1.2/config.nmake
   M /trunk-1.2/gtk/airpcap_gui_utils.c
   M /trunk-1.2/tools/win32-setup.sh
   M /trunk-1.2/tools/win64-setup.sh

Copy over r30945:

------------------------------------------------------------------------
r30945 | gerald | 2009-11-12 15:48:11 -0800 (Thu, 12 Nov 2009) | 2 lines
Changed paths:
   M /trunk/Makefile.nmake
   M /trunk/airpcap_loader.c
   M /trunk/config.nmake
   M /trunk/gtk/airpcap_gui_utils.c
   M /trunk/tools/win32-setup.sh
   M /trunk/tools/win64-setup.sh

Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build.
------------------------------------------------------------------------

Adjust tools/win{32|64}-setup.sh to use the latest tag.

------------------------------------------------------------------------
r30958 | gerald | 2009-11-13 14:59:32 -0800 (Fri, 13 Nov 2009) | 2 lines
Changed paths:
   M /trunk-1.2/packaging/nsis/Makefile.nmake
   M /trunk-1.2/packaging/nsis/wireshark.nsi

Copy over more WinPcap 4.1.1 updates.

------------------------------------------------------------------------
r30966 | gerald | 2009-11-15 08:04:31 -0800 (Sun, 15 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2009-11-15]
------------------------------------------------------------------------
r30972 | etxrab | 2009-11-16 08:17:35 -0800 (Mon, 16 Nov 2009) | 1 line
Changed paths:
   M /trunk-1.2/diameter/gqpolicy.xml

Update 3GPP/ETSI AVP:s
------------------------------------------------------------------------
