aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-03-01 16:55:04 +0000
committerGerald Combs <gerald@wireshark.org>2011-03-01 16:55:04 +0000
commit92a09c95959b33978a0abb90d958e49dfa03bf26 (patch)
treecae924c10f9ce6d3146efba89fe63a0226d6aa86
parent46bdb9a6fc909d94bc0df6cd5b55a4abbf8ec5d5 (diff)
downloadwireshark-1.4.4.tar.gz
wireshark-1.4.4.tar.bz2
wireshark-1.4.4.zip
Build 1.4.4.wireshark-1.4.4
svn path=/trunk-1.4/; revision=36110
-rw-r--r--ChangeLog1425
-rw-r--r--NEWS122
-rw-r--r--docbook/release-notes.xml2
-rw-r--r--version.conf12
4 files changed, 469 insertions, 1092 deletions
diff --git a/ChangeLog b/ChangeLog
index cf868959e9..1999446812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1391 +1,750 @@
------------------------------------------------------------------------
-r34596 | gerald | 2010-10-20 14:04:08 -0700 (Wed, 20 Oct 2010) | 2 lines
+r35491 | gerald | 2011-01-11 15:07:11 -0800 (Tue, 11 Jan 2011) | 2 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
-Add an item about the LDSS overflow.
+Remove a link.
------------------------------------------------------------------------
-r34635 | gerald | 2010-10-24 09:04:19 -0700 (Sun, 24 Oct 2010) | 1 line
+r35553 | gerald | 2011-01-16 09:04:44 -0800 (Sun, 16 Jan 2011) | 1 line
Changed paths:
M /trunk-1.4/epan/enterprise-numbers
M /trunk-1.4/manuf
- M /trunk-1.4/services
-
-[Automatic manuf, services and enterprise-numbers update for 2010-10-24]
-------------------------------------------------------------------------
-r34723 | morriss | 2010-10-30 10:52:42 -0700 (Sat, 30 Oct 2010) | 1 line
-Changed paths:
- M /trunk-1.4/asn1/snmp/packet-snmp-template.c
- M /trunk-1.4/epan/dissectors/packet-snmp.c
-
-Include string.h to avoid some warnings (trunk already has this).
-------------------------------------------------------------------------
-r34737 | gerald | 2010-10-31 09:04:08 -0700 (Sun, 31 Oct 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
- M /trunk-1.4/services
-
-[Automatic manuf, services and enterprise-numbers update for 2010-10-31]
-------------------------------------------------------------------------
-r34800 | gerald | 2010-11-07 09:04:15 -0800 (Sun, 07 Nov 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
- M /trunk-1.4/services
-
-[Automatic manuf, services and enterprise-numbers update for 2010-11-07]
-------------------------------------------------------------------------
-r34833 | gerald | 2010-11-10 08:25:54 -0800 (Wed, 10 Nov 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
- M /trunk-1.4/services
-[Automatic manuf, services and enterprise-numbers update for 2010-11-10]
+[Automatic manuf, services and enterprise-numbers update for 2011-01-16]
------------------------------------------------------------------------
-r34870 | gerald | 2010-11-14 09:05:04 -0800 (Sun, 14 Nov 2010) | 1 line
+r35628 | gerald | 2011-01-23 09:04:46 -0800 (Sun, 23 Jan 2011) | 1 line
Changed paths:
M /trunk-1.4/epan/enterprise-numbers
M /trunk-1.4/manuf
-[Automatic manuf, services and enterprise-numbers update for 2010-11-14]
+[Automatic manuf, services and enterprise-numbers update for 2011-01-23]
------------------------------------------------------------------------
-r34889 | gerald | 2010-11-15 13:38:16 -0800 (Mon, 15 Nov 2010) | 169 lines
+r35635 | gerald | 2011-01-24 09:19:19 -0800 (Mon, 24 Jan 2011) | 2 lines
Changed paths:
- M /trunk-1.4/doc/rawshark.pod
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/dumpcap.c
- M /trunk-1.4/epan/dissectors/packet-diameter.c
- M /trunk-1.4/epan/dissectors/packet-ftp.c
- M /trunk-1.4/epan/dissectors/packet-http.c
- M /trunk-1.4/epan/dissectors/packet-ldss.c
- M /trunk-1.4/epan/dissectors/packet-ms-mms.c
- M /trunk-1.4/epan/dissectors/packet-multipart.c
- M /trunk-1.4/epan/dissectors/packet-rdt.c
- M /trunk-1.4/epan/dissectors/packet-sip.c
- M /trunk-1.4/epan/dissectors/packet-sipfrag.c
- M /trunk-1.4/epan/dissectors/packet-telnet.c
- M /trunk-1.4/epan/dissectors/packet-zbee-zcl.c
- M /trunk-1.4/epan/proto.c
- M /trunk-1.4/epan/wslua/wslua_dumper.c
- M /trunk-1.4/file.c
- M /trunk-1.4/gtk/main.c
- M /trunk-1.4/plugins/profinet/packet-dcerpc-pn-io.c
- M /trunk-1.4/plugins/profinet/packet-pn-mrp.c
- M /trunk-1.4/rawshark.c
- M /trunk-1.4/tshark.c
- M /trunk-1.4/version_info.c
- M /trunk-1.4/version_info.h
-
-Copy over revisions from the trunk:
-
-------------------------------------------------------------------------
-r34124 | martinm | 2010-09-15 11:16:23 -0500 (Wed, 15 Sep 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-diameter.c
- M /trunk/epan/dissectors/packet-ftp.c
- M /trunk/epan/dissectors/packet-ms-mms.c
- M /trunk/epan/dissectors/packet-rdt.c
- M /trunk/epan/dissectors/packet-sipfrag.c
-
-Remove a few more calls to check_col()
-------------------------------------------------------------------------
-r34507 | wmeier | 2010-10-13 23:53:07 -0500 (Wed, 13 Oct 2010) | 3 lines
-Changed paths:
- M /trunk/epan/proto.c
-
-Fix crash for 'tshark -G values' when printing "extended value string" value.
-Fixes bug #5296 [ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5296 ]
-------------------------------------------------------------------------
-r34523 | morriss | 2010-10-15 12:10:29 -0500 (Fri, 15 Oct 2010) | 10 lines
-Changed paths:
- M /trunk/plugins/profinet/packet-dcerpc-pn-io.c
-
-From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :
-
-In profinet plugin, there is a dissection based on whether the read data
-returned is expected to contain a single or multiple blocks. Currently, the
-I&M0FilterData case assumes only a single block is returned. Profinet specifies
-two optional additional blocks.
-
-This change moves I&M0FilterData to expect multiple blocks to correct decode
-the optional information.
-------------------------------------------------------------------------
-r34524 | morriss | 2010-10-15 12:17:04 -0500 (Fri, 15 Oct 2010) | 9 lines
-Changed paths:
- M /trunk/plugins/profinet/packet-pn-mrp.c
-
-From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :
-
-In the profinet plugin, the decoding of the MRP LinkUp and MRP LinkDown
-messages is missing the MRP_SA field which garbles the decode of the rest of
-the packet.
-
-This fix adds the decoding of the MRP_SA field to the MRP LinkUp and MRP
-LinkDown dissectors.
-------------------------------------------------------------------------
-r34527 | jmayer | 2010-10-15 16:02:30 -0500 (Fri, 15 Oct 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-telnet.c
-
-Make the telnet data lines filterable elements.
-------------------------------------------------------------------------
-r34557 | morriss | 2010-10-18 10:56:06 -0500 (Mon, 18 Oct 2010) | 1 line
-Changed paths:
- M /trunk/epan/dissectors/packet-diameter.c
-
-Use port range for SCTP too.
-------------------------------------------------------------------------
-r34563 | morriss | 2010-10-18 15:52:54 -0500 (Mon, 18 Oct 2010) | 12 lines
-Changed paths:
- M /trunk/file.c
-
-Fix progress bar when loading compressed files.
-
-Continue to use the data offset ((uncompressed) bytes read) as our progress
-indicator, at least until we get a progress value greater than 1.0. Then,
-in addition to checking if the size of the file changed, check our position in
-the file and use that as our progress indicator.
-
-This optimizes uncompressed file accesses (avoiding an lseek()) at the "expense"
-of switching progress measures (from data read to position in the file) while
-loading a file. Tests have shown that the progress bar never shows the data
-offset number when loading a compressed file, so this should be okay.
-------------------------------------------------------------------------
-r34564 | morriss | 2010-10-18 16:36:41 -0500 (Mon, 18 Oct 2010) | 1 line
-Changed paths:
- M /trunk/file.c
-
-Fix the win64 build
-------------------------------------------------------------------------
-r34575 | etxrab | 2010-10-19 14:19:42 -0500 (Tue, 19 Oct 2010) | 4 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-zbee-zcl.c
-
-From Fred Fierling:
-Infinite loop in ZCL Discover Attributes dissection
-
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5303
-------------------------------------------------------------------------
-r34581 | morriss | 2010-10-19 20:49:32 -0500 (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.
-------------------------------------------------------------------------
-r34595 | etxrab | 2010-10-20 15:50:39 -0500 (Wed, 20 Oct 2010) | 4 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-zbee-zcl.c
-From Fred Fierling:
-Cleanup of unnecessary tree == NULL checks in ZCL dissector
+Clear out old items.
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5321
------------------------------------------------------------------------
-r34597 | morriss | 2010-10-20 19:37:40 -0500 (Wed, 20 Oct 2010) | 9 lines
+r35660 | wmeier | 2011-01-26 09:02:28 -0800 (Wed, 26 Jan 2011) | 22 lines
Changed paths:
- M /trunk/epan/wslua/wslua_dumper.c
+ M /trunk-1.4/epan/dissectors/packet-ntlmssp.c
-From Holger Freyther via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5320 :
+Copy over revisions from trunk.
-Doing a Dumper:close() and then forcing the dumper to be garbage collected will
-cause a segfault.
-
-The code attempts to handle the GC that could follow but fails to do it
-properly. Assigning Dumper dp = NULL will only have an affect within the scope
-of this method... Assumingly this should be a *dp = NULL.
------------------------------------------------------------------------
-r34601 | stig | 2010-10-21 02:13:43 -0500 (Thu, 21 Oct 2010) | 2 lines
+r34018 | morriss | 2010-08-30 13:05:37 -0400 (Mon, 30 Aug 2010) | 5 lines
Changed paths:
- M /trunk/dumpcap.c
- M /trunk/gtk/main.c
- M /trunk/rawshark.c
- M /trunk/tshark.c
- M /trunk/version_info.c
- M /trunk/version_info.h
+ M /trunk/epan/dissectors/packet-ntlmssp.c
-Fixed "Compiled with" information in the About box.
-------------------------------------------------------------------------
-r34657 | jake | 2010-10-27 01:48:39 -0500 (Wed, 27 Oct 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-multipart.c
+Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5157 :
-Supply an entry to use for unknown multipart subtype.
-------------------------------------------------------------------------
-r34658 | jake | 2010-10-27 01:49:18 -0500 (Wed, 27 Oct 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-http.c
+If get_unicode_or_ascii_string() returns a NULL pointer, return a pointer to an
+empty string back to our caller.
-Try to decode the unknown multipart subtype anyway.
------------------------------------------------------------------------
-r34659 | jake | 2010-10-27 01:49:39 -0500 (Wed, 27 Oct 2010) | 2 lines
+r34300 | wmeier | 2010-09-30 17:32:42 -0400 (Thu, 30 Sep 2010) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
-
-Try to decode the unknown multipart subtype anyway.
-------------------------------------------------------------------------
+ M /trunk/epan/dissectors/packet-ntlmssp.c
-
-Copy over with manual intervention:
+Fix some mangled comments (apparently mangled so that code could be commented out by an
+enclosing comment). The code is now commented out with #if 0.
------------------------------------------------------------------------
-r34522 | gerald | 2010-10-15 11:05:06 -0500 (Fri, 15 Oct 2010) | 7 lines
-Changed paths:
- M /trunk/doc/rawshark.pod
- M /trunk/rawshark.c
-
-Revision 27919 added the ability to feed a libpcap-formatted file to
-rawshark but broke the ability to feed it live packets with a
-pcap_pkthdr prefix on some 64-bit architectures.
-
-Add a "-p" flag which lets us explicitly handle file-based or
-memory-based packet record headers.
-------------------------------------------------------------------------
-
-Update the release notes.
------------------------------------------------------------------------
-r34892 | gerald | 2010-11-15 14:43:07 -0800 (Mon, 15 Nov 2010) | 76 lines
+r35661 | wmeier | 2011-01-26 09:24:24 -0800 (Wed, 26 Jan 2011) | 2 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/editcap.c
- M /trunk-1.4/epan/dissectors/packet-ip.c
- M /trunk-1.4/epan/dissectors/packet-nbns.c
- M /trunk-1.4/epan/libwireshark.def
- M /trunk-1.4/epan/nstime.c
- M /trunk-1.4/epan/nstime.h
- M /trunk-1.4/gtk/io_stat.c
- M /trunk-1.4/gtk/uat_gui.c
- M /trunk-1.4/wiretap/erf.c
-
-Copy over revisions from the trunk:
-
-------------------------------------------------------------------------
-r34661 | stig | 2010-10-27 02:45:31 -0500 (Wed, 27 Oct 2010) | 4 lines
-Changed paths:
- M /trunk/gtk/io_stat.c
-
-Calculate correct io->start_time.
-This fixes bug 5340.
-------------------------------------------------------------------------
-r34665 | etxrab | 2010-10-28 09:33:55 -0500 (Thu, 28 Oct 2010) | 3 lines
-Changed paths:
- M /trunk/wiretap/erf.c
-
-From Stephen Donnelly:
-Wireshark tools do not detect and read some ERF files correctly
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5344
-------------------------------------------------------------------------
-r34709 | stig | 2010-10-30 06:43:11 -0500 (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.
-------------------------------------------------------------------------
-r34742 | morriss | 2010-11-01 09:33:14 -0500 (Mon, 01 Nov 2010) | 12 lines
-Changed paths:
- M /trunk/editcap.c
-
-From Jose Pedro Oliveira via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5353 :
+Clear out old entries from "Updated Protocols" & "Update Capture File Suport".
-editcap -h sends 9 lines to stderr and the rest to stdout. This problem
-affects editcap 1.4.x (branch 1.4) and devel (trunk).
-
-How to duplicate:
- 1) run "editcap -h"
- 2) run "editcap -h > /dev/null"
-
-The attached patch replaces 9 ocurrences of "stderr" by "output" in the usage
-function.
------------------------------------------------------------------------
-r34750 | jake | 2010-11-02 03:48:06 -0500 (Tue, 02 Nov 2010) | 8 lines
+r35662 | wmeier | 2011-01-26 10:05:22 -0800 (Wed, 26 Jan 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ip.c
-
-From Simon Leinen:
-The IP Timestamp Option (RFC 781) has three variants. One (flag=0) just stores
-a sequence timestamps in the option, but the other two (flag=1 and flag=3)
-store alternate IP addresses and timestamps.
-
-From me:
-Mark option full when offset (pointer) is set to one, as per RFC 781.
-------------------------------------------------------------------------
-r34755 | cmaynard | 2010-11-02 13:43:26 -0500 (Tue, 02 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-nbns.c
-
-Removed call to proto_item_set_len() for SESSION_MESSAGE case. Protect some
-other of these calls with "if (ti != NULL)". Fixes bug 5289.
-------------------------------------------------------------------------
-
-
-Copy over with manual intervention:
-------------------------------------------------------------------------
-r34660 | stig | 2010-10-27 02:44:26 -0500 (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().
-------------------------------------------------------------------------
+ M /trunk-1.4/docbook/release-notes.xml
-Update the release notes.
+Update release notes re NTLMSSP fixes.
------------------------------------------------------------------------
-r34907 | etxrab | 2010-11-16 09:29:00 -0800 (Tue, 16 Nov 2010) | 1 line
+r35701 | gerald | 2011-01-30 09:06:15 -0800 (Sun, 30 Jan 2011) | 1 line
Changed paths:
- M /trunk-1.4/diameter/TGPPGmb.xml
- M /trunk-1.4/diameter/TGPPSh.xml
- M /trunk-1.4/diameter/dictionary.xml
- M /trunk-1.4/diameter/etsie2e4.xml
- M /trunk-1.4/diameter/gqpolicy.xml
- M /trunk-1.4/diameter/mobileipv4.xml
- M /trunk-1.4/diameter/nasreq.xml
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/manuf
-Update Diameter AVP:s
+[Automatic manuf, services and enterprise-numbers update for 2011-01-30]
------------------------------------------------------------------------
-r34909 | gerald | 2010-11-16 09:43:11 -0800 (Tue, 16 Nov 2010) | 84 lines
+r35792 | gerald | 2011-02-03 14:53:50 -0800 (Thu, 03 Feb 2011) | 16 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-agentx.c
- M /trunk-1.4/epan/dissectors/packet-sip.c
- M /trunk-1.4/gtk/dfilter_expr_dlg.c
- M /trunk-1.4/gtk/file_dlg_win32.c
- M /trunk-1.4/gtk/main_proto_draw.c
M /trunk-1.4/tshark.c
- M /trunk-1.4/wiretap/network_instruments.c
-
-Copy over revisions from the trunk:
+ M /trunk-1.4/wiretap/pcapng.c
-------------------------------------------------------------------------
-r34762 | jake | 2010-11-03 10:57:22 -0700 (Wed, 03 Nov 2010) | 4 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-agentx.c
+Copy over r35791 from the trunk.
-From Fulko Hew:
-The hex field highlighting when the 'PDU Header' sub-tree is selected
-highlights 5 octets rather than the correct 4 (only) octets.
------------------------------------------------------------------------
-r34765 | jake | 2010-11-03 13:44:46 -0700 (Wed, 03 Nov 2010) | 6 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-agentx.c
-
-From Fulko Hew:
-According to RFC 2741 section 6.2.1 the Open-PDU can have an o.id
-field containing a 'null' identifier. The dissector currently does
-not handle it and causes other (misleading) error messages to appear
-on the decode window.
-------------------------------------------------------------------------
-r34779 | jake | 2010-11-04 13:53:02 -0700 (Thu, 04 Nov 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
-
-Prevent false related packet information, which may be missing or ignored.
-------------------------------------------------------------------------
-r34783 | etxrab | 2010-11-05 00:14:21 -0700 (Fri, 05 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/wiretap/network_instruments.c
-
-From Robert Bullen:
-Network Instruments' trace files sometimes cannot be read with an error message of "Observer: bad record: Invalid magic number"
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5330
-------------------------------------------------------------------------
-r34791 | etxrab | 2010-11-05 08:01:05 -0700 (Fri, 05 Nov 2010) | 2 lines
+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
-Bug fix: Running tshark with the following command will leave a temp file on the file system.
-\tshark -f "port 53" -a duration:1 -z proto,col info,dns.qry.type,dns.qry.type
-------------------------------------------------------------------------
-r34796 | etxrab | 2010-11-06 08:25:34 -0700 (Sat, 06 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/gtk/main_proto_draw.c
-
-From Alexander Koeppe:
-Patch that fixes overflowing highlighting of data.
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5374
-------------------------------------------------------------------------
-r34821 | stig | 2010-11-09 04:31:50 -0800 (Tue, 09 Nov 2010) | 5 lines
-Changed paths:
- M /trunk/gtk/main_proto_draw.c
-
-Added check for valid finfo->ds_tvb in packet_hex_print(), as we do not
-always have finfo->ds_tvb.
-
-This bug was introdused in revision 34796.
-------------------------------------------------------------------------
-
-
-Copy over with manual intervention:
+From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't
+free uninitialized memory.
-------------------------------------------------------------------------
-r34759 | cmaynard | 2010-11-03 07:45:17 -0700 (Wed, 03 Nov 2010) | 4 lines
-Changed paths:
- M /trunk/gtk/file_dlg_win32.c
-
-Use g_utf16_toutf8() instead of utf_16to8() to avoid the last display filter
-applied from being overwritten. Fixes bug 3894. Also, combined the open and
-merge filters into one, so we have a single most recently used filter.
-------------------------------------------------------------------------
-r34785 | stig | 2010-11-05 01:10:40 -0700 (Fri, 05 Nov 2010) | 5 lines
-Changed paths:
- M /trunk/gtk/dfilter_expr_dlg.c
-
-Corrected an if-statement in field_select_row_cb() where checking for
-hfinfo->strings and hfinfo->display.
-
-This bug was found by clang.
+See also: bug 5652.
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r34916 | gerald | 2010-11-16 13:18:03 -0800 (Tue, 16 Nov 2010) | 59 lines
+r35794 | gerald | 2011-02-03 14:56:46 -0800 (Thu, 03 Feb 2011) | 2 lines
Changed paths:
- M /trunk-1.4/config.nmake
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/dumpcap.c
- M /trunk-1.4/epan/dissectors/packet-ancp.c
- M /trunk-1.4/epan/dissectors/packet-tcp.c
- M /trunk-1.4/epan/libwireshark.def
- M /trunk-1.4/epan/wspython/wspy_libws.py
- M /trunk-1.4/gtk/sctp_graph_dlg.c
-
-Copy over revisions from the trunk:
-------------------------------------------------------------------------
-r34799 | etxrab | 2010-11-06 14:05:45 -0700 (Sat, 06 Nov 2010) | 4 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-tcp.c
+Update revision numbers.
-display the the PDU length as "cut short"if it crosses the boundary of the
- * packet and no more packets are available.
-Based on the patch from Alexander Koeppe in
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5285
------------------------------------------------------------------------
-r34823 | tuexen | 2010-11-09 08:29:15 -0800 (Tue, 09 Nov 2010) | 4 lines
+r35798 | morriss | 2011-02-03 18:15:16 -0800 (Thu, 03 Feb 2011) | 8 lines
Changed paths:
- M /trunk/gtk/sctp_graph_dlg.c
+ M /trunk-1.4/wiretap/pcapng.c
-Bugfix from Irene Ruengeler to improve the TSN plot for SCTP
-when large gap reports are present.
-------------------------------------------------------------------------
-r34829 | wmeier | 2010-11-09 15:03:47 -0800 (Tue, 09 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/config.nmake
+Copy over revision from trunk:
-From Michael Wells: Fix "missing path seperator in config.nmake"
-See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378
------------------------------------------------------------------------
-r34841 | guy | 2010-11-10 23:34:12 -0800 (Wed, 10 Nov 2010) | 4 lines
-Changed paths:
- M /trunk/dumpcap.c
+r35796 | morriss | 2011-02-03 21:08:47 -0500 (Thu, 03 Feb 2011) | 1 line
-OS X 10.6.5 is out, and it re-incorporates the libpcap workaround for
-the BPF BIOCSRTIMEOUT bug in 64-bit mode, so we don't need to do our own
-workaround in 10.6.5 or later.
-------------------------------------------------------------------------
-r34848 | stig | 2010-11-12 05:32:04 -0800 (Fri, 12 Nov 2010) | 4 lines
-Changed paths:
- M /trunk/epan/wspython/wspy_libws.py
+Use g_strdup() instead of strdup()
-Use python comments in python code.
-Reported by Emil Wojak in bug 5389.
------------------------------------------------------------------------
-r34867 | sfisher | 2010-11-14 07:53:41 -0800 (Sun, 14 Nov 2010) | 6 lines
+r35802 | guy | 2011-02-03 18:28:11 -0800 (Thu, 03 Feb 2011) | 12 lines
Changed paths:
- M /trunk/epan/libwireshark.def
+ M /trunk-1.4/wiretap/pcapng.c
-Add proto_item_append_string() to exported functions per:
+Copy over revision from trunk:
- http://www.wireshark.org/lists/wireshark-dev/201011/msg00153.html
------------------------------------------------------------------------
-r34879 | jake | 2010-11-15 10:28:36 -0800 (Mon, 15 Nov 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-ancp.c
+r35800 | guy | 2011-02-03 18:24:33 -0800 (Thu, 03 Feb 2011) | 7 lines
-Skip reserved word in ANCP OAM-Loopback-Test-Parameters TLV.
-------------------------------------------------------------------------
+Put more data into the "additional error information" messages.
-Update the release notes.
+Get rid of debugging printouts that are equivalent to the "additional
+error information" messages.
-------------------------------------------------------------------------
-r34917 | gerald | 2010-11-16 16:05:32 -0800 (Tue, 16 Nov 2010) | 11 lines
-Changed paths:
- M /trunk-1.4/Makefile.nmake
-
-Copy over r33460 from the trunk:
+Return additional error info for all WTAP_ERR_BAD_RECORD errors.
------------------------------------------------------------------------
-r33460 | gerald | 2010-07-06 15:35:33 -0700 (Tue, 06 Jul 2010) | 2 lines
+r35812 | guy | 2011-02-04 02:21:50 -0800 (Fri, 04 Feb 2011) | 7 lines
Changed paths:
- M /trunk/Makefile.nmake
-
-Add a target which creates a zip file containing our .pdb files.
-------------------------------------------------------------------------
+ M /trunk-1.4/wiretap/k12.c
+Copy over revision from trunk:
------------------------------------------------------------------------
-r34937 | etxrab | 2010-11-17 14:01:14 -0800 (Wed, 17 Nov 2010) | 1 line
-Changed paths:
- M /trunk-1.4/diameter/dictionary.xml
- M /trunk-1.4/diameter/nasreq.xml
+r35809 | guy | 2011-02-04 01:45:39 -0800 (Fri, 04 Feb 2011) | 2 lines
-Update Diameter AVP:s
-------------------------------------------------------------------------
-r34939 | gerald | 2010-11-17 15:52:44 -0800 (Wed, 17 Nov 2010) | 11 lines
-Changed paths:
- M /trunk-1.4/dumpcap.c
-
-Copy over r34938 from the trunk:
+Set the error code and additional information string in more cases.
------------------------------------------------------------------------
-r34938 | gerald | 2010-11-17 15:51:31 -0800 (Wed, 17 Nov 2010) | 3 lines
+r35826 | gerald | 2011-02-04 08:24:32 -0800 (Fri, 04 Feb 2011) | 2 lines
Changed paths:
- M /trunk/dumpcap.c
+ M /trunk-1.4/docbook/release-notes.xml
-Set the pipe read timeout to 100 milliseconds instead of 100 microseconds.
-Should fix bug 5309.
-------------------------------------------------------------------------
+Add a CVE ID.
------------------------------------------------------------------------
-r34948 | gerald | 2010-11-18 10:14:23 -0800 (Thu, 18 Nov 2010) | 11 lines
+r35833 | etxrab | 2011-02-05 04:20:47 -0800 (Sat, 05 Feb 2011) | 8 lines
Changed paths:
- M /trunk-1.4/packaging/macosx/osx-app.sh
-
-Copy over r34583 from the trunk:
+ M /trunk-1.4/asn1/ansi_map/ansi_map.asn
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-ansi_map.c
+Log:
+ Copy over revision from trunk:
+
+ ------------------------------------------------------------------------
+35556 |etxrab |Sun Jan 16 18:36:17 2011 UTC
+
+ From Porus Mehta:
+Corrections to ANSI MAP ASN.1 specifications.
------------------------------------------------------------------------
-r34583 | stig | 2010-10-20 03:37:11 -0700 (Wed, 20 Oct 2010) | 2 lines
+r35835 | etxrab | 2011-02-05 06:49:12 -0800 (Sat, 05 Feb 2011) | 9 lines
Changed paths:
- M /trunk/packaging/macosx/osx-app.sh
+ M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.c
+ M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.h
+ M /trunk-1.4/asn1/ansi_tcap/packet-ansi_tcap-template.c
+ M /trunk-1.4/epan/dissectors/packet-ansi_map.c
+ M /trunk-1.4/epan/dissectors/packet-ansi_map.h
+ M /trunk-1.4/epan/dissectors/packet-ansi_tcap.c
-Copy GDK pixbuf loaders libs to the Wireshark.app.
-------------------------------------------------------------------------
+Copy ower:
+http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35822
+User: etxrab
+Date: 2011/02/04 08:13 AM
+Log:
+ Introduce preferences to set the strictness of Invoke/response
+ tracking.
------------------------------------------------------------------------
-r34949 | gerald | 2010-11-18 10:15:26 -0800 (Thu, 18 Nov 2010) | 2 lines
+r35838 | gerald | 2011-02-06 09:04:41 -0800 (Sun, 06 Feb 2011) | 1 line
Changed paths:
- M /trunk-1.4/ChangeLog
- M /trunk-1.4/NEWS
- M /trunk-1.4/docbook/release-notes.xml
-
-Update the release notes and ChangeLog/NEWS.
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/manuf
+[Automatic manuf, services and enterprise-numbers update for 2011-02-06]
------------------------------------------------------------------------
-r34952 | gerald | 2010-11-18 10:19:02 -0800 (Thu, 18 Nov 2010) | 2 lines
+r35857 | gerald | 2011-02-07 11:39:56 -0800 (Mon, 07 Feb 2011) | 5 lines
Changed paths:
- M /trunk-1.4/version.conf
-
-Build 1.4.2.
+ M /trunk-1.4/wiretap/pcapng.c
-------------------------------------------------------------------------
-r34957 | gerald | 2010-11-18 13:16:33 -0800 (Thu, 18 Nov 2010) | 2 lines
-Changed paths:
- M /trunk-1.4/NEWS
- M /trunk-1.4/docbook/release-notes.xml
+Check for a large packet_len. Fixes a bug reported by Huzaifa
+Sidhpurwala of the Red Hat Security Response Team.
-Fix version info.
+See also: bug 5661.
------------------------------------------------------------------------
-r34959 | gerald | 2010-11-18 13:20:38 -0800 (Thu, 18 Nov 2010) | 2 lines
+r35859 | gerald | 2011-02-07 11:43:07 -0800 (Mon, 07 Feb 2011) | 2 lines
Changed paths:
- M /trunk-1.4/NEWS
M /trunk-1.4/docbook/release-notes.xml
-More release note fixes.
+Update the release notes.
------------------------------------------------------------------------
-r34982 | gerald | 2010-11-19 11:53:06 -0800 (Fri, 19 Nov 2010) | 2 lines
+r35925 | gerald | 2011-02-11 16:07:21 -0800 (Fri, 11 Feb 2011) | 2 lines
Changed paths:
M /trunk-1.4/config.nmake
- M /trunk-1.4/configure.in
- M /trunk-1.4/debian/changelog
- M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/version.conf
-
-1.4.2 → 1.4.3.
-
-------------------------------------------------------------------------
-r34993 | gerald | 2010-11-21 09:04:25 -0800 (Sun, 21 Nov 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2010-11-21]
-------------------------------------------------------------------------
-r35052 | gerald | 2010-11-28 09:04:31 -0800 (Sun, 28 Nov 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
-[Automatic manuf, services and enterprise-numbers update for 2010-11-28]
-------------------------------------------------------------------------
-r35121 | gerald | 2010-12-05 09:04:35 -0800 (Sun, 05 Dec 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
+Check for Python 2.7.
-[Automatic manuf, services and enterprise-numbers update for 2010-12-05]
------------------------------------------------------------------------
-r35123 | gerald | 2010-12-05 10:33:00 -0800 (Sun, 05 Dec 2010) | 1 line
+r35932 | gerald | 2011-02-12 09:57:26 -0800 (Sat, 12 Feb 2011) | 2 lines
Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/packaging/portableapps/win32/makefile.nmake
-[Automatic manuf, services and enterprise-numbers update for 2010-12-05]
-------------------------------------------------------------------------
-r35179 | gerald | 2010-12-12 09:04:33 -0800 (Sun, 12 Dec 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
+Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.
-[Automatic manuf, services and enterprise-numbers update for 2010-12-12]
------------------------------------------------------------------------
-r35221 | gerald | 2010-12-19 09:04:10 -0800 (Sun, 19 Dec 2010) | 1 line
+r35941 | gerald | 2011-02-13 09:04:45 -0800 (Sun, 13 Feb 2011) | 1 line
Changed paths:
M /trunk-1.4/epan/enterprise-numbers
M /trunk-1.4/manuf
-[Automatic manuf, services and enterprise-numbers update for 2010-12-19]
+[Automatic manuf, services and enterprise-numbers update for 2011-02-13]
------------------------------------------------------------------------
-r35264 | gerald | 2010-12-26 09:04:20 -0800 (Sun, 26 Dec 2010) | 1 line
-Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2010-12-26]
-------------------------------------------------------------------------
-r35326 | gerald | 2011-01-02 09:04:24 -0800 (Sun, 02 Jan 2011) | 1 line
+r36014 | gerald | 2011-02-20 09:04:17 -0800 (Sun, 20 Feb 2011) | 1 line
Changed paths:
M /trunk-1.4/epan/enterprise-numbers
M /trunk-1.4/manuf
+ M /trunk-1.4/services
-[Automatic manuf, services and enterprise-numbers update for 2011-01-02]
+[Automatic manuf, services and enterprise-numbers update for 2011-02-20]
------------------------------------------------------------------------
-r35415 | gerald | 2011-01-06 16:49:51 -0800 (Thu, 06 Jan 2011) | 119 lines
+r36024 | jake | 2011-02-21 14:00:45 -0800 (Mon, 21 Feb 2011) | 2 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-dhcpv6.c
- M /trunk-1.4/epan/dissectors/packet-ieee80211.c
- M /trunk-1.4/epan/dissectors/packet-infiniband.c
- M /trunk-1.4/epan/dissectors/packet-per.c
- M /trunk-1.4/epan/dissectors/packet-sip.c
- M /trunk-1.4/epan/to_str.c
- M /trunk-1.4/epan/tvbuff.c
- M /trunk-1.4/gtk/main.c
- M /trunk-1.4/plugins/asn1/packet-asn1.c
- M /trunk-1.4/version_info.c
- M /trunk-1.4/wsutil/Makefile.am
- M /trunk-1.4/wsutil/file_util.c
-
-Copy over revisions from the trunk:
-------------------------------------------------------------------------
-r33820 | sfisher | 2010-08-16 14:41:29 -0700 (Mon, 16 Aug 2010) | 1 line
-Changed paths:
- M /trunk/epan/dissectors/packet-dhcpv6.c
+Clean up the release notes.
-Fix display of Client's FQDN and clear up the confusion with the S, O and N bits from the RFC descriptions.
------------------------------------------------------------------------
-r34764 | wmeier | 2010-11-03 11:37:29 -0700 (Wed, 03 Nov 2010) | 2 lines
+r36027 | jake | 2011-02-22 11:42:40 -0800 (Tue, 22 Feb 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
+ M /trunk-1.4/docbook/release-notes.xml
-(Trivial): Fix up a comment.
-------------------------------------------------------------------------
-r35004 | etxrab | 2010-11-22 07:02:06 -0800 (Mon, 22 Nov 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
+Fix the cleanup.
-Remove faulty return, probably forgotten during test.
-Fixing dissection on Via header.
------------------------------------------------------------------------
-r35010 | gerald | 2010-11-22 12:43:22 -0800 (Mon, 22 Nov 2010) | 3 lines
+r36030 | jake | 2011-02-22 23:23:36 -0800 (Tue, 22 Feb 2011) | 30 lines
Changed paths:
- M /trunk/wsutil/file_util.c
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-bittorrent.c
+ M /trunk-1.4/epan/dissectors/packet-dtpt.c
+ M /trunk-1.4/epan/dissectors/packet-quake.c
+ M /trunk-1.4/epan/wslua/wslua_pinfo.c
-Make sure we pass a directory path and not a file path to
-SetCurrentDirectory. Should fix bug 5420.
-------------------------------------------------------------------------
-r35015 | etxrab | 2010-11-23 09:33:57 -0800 (Tue, 23 Nov 2010) | 2 lines
-Changed paths:
- M /trunk/epan/tvbuff.c
+Copy over revisions from the trunk:
-From Vincent Helfre:
-Bug in tvb_get_bits32(), The last bitshift is too large, which causes the least significant bits to be 0 all the time.
------------------------------------------------------------------------
-r35021 | etxrab | 2010-11-24 08:21:04 -0800 (Wed, 24 Nov 2010) | 3 lines
+r33136 | wmeier | 2010-06-07 18:32:21 +0200 (Mon, 07 Jun 2010) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-per.c
+ M /trunk/epan/dissectors/packet-bittorrent.c
+ M /trunk/epan/dissectors/packet-dtpt.c
+ M /trunk/epan/dissectors/packet-quake.c
-From Johannes Lange:
-Bug 5393 - Wrong length calculation in new_octet_aligned_subset_bits() (PER dissector) .
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5393
+Use find_or_create_conversation() rather than only conversation_new().
+Fixes bug #2907: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907
------------------------------------------------------------------------
-r35023 | etxrab | 2010-11-24 08:35:23 -0800 (Wed, 24 Nov 2010) | 3 lines
+r34618 | stig | 2010-10-22 08:47:00 +0200 (Fri, 22 Oct 2010) | 4 lines
Changed paths:
- M /trunk/epan/dissectors/packet-per.c
+ M /trunk/epan/wslua/wslua_pinfo.c
-From Johannes Lange:
-Function dissect_per_bit_string_display might read more bytes than available (PER dissector).
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5394
+From Regis Cridlig via bug 5326:
+The Lua text string passed to column:set(text) by a dissector will eventually
+be reclaimed. This causes the column to display incorrect characters.
------------------------------------------------------------------------
-r35030 | rbalint | 2010-11-25 15:00:16 -0800 (Thu, 25 Nov 2010) | 4 lines
+r35795 | jake | 2011-02-04 00:17:31 +0100 (Fri, 04 Feb 2011) | 5 lines
Changed paths:
- M /trunk/wsutil/Makefile.am
+ M /trunk/epan/wslua/wslua_pinfo.c
-Add libtool version info to libwsutil.
-From Eloy Paris <peloy@debian.org>
-http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/branches/wireshark-1.4.x%2Blibseparation/debian/patches/25_libwsutil-version.patch
+From David Carne:
+col_set_str simply stores the pointer passed to it, and luaL_checkstring
+returns a temporary pointer. Changing col_set_str to col_add_str in
+Columns_newindex seems to fix the issue.
------------------------------------------------------------------------
-r35055 | etxrab | 2010-11-28 13:03:43 -0800 (Sun, 28 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/plugins/asn1/packet-asn1.c
-From Robert Groenenberg:
-Assert when using ASN.1 dissector with loading a 'type table'
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5447
------------------------------------------------------------------------
-r35056 | etxrab | 2010-11-28 13:08:03 -0800 (Sun, 28 Nov 2010) | 3 lines
+r36036 | gerald | 2011-02-23 13:49:51 -0800 (Wed, 23 Feb 2011) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-infiniband.c
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-6lowpan.c
-From Slava:
-Bug with RWH parsing in Infiniband dissector.
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5444
-------------------------------------------------------------------------
-r35074 | sake | 2010-11-29 14:50:21 -0800 (Mon, 29 Nov 2010) | 3 lines
-Changed paths:
- M /trunk/gtk/main.c
+Paul Makowski discovered that 32 bit systems could crash while reading a
+malformed 6LoWPAN packet.
-Fix "colorize with filter" functionality that got broken with the new_packet_list.
------------------------------------------------------------------------
-r35086 | wmeier | 2010-11-30 17:31:49 -0800 (Tue, 30 Nov 2010) | 13 lines
+r36038 | gerald | 2011-02-23 15:05:41 -0800 (Wed, 23 Feb 2011) | 2 lines
Changed paths:
- M /trunk/epan/to_str.c
-
-On Windows: convert _tzname[] strings from the system charset to UTF8 before use.
-
- In the Windows C Runtime the strings in the global array _tzname[]
- are encoded using the "system default ansi code page".
- They must be converted to UTF8 before use by Wireshark/GTK.
- (See comment in the code for details).
+ M /trunk-1.4/docbook/release-notes.xml
- Fixes Bug #5421 (I hope).
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5421
+Fix attribution.
-Also: Fix bug: when the timezone name is not available from the system
- ?ST was used when ?DT should have been used (and vice-versa).
------------------------------------------------------------------------
-r35090 | sfisher | 2010-12-01 08:39:28 -0800 (Wed, 01 Dec 2010) | 1 line
+r36041 | etxrab | 2011-02-23 22:17:25 -0800 (Wed, 23 Feb 2011) | 1 line
Changed paths:
- M /trunk/version_info.c
+ M /trunk-1.4/epan/dissectors/packet-isup.c
-Fix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of MSDN code fragments.
+Register the BICC dissector by name.
------------------------------------------------------------------------
-
-
-Copy over by hand:
-------------------------------------------------------------------------
-r35016 | etxrab | 2010-11-23 11:42:11 -0800 (Tue, 23 Nov 2010) | 2 lines
+r36043 | etxrab | 2011-02-23 22:23:54 -0800 (Wed, 23 Feb 2011) | 1 line
Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
-
-Remove Supported Channels lenght check fixes
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5430
-------------------------------------------------------------------------
-
-Update the release notes.
+ M /trunk-1.4/diameter/dictionary.xml
+Update Diameter files.
------------------------------------------------------------------------
-r35416 | gerald | 2011-01-06 17:31:01 -0800 (Thu, 06 Jan 2011) | 145 lines
+r36046 | jake | 2011-02-23 23:50:30 -0800 (Wed, 23 Feb 2011) | 61 lines
Changed paths:
+ M /trunk-1.4/asn1/snmp/packet-snmp-template.c
M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/addr_resolv.c
M /trunk-1.4/epan/dfilter/semcheck.c
- M /trunk-1.4/epan/dissectors/packet-catapult-dct2000.c
- M /trunk-1.4/epan/dissectors/packet-cigi.c
- M /trunk-1.4/epan/dissectors/packet-gsm_a_gm.c
- M /trunk-1.4/epan/dissectors/packet-mp2t.c
- M /trunk-1.4/epan/dissectors/packet-sccp.c
- M /trunk-1.4/epan/dissectors/packet-ssl-utils.c
- M /trunk-1.4/epan/dissectors/packet-ssl-utils.h
- M /trunk-1.4/epan/dissectors/packet-ssl.c
- M /trunk-1.4/epan/emem.c
- M /trunk-1.4/epan/reassemble.c
- M /trunk-1.4/gtk/rtp_stream_dlg.c
- M /trunk-1.4/radius/README.radius_dictionary
- M /trunk-1.4/radius/dictionary.ascend
+ M /trunk-1.4/epan/dissectors/packet-p_mul.c
+ M /trunk-1.4/epan/dissectors/packet-snmp.c
+ M /trunk-1.4/epan/oids.c
+ M /trunk-1.4/gtk/main_proto_draw.c
Copy over revisions from the trunk:
------------------------------------------------------------------------
-r35091 | etxrab | 2010-12-01 09:34:26 -0800 (Wed, 01 Dec 2010) | 3 lines
+r35583 | sfisher | 2011-01-19 18:58:53 +0100 (Wed, 19 Jan 2011) | 5 lines
Changed paths:
- M /trunk/radius/README.radius_dictionary
- M /trunk/radius/dictionary.ascend
+ M /trunk/gtk/main_proto_draw.c
-Delegated-IPv6-Prefix(123) is shown incorrect as X-Ascend-Call-Attempt-Limit(123)
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5455
+From Cal Turney via bug #5585: When searching in packet bytes, the field and
+bytes are not immediately shown.
------------------------------------------------------------------------
-r35097 | morriss | 2010-12-01 15:12:46 -0800 (Wed, 01 Dec 2010) | 7 lines
+r35594 | jake | 2011-01-20 09:58:03 +0100 (Thu, 20 Jan 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-sccp.c
-
-From Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :
+ M /trunk/asn1/snmp/packet-snmp-template.c
+ M /trunk/epan/dissectors/packet-snmp.c
-The packet-sccp.c has a bug in the declared valid ranges of the SSN and DPC
-values in the user table used to match to a subdissector. The SSN range is 16
-bits rather than 8 (not really an issue) but the DPC range is 16 bits rather
-than 24 - so many traces cannot be matched by this table.
+Allow for expert items to be actually attached somewhere.
------------------------------------------------------------------------
-r35128 | sfisher | 2010-12-06 09:30:08 -0800 (Mon, 06 Dec 2010) | 8 lines
+r35599 | jake | 2011-01-20 21:04:39 +0100 (Thu, 20 Jan 2011) | 2 lines
Changed paths:
- M /trunk/epan/emem.c
+ M /trunk/epan/oids.c
-Fix bug #5463 (and likely others) so that ep_strbuf_new() no longer
-truncates newly created and copied strings. The problem was that
-strlen() (which returns a length not counting the NULL terminator) was
-being mixed with functions that do malloc() (which need to allocate
-memory large enough to inculde the NULL string terminator).
+Allow presentation of Gauge32 values larger than 0x7FFFFFFF.
------------------------------------------------------------------------
-r35151 | wmeier | 2010-12-07 15:27:11 -0800 (Tue, 07 Dec 2010) | 2 lines
+r35621 | morriss | 2011-01-22 16:15:51 +0100 (Sat, 22 Jan 2011) | 14 lines
Changed paths:
- M /trunk/epan/dissectors/packet-mp2t.c
+ M /trunk/epan/dfilter/semcheck.c
-Init fragment_table and reassembly table every "session" rather than just once in proto_register...()
-------------------------------------------------------------------------
-r35153 | etxrab | 2010-12-07 22:32:04 -0800 (Tue, 07 Dec 2010) | 2 lines
-Changed paths:
- M /trunk/epan/reassemble.c
+From Johannes Lange via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606 :
-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.
-------------------------------------------------------------------------
-r35154 | etxrab | 2010-12-08 00:26:40 -0800 (Wed, 08 Dec 2010) | 1 line
-Changed paths:
- M /trunk/epan/reassemble.c
+In semcheck.c the display filter string of an expression is checked against the
+header_field_info.display value BASE_CUSTOM. But the value of BASE_CUSTOM is
+applied as bitmask while the actual type is an enum (BASE_CUSTOM = 6).
-fragment_free_key to be used only if Glib >= 2.10
-------------------------------------------------------------------------
-r35155 | etxrab | 2010-12-08 01:12:03 -0800 (Wed, 08 Dec 2010) | 2 lines
-Changed paths:
- M /trunk/epan/reassemble.c
+With this BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC are also matching and are not
+accepted as filter expression.
-reassemble.c: In function 'free_all_fragments':
-reassemble.c:222: warning: unused variable 'key'
-------------------------------------------------------------------------
-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'
+Actually: BASE_DEC works but not BASE_HEX. And the problem only shows up when
+trying to match a field in one of these bases against a string (from a
+value_string).
------------------------------------------------------------------------
-r35175 | wmeier | 2010-12-10 19:22:09 -0800 (Fri, 10 Dec 2010) | 4 lines
+r35626 | stig | 2011-01-22 19:07:28 +0100 (Sat, 22 Jan 2011) | 6 lines
Changed paths:
- M /trunk/epan/reassemble.c
+ M /trunk/epan/dissectors/packet-p_mul.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
+Ensure we keep the pkg_data pointer for the init routine to cleanup correctly,
+because the ep memory is cleared before the init routine is called.
+
+Fixed the variable name for the no_yes true_false_string.
+Update reference to protocol description.
------------------------------------------------------------------------
-r35176 | wmeier | 2010-12-10 20:11:31 -0800 (Fri, 10 Dec 2010) | 2 lines
+r35651 | jake | 2011-01-25 23:11:59 +0100 (Tue, 25 Jan 2011) | 4 lines
Changed paths:
- M /trunk/epan/reassemble.c
+ M /trunk/epan/addr_resolv.c
-Rework some comments.
+Fix fo bug 5615:
+Remove the filters on IPv6 Link Local and Multicast addresses, since
+these _can_ be resolved through the hosts file and manual entry.
------------------------------------------------------------------------
-r35194 | jake | 2010-12-15 23:25:01 -0800 (Wed, 15 Dec 2010) | 4 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-gsm_a_gm.c
-Fix for bug 5475:
-Track dissection properly of Packet Flow Identifier IE to
-avoid Extraneous Data reporting.
------------------------------------------------------------------------
-r35216 | sake | 2010-12-17 17:16:11 -0800 (Fri, 17 Dec 2010) | 5 lines
+r36050 | gerald | 2011-02-24 10:37:21 -0800 (Thu, 24 Feb 2011) | 12 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ssl-utils.c
- M /trunk/epan/dissectors/packet-ssl-utils.h
- M /trunk/epan/dissectors/packet-ssl.c
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/wiretap/dct3trace.c
-Add support for the TLSv1.2 format of the CertificateRequest handshake message.
+Copy over r35953 from the trunk:
-(see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5485 )
------------------------------------------------------------------------
-r35228 | martinm | 2010-12-20 03:26:50 -0800 (Mon, 20 Dec 2010) | 3 lines
+r35953 | gerald | 2011-02-15 16:42:06 -0800 (Tue, 15 Feb 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-catapult-dct2000.c
+ M /trunk/wiretap/dct3trace.c
-From Papan Kumar Singh (bug 5504 & 5505):
-Add missing break so that PDCP-LTE direction is set properly.
+Fix a buffer overflow found by the Visual C++ analyzer.
------------------------------------------------------------------------
-r35241 | jake | 2010-12-21 13:29:47 -0800 (Tue, 21 Dec 2010) | 12 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-cigi.c
-From daulis0@gmail.com:
-There are 2 parts to the CIGI protocol. 1) Host to IG messages and 2) IG to
-Host messages. Currently, Host to IG messages are parsed correctly, but IG to
-Host messages show Malformed Packet (or may not even detect as CIGI at all)
-
-Some of the protocol format is different between versions. The "Minor Version"
-is used by the dissector to separate the differences, but this field is in a
-different location in the IG Control Packet (Host to IG message) vs the Start
-of Frame Packet (IG to Host message).
+Update the release notes.
-Attached patch to correct this.
------------------------------------------------------------------------
-r35247 | jake | 2010-12-22 12:24:51 -0800 (Wed, 22 Dec 2010) | 3 lines
+r36053 | gerald | 2011-02-24 12:07:11 -0800 (Thu, 24 Feb 2011) | 27 lines
Changed paths:
- M /trunk/gtk/rtp_stream_dlg.c
-
-Fix for bug 5513:
-Prepare filter must take Fwd and Rev part in combined filter.
-------------------------------------------------------------------------
-
+ M /trunk-1.4/asn1/ldap/packet-ldap-template.c
+ M /trunk-1.4/asn1/ldap/packet-ldap-template.h
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-dns.c
+ M /trunk-1.4/epan/dissectors/packet-dns.h
+ M /trunk-1.4/epan/dissectors/packet-ldap.c
+ M /trunk-1.4/epan/dissectors/packet-ldap.h
+ M /trunk-1.4/epan/dissectors/packet-smb-common.c
+ M /trunk-1.4/epan/dissectors/packet-smb-common.h
+ M /trunk-1.4/epan/dissectors/packet-smb-logon.c
-Copy over manually:
+Copy over r36029 with manual assistance:
------------------------------------------------------------------------
-r35115 | morriss | 2010-12-03 14:59:16 -0800 (Fri, 03 Dec 2010) | 5 lines
+r36029 | gerald | 2011-02-22 16:51:02 -0800 (Tue, 22 Feb 2011) | 9 lines
Changed paths:
- M /trunk/epan/dfilter/semcheck.c
+ 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().
-Fix a problem noticed in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380#c2 :
+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().
-Don't attempt to use a BASE_CUSTOM field's 'strings' field as a
-value_string: it's not, it's a pointer to a function.
+Fixes infinite recursion errors found by joernchen of Phenoelit.
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r35424 | gerald | 2011-01-07 16:35:26 -0800 (Fri, 07 Jan 2011) | 54 lines
+r36056 | jake | 2011-02-24 14:12:02 -0800 (Thu, 24 Feb 2011) | 55 lines
Changed paths:
+ M /trunk-1.4/cmake/modules/FindGTK2.cmake
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-cfm.c
- M /trunk-1.4/epan/dissectors/packet-gsm_a_bssmap.c
- M /trunk-1.4/epan/dissectors/packet-ltp.c
- M /trunk-1.4/epan/dissectors/packet-wps.c
- M /trunk-1.4/wiretap/netmon.c
+ M /trunk-1.4/epan/dissectors/packet-dcm.c
+ M /trunk-1.4/epan/dissectors/packet-dhcpv6.c
+ M /trunk-1.4/epan/dissectors/packet-hip.c
+ M /trunk-1.4/epan/dissectors/packet-lldp.c
+ M /trunk-1.4/gtk/voip_calls.c
Copy over revisions from the trunk:
------------------------------------------------------------------------
-r35252 | jake | 2010-12-23 09:45:02 -0800 (Thu, 23 Dec 2010) | 3 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-cfm.c
-
-Fix for bug 5517:
-MEG ID, ICC-based format is text, not binary.
-------------------------------------------------------------------------
-r35267 | etxrab | 2010-12-26 13:23:06 -0800 (Sun, 26 Dec 2010) | 4 lines
+r35686 | sfisher | 2011-01-28 01:20:37 +0100 (Fri, 28 Jan 2011) | 7 lines
Changed paths:
- M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
-
-Correct:
-RESET IP RESOURCE
-RESET IP RESOURCE ACKNOWLEDGE
-Tags
-------------------------------------------------------------------------
-r35282 | jake | 2010-12-28 01:30:24 -0800 (Tue, 28 Dec 2010) | 3 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-wps.c
-
-From Masashi Honma:
-EAP WPS RF band may be '2.4 GHz and 5 GHz'.
-------------------------------------------------------------------------
-r35287 | cmaynard | 2010-12-28 10:02:24 -0800 (Tue, 28 Dec 2010) | 2 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-ltp.c
-
-Improve sanity checking of reception claim count. Fixes bug 5521.
-------------------------------------------------------------------------
-r35291 | guy | 2010-12-28 12:32:58 -0800 (Tue, 28 Dec 2010) | 4 lines
-Changed paths:
- M /trunk/wiretap/netmon.c
-
-It is not guaranteed that the records in numerical (frame table) order
-will be in sequential (byte offset) order in the file; don't treat the
-record offset going backwards as an error.
-------------------------------------------------------------------------
+ M /trunk/epan/dissectors/packet-dhcpv6.c
-Copy over by hand:
+Fix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly
+Add 30 years of seconds, not 20 years, since the DHCP_LLT time is seconds
+since Jan 1 2000 and epoch is 30 years before that.
------------------------------------------------------------------------
-r35271 | etxrab | 2010-12-27 01:33:39 -0800 (Mon, 27 Dec 2010) | 1 line
+r35726 | wmeier | 2011-01-31 19:58:38 +0100 (Mon, 31 Jan 2011) | 8 lines
Changed paths:
- M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
+ M /trunk/epan/dissectors/packet-dcm.c
+ M /trunk/gtk/voip_calls.c
-Fix the Message numbering.
-------------------------------------------------------------------------
+Fix two cases of 'if (x = y)' which should be 'if (x == y)'.
-Update the release notes.
+Found by reviewing msvc level 4 warnings "assignment within conditional expression".
+(Unfortunately most of the warnings are false positives so this warning can't be enabled)
------------------------------------------------------------------------
-r35435 | gerald | 2011-01-09 09:04:18 -0800 (Sun, 09 Jan 2011) | 1 line
+r35737 | jake | 2011-01-31 23:31:05 +0100 (Mon, 31 Jan 2011) | 7 lines
Changed paths:
- M /trunk-1.4/epan/enterprise-numbers
- M /trunk-1.4/manuf
+ M /trunk/epan/dissectors/packet-lldp.c
-[Automatic manuf, services and enterprise-numbers update for 2011-01-09]
+From Johan Kristell:
+In the standard 802.3at-2009 the PoE+ TLVs are 12 bytes long, but in the
+earlier version 802.3bc-2009, they are 7 bytes long (the power type/
+source/priority, and the requested and allocated fields are lacking).
+Not respecting the length of the TLV leads to wireshark displaying garbage
+data and could lead to reading outside of buffer.
------------------------------------------------------------------------
-r35457 | gerald | 2011-01-10 10:20:24 -0800 (Mon, 10 Jan 2011) | 13 lines
+r35777 | jake | 2011-02-03 07:32:35 +0100 (Thu, 03 Feb 2011) | 8 lines
Changed paths:
- M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-mac-lte.c
+ M /trunk/epan/dissectors/packet-hip.c
-Copy over r35292 from the trunk:
+From Samu Varjonen:
+This patch fixes four issues with the Host Identity Protocol (HIP dissector:
+1. The incorrect parsing of the "type 1" locator of HIP.
+2. Updates the comments to reflect the approval of RFC 5770.
+3. Cosmetic change (uppercase SPI)
+4. Change in the checksum dissection
+ (when the HIP packet is UDP encapsulated 0 checksum is correct).
------------------------------------------------------------------------
-r35292 | gerald | 2010-12-28 12:47:48 -0800 (Tue, 28 Dec 2010) | 3 lines
+r35888 | jake | 2011-02-09 08:43:34 +0100 (Wed, 09 Feb 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-mac-lte.c
+ M /trunk/cmake/modules/FindGTK2.cmake
-From non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
-dissector. From me: Add a define, ep_allocate the buffer.
+Accommodate the CMake build on Ubuntu 10.10.
------------------------------------------------------------------------
-Update the release notes.
-
------------------------------------------------------------------------
-r35458 | gerald | 2011-01-10 10:32:48 -0800 (Mon, 10 Jan 2011) | 17 lines
+r36057 | gerald | 2011-02-24 15:10:30 -0800 (Thu, 24 Feb 2011) | 37 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-enttec.c
+ M /trunk-1.4/epan/dissectors/packet-gsm_a_gm.c
+ M /trunk-1.4/epan/dissectors/packet-gtp.c
+ M /trunk-1.4/epan/tfs.c
+ M /trunk-1.4/epan/tfs.h
+ M /trunk-1.4/gtk/capture_dlg.c
-Copy over r35318 from the trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
-r35318 | gerald | 2010-12-31 14:24:06 -0800 (Fri, 31 Dec 2010) | 7 lines
+r35596 | etxrab | 2011-01-20 05:19:26 -0800 (Thu, 20 Jan 2011) | 1 line
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.
+ M /trunk/epan/dissectors/packet-gtp.c
-From me: ep_allocate our buffers.
+Update a comment.
------------------------------------------------------------------------
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r35459 | gerald | 2011-01-10 10:41:02 -0800 (Mon, 10 Jan 2011) | 13 lines
+r35597 | etxrab | 2011-01-20 06:03:13 -0800 (Thu, 20 Jan 2011) | 1 line
Changed paths:
- 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-snmp.c
-
-Copy over r35298 with manual intervention:
+ M /trunk/epan/dissectors/packet-gtp.c
+Fix typos
------------------------------------------------------------------------
-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.
+Copy over with manual intervention:
------------------------------------------------------------------------
-r35462 | gerald | 2011-01-10 13:13:38 -0800 (Mon, 10 Jan 2011) | 140 lines
+r35561 | etxrab | 2011-01-16 14:32:22 -0800 (Sun, 16 Jan 2011) | 2 lines
Changed paths:
- M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/docbook/wsdg_src/WSDG_chapter_works.xml
- M /trunk-1.4/docbook/wsug_src/WSUG_chapter_capture.xml
- M /trunk-1.4/epan/dissectors/packet-amqp.c
- M /trunk-1.4/epan/dissectors/packet-ber.c
- M /trunk-1.4/epan/dissectors/packet-dcerpc-samr.c
- M /trunk-1.4/epan/dissectors/packet-diameter.c
- M /trunk-1.4/epan/dissectors/packet-ltp.c
- M /trunk-1.4/epan/dissectors/packet-tcp.c
- M /trunk-1.4/epan/dissectors/packet-tn3270.c
- M /trunk-1.4/epan/dissectors/pidl/samr.cnf
- M /trunk-1.4/epan/dissectors/pidl/samr.idl
- M /trunk-1.4/packaging/macosx/Info.plist.in
- M /trunk-1.4/plugins/unistim/packet-unistim.c
- M /trunk-1.4/version_info.c
- M /trunk-1.4/wiretap/vms.c
-
-Copy over revisions from the trunk:
+ M /trunk/epan/dissectors/packet-gsm_a_gm.c
+Switch to using proto_add_bits_item in a couple of places and fix
+missing stepping of bit_offset.
------------------------------------------------------------------------
-r35295 | jake | 2010-12-29 10:16:50 -0800 (Wed, 29 Dec 2010) | 2 lines
+r35595 | etxrab | 2011-01-20 05:05:17 -0800 (Thu, 20 Jan 2011) | 3 lines
Changed paths:
- M /trunk/docbook/wsug_src/WSUG_chapter_capture.xml
+ M /trunk/epan/dissectors/packet-gtp.c
-Update capture options dialog description.
+In MM context the container contains IE:s not a complete
+DTAP message.
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598
------------------------------------------------------------------------
-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.
------------------------------------------------------------------------
-r35313 | guy | 2010-12-30 16:02:54 -0800 (Thu, 30 Dec 2010) | 4 lines
+r36058 | gerald | 2011-02-24 15:52:22 -0800 (Thu, 24 Feb 2011) | 77 lines
Changed paths:
- M /trunk/epan/dissectors/packet-tcp.c
+ M /trunk-1.4/AUTHORS
+ M /trunk-1.4/asn1/ulp/ulp.cnf
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/dumpcap.c
+ M /trunk-1.4/epan/dissectors/packet-e212.c
+ M /trunk-1.4/epan/dissectors/packet-ieee802154.c
+ M /trunk-1.4/epan/dissectors/packet-ipp.c
+ M /trunk-1.4/epan/dissectors/packet-netflow.c
+ M /trunk-1.4/epan/dissectors/packet-skinny.c
+ M /trunk-1.4/epan/dissectors/packet-ulp.c
+ M /trunk-1.4/epan/to_str.c
-It's not a good idea to use tcph->th_seglen if you haven't set it.
+Copy over revisions from the trunk:
-Fixes bug 4211.
------------------------------------------------------------------------
-r35322 | stig | 2011-01-01 04:23:21 -0800 (Sat, 01 Jan 2011) | 2 lines
+r35679 | etxrab | 2011-01-27 07:43:55 -0800 (Thu, 27 Jan 2011) | 2 lines
Changed paths:
- M /trunk/packaging/macosx/Info.plist.in
- M /trunk/version_info.c
+ M /trunk/asn1/ulp/ulp.cnf
+ M /trunk/epan/dissectors/packet-ulp.c
-New Year.
+The attemt to pretify MSISDN and IMSI breaks the dissection.
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593
------------------------------------------------------------------------
-r35328 | guy | 2011-01-02 11:39:24 -0800 (Sun, 02 Jan 2011) | 2 lines
+r35914 | guy | 2011-02-10 21:54:34 -0800 (Thu, 10 Feb 2011) | 3 lines
Changed paths:
- M /trunk/plugins/unistim/packet-unistim.c
+ M /trunk/epan/dissectors/packet-ipp.c
-Fix some cut-and-pasteos and other typoes.
+Register for the media type "application/ipp", so *any* HTTP request or
+response with that content type will be dissected as IPP.
------------------------------------------------------------------------
-r35332 | guy | 2011-01-02 19:30:20 -0800 (Sun, 02 Jan 2011) | 3 lines
+r35916 | guy | 2011-02-11 01:28:05 -0800 (Fri, 11 Feb 2011) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-diameter.c
+ M /trunk/epan/dissectors/packet-ipp.c
-Do length checking for Integer32, Integer64, Unsigned64, Float32, and
-Float64, as well as for Unsigned32.
+Don't assume we're on port 631.
------------------------------------------------------------------------
-r35333 | jake | 2011-01-02 23:40:21 -0800 (Sun, 02 Jan 2011) | 2 lines
+r35947 | jake | 2011-02-14 12:51:40 -0800 (Mon, 14 Feb 2011) | 2 lines
Changed paths:
- M /trunk/docbook/wsdg_graphics/ws-function-blocks.dia
- M /trunk/docbook/wsdg_graphics/ws-function-blocks.png
- M /trunk/docbook/wsdg_src/WSDG_chapter_works.xml
+ M /trunk/epan/dissectors/packet-skinny.c
-Include dumpcap in the description.
+Make sure RTP conversations are created.
------------------------------------------------------------------------
-r35335 | guy | 2011-01-03 00:21:35 -0800 (Mon, 03 Jan 2011) | 4 lines
+r35949 | jake | 2011-02-14 23:14:22 -0800 (Mon, 14 Feb 2011) | 3 lines
Changed paths:
- M /trunk/epan/dissectors/packet-diameter.c
+ M /trunk/epan/to_str.c
-If we have no value to dissect, because the AVP has the wrong length for
-the value's type, return NULL as the label, rather than returning an
-uninitialized value as the label.
+From Matthew Parris:
+Display "Day of Year" for January 1 as 1, not 0.
------------------------------------------------------------------------
-r35336 | guy | 2011-01-03 00:31:45 -0800 (Mon, 03 Jan 2011) | 6 lines
+r35999 | jake | 2011-02-18 00:02:53 -0800 (Fri, 18 Feb 2011) | 4 lines
Changed paths:
- M /trunk/epan/dissectors/packet-tn3270.c
-
-Put the query list items under the top-level query list item (which
-should've been done in the previous checkin).
+ M /trunk/epan/dissectors/packet-ieee802154.c
-Display the "request type" field in a Read Partition request correctly
-(only the upper 2 bits matter, and they're an enumerated value).
+From Ivan Lawrow:
+The Final CAP Slot field "wpan.cap" in the Superframe Specification for a
+beacon is always displayed as zero.
------------------------------------------------------------------------
-r35337 | guy | 2011-01-03 01:17:20 -0800 (Mon, 03 Jan 2011) | 9 lines
+r36052 | wmeier | 2011-02-24 11:26:38 -0800 (Thu, 24 Feb 2011) | 4 lines
Changed paths:
- M /trunk/wiretap/vms.c
-
-We must always return an error code on an error; otherwise, our caller
-will see random crap as the error code.
-
-However, if we're skipping a "TCPIPTRACE-W-BUFFERSFUL" error, if the
-"error" we get is an end-of-file indication, that's *not* an error.
+ M /trunk/dumpcap.c
-It is, however, ultimately a "we dropped some packets" indication; add a
-comment noting that we should eventually treat it as such.
+Fix Bug #5716: "dumpcap: -q option behavior doesn't match documentation"
+Rework code slightly to print "Packets captured: " at 'dumpcap -q ...' exit.
+Also: SigInfo now prints: "Packets captured: n" iso "n Packets captured".
------------------------------------------------------------------------
-r35356 | guy | 2011-01-03 23:48:28 -0800 (Mon, 03 Jan 2011) | 9 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-ltp.c
-Instead of going over the Report segment twice, once to get the fields
-in the segment and once to put them into the protocol tree, just do it
-once. That also means we don't need to allocate an array for all the
-reception claims, so we don't have to worry about the claim count (other
-than making sure it's non-negative), and that we won't abort the
-dissection until we run past the end of the packet.
-(The rest of the dissector should be changed to work that way as well.)
-------------------------------------------------------------------------
-r35357 | guy | 2011-01-04 00:04:27 -0800 (Tue, 04 Jan 2011) | 3 lines
-Changed paths:
- M /trunk/epan/dissectors/packet-amqp.c
+Copy over with manual intervention:
-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
+r35889 | jake | 2011-02-09 00:46:21 -0800 (Wed, 09 Feb 2011) | 5 lines
Changed paths:
- M /trunk/epan/dissectors/packet-amqp.c
-
-Put end-of-field-table checks back into dissect_amqp_field_table().
-------------------------------------------------------------------------
+ M /trunk/AUTHORS
+ M /trunk/epan/dissectors/packet-e212.c
-
-Copy over by hand:
+From Grzegorz Szczytowski:
+Update of packet-e212.c dissector according to local national regulatory
+MNC assignment document.
+www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439
------------------------------------------------------------------------
-r35330 | guy | 2011-01-02 13:27:57 -0800 (Sun, 02 Jan 2011) | 12 lines
+r36028 | jake | 2011-02-22 13:19:13 -0800 (Tue, 22 Feb 2011) | 4 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.
+ M /trunk/epan/dissectors/packet-netflow.c
-Also, fix a typo, and expand a comment.
+Fix for bug 5702:
+In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which
+is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER.
------------------------------------------------------------------------
-Update the release notes.
-
------------------------------------------------------------------------
-r35464 | gerald | 2011-01-10 13:45:49 -0800 (Mon, 10 Jan 2011) | 15 lines
+r36064 | gerald | 2011-02-24 17:09:08 -0800 (Thu, 24 Feb 2011) | 16 lines
Changed paths:
M /trunk-1.4/docbook/release-notes.xml
- M /trunk-1.4/epan/dissectors/packet-ber.c
+ M /trunk-1.4/wiretap/lanalyzer.c
-Copy over revisions from the trunk:
+Copy over r36061 from the trunk:
------------------------------------------------------------------------
-r35342 | morriss | 2011-01-03 09:37:41 -0800 (Mon, 03 Jan 2011) | 5 lines
+r36061 | wmeier | 2011-02-24 16:40:22 -0800 (Thu, 24 Feb 2011) | 6 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ber.c
+ M /trunk/wiretap/lanalyzer.c
-Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5537 :
+From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698
-Don't go modifying the bitstring if its length is 0 (meaning that there is only
-the NULL terminator).
+(Note from me: Before the fix "File ! Save As" in Lanalyzer format
+ crashed quite consistently on my Windows 7)
------------------------------------------------------------------------
-Update the release notes.
-
-------------------------------------------------------------------------
-r35465 | gerald | 2011-01-10 13:53:01 -0800 (Mon, 10 Jan 2011) | 52 lines
-Changed paths:
- M /trunk-1.4/docbook/CMakeLists.txt
- M /trunk-1.4/docbook/Makefile.common
- M /trunk-1.4/docbook/user-guide.xml
- M /trunk-1.4/docbook/wsug_graphics/ws-analyze-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-capture-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-capture-options.png
- A /trunk-1.4/docbook/wsug_graphics/ws-column-header-popup-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-details-pane-popup-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-edit-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-export-pdml.png
- M /trunk-1.4/docbook/wsug_graphics/ws-export-plain.png
- M /trunk-1.4/docbook/wsug_graphics/ws-export-ps.png
- M /trunk-1.4/docbook/wsug_graphics/ws-export-psml.png
- M /trunk-1.4/docbook/wsug_graphics/ws-export-selected.png
- M /trunk-1.4/docbook/wsug_graphics/ws-file-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-go-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-help-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-main-toolbar.png
- M /trunk-1.4/docbook/wsug_graphics/ws-main.png
- M /trunk-1.4/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-statistics-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-telephony-menu.png
- A /trunk-1.4/docbook/wsug_graphics/ws-tools-menu.png
- M /trunk-1.4/docbook/wsug_graphics/ws-view-menu.png
- M /trunk-1.4/docbook/wsug_src/WSUG_chapter_introduction.xml
- M /trunk-1.4/docbook/wsug_src/WSUG_chapter_use.xml
-
-Copy over revisions from the trunk:
+Update the releast notes.
------------------------------------------------------------------------
-r35412 | jake | 2011-01-06 15:34:46 -0800 (Thu, 06 Jan 2011) | 2 lines
+r36066 | etxrab | 2011-02-24 23:27:20 -0800 (Thu, 24 Feb 2011) | 2 lines
Changed paths:
- M /trunk/docbook/user-guide.xml
- M /trunk/docbook/wsug_src/WSUG_chapter_introduction.xml
+ M /trunk-1.4/asn1/ansi_map/ansi_map.asn
+ M /trunk-1.4/epan/dissectors/packet-ansi_map.c
-Tell the user about the Q&A site.
+Copy over 35842
+Add a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637
------------------------------------------------------------------------
-r35443 | jake | 2011-01-09 13:59:00 -0800 (Sun, 09 Jan 2011) | 2 lines
+r36076 | jake | 2011-02-26 03:02:41 -0800 (Sat, 26 Feb 2011) | 2 lines
Changed paths:
- M /trunk/docbook/user-guide.xml
- A /trunk/docbook/wsug_graphics/ws-column-header-popup-menu.png
- M /trunk/docbook/wsug_graphics/ws-details-pane-popup-menu.png
- M /trunk/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
+ M /trunk-1.4/Makefile.nmake
+ M /trunk-1.4/tools/win32-setup.sh
+ M /trunk-1.4/tools/win64-setup.sh
+
+Update the User's Guide.
-Update the pop-up menu screen shots.
------------------------------------------------------------------------
-r35444 | jake | 2011-01-09 14:17:14 -0800 (Sun, 09 Jan 2011) | 2 lines
+r36081 | gerald | 2011-02-27 09:04:32 -0800 (Sun, 27 Feb 2011) | 1 line
Changed paths:
- M /trunk/docbook/CMakeLists.txt
- M /trunk/docbook/Makefile.common
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/manuf
+ M /trunk-1.4/services
-Add the graphic files to the distribution.
+[Automatic manuf, services and enterprise-numbers update for 2011-02-27]
------------------------------------------------------------------------
+r36102 | gerald | 2011-02-28 17:09:12 -0800 (Mon, 28 Feb 2011) | 17 lines
+Changed paths:
+ M /trunk-1.4/asn1/ldap/ldap.cnf
+ M /trunk-1.4/asn1/ldap/packet-ldap-template.c
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-ldap.c
+Copy over revisions from the trunk:
-Copy over by hand:
------------------------------------------------------------------------
-r35441 | jake | 2011-01-09 11:44:21 -0800 (Sun, 09 Jan 2011) | 2 lines
+r36101 | gerald | 2011-02-28 16:50:17 -0800 (Mon, 28 Feb 2011) | 5 lines
Changed paths:
- M /trunk/docbook/user-guide.xml
- M /trunk/docbook/wsug_graphics/ws-analyze-menu.png
- M /trunk/docbook/wsug_graphics/ws-capture-menu.png
- M /trunk/docbook/wsug_graphics/ws-edit-menu.png
- M /trunk/docbook/wsug_graphics/ws-file-menu.png
- M /trunk/docbook/wsug_graphics/ws-go-menu.png
- M /trunk/docbook/wsug_graphics/ws-help-menu.png
- M /trunk/docbook/wsug_graphics/ws-main-toolbar.png
- M /trunk/docbook/wsug_graphics/ws-main.png
- M /trunk/docbook/wsug_graphics/ws-statistics-menu.png
- M /trunk/docbook/wsug_graphics/ws-telephony-menu.png
- A /trunk/docbook/wsug_graphics/ws-tools-menu.png
- M /trunk/docbook/wsug_graphics/ws-view-menu.png
- M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
+ M /trunk/asn1/ldap/ldap.cnf
+ M /trunk/asn1/ldap/packet-ldap-template.c
+ M /trunk/epan/dissectors/packet-ldap.c
-Update the menu screenshots and descriptions.
+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.
------------------------------------------------------------------------
-r35468 | gerald | 2011-01-10 15:36:41 -0800 (Mon, 10 Jan 2011) | 10 lines
+r36104 | gerald | 2011-02-28 17:14:20 -0800 (Mon, 28 Feb 2011) | 12 lines
Changed paths:
- M /trunk-1.4/docbook/wsug_src/WSUG_chapter_work.xml
+ M /trunk-1.4/epan/uat_load.l
-Copy over r35467 from the trunk:
+Copy over r36096 from the trunk:
------------------------------------------------------------------------
-r35467 | jake | 2011-01-10 15:29:54 -0800 (Mon, 10 Jan 2011) | 2 lines
+r36096 | stig | 2011-02-28 08:11:20 -0800 (Mon, 28 Feb 2011) | 4 lines
Changed paths:
- M /trunk/docbook/wsug_src/WSUG_chapter_work.xml
+ M /trunk/epan/uat_load.l
-Complete the chapter on popup menus.
-------------------------------------------------------------------------
+Close UAT file after loading.
+Open files may prevent deleting a used profile with UAT files.
------------------------------------------------------------------------
-r35472 | gerald | 2011-01-10 16:38:08 -0800 (Mon, 10 Jan 2011) | 2 lines
-Changed paths:
- M /trunk-1.4/docbook/release-notes.xml
-
-Add 1.2 info to the release notes.
------------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index dd3af2d6f9..4b1d15a96f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Wireshark 1.4.3 Release Notes
+Wireshark 1.4.4 Release Notes
------------------------------------------------------------------
@@ -15,82 +15,102 @@ What's New
The following vulnerabilities have been fixed. See the security
advisory for details and a workaround.
- o FRAsse discovered that the MAC-LTE dissector could overflow a
- buffer. (Bug 5530)
+ o Huzaifa Sidhpurwala of the Red Hat Security Response Team
+ discovered that Wireshark could free an uninitialized pointer
+ while reading a malformed pcap-ng file. (Bug 5652)
- Versions affected: 1.2.0 to 1.2.13 and 1.4.0 to 1.4.2.
+ Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.
- o FRAsse discovered that the ENTTEC dissector could overflow a
- buffer. (Bug 5539)
+ CVE-2011-0538
- Versions affected: 1.2.0 to 1.2.13 and 1.4.0 to 1.4.2.
+ o Huzaifa Sidhpurwala of the Red Hat Security Response Team
+ discovered that a large packet length in a pcap-ng file could
+ crash Wireshark. (Bug 5661)
- CVE-2010-4538
+ Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.
- o The ASN.1 BER dissector could assert and make Wireshark exit
- prematurely. (Bug 5537)
+ o Wireshark could overflow a buffer while reading a Nokia DCT3
+ trace file. (Bug 5661)
- Versions affected: 1.4.0 to 1.4.2.
+ Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.
- The following bugs have been fixed:
+ CVE-2011-0713
+
+ o Paul Makowski working for SEI/CERT discovered that Wireshark
+ on 32 bit systems could crash while reading a malformed
+ 6LoWPAN packet. (Bug 5661)
+
+ Versions affected: 1.4.0 to 1.4.3.
+
+ o joernchen of Phenoelit discovered that the LDAP and SMB
+ dissectors could overflow the stack. (Bug 5717)
- o AMQP failed assertion. (Bug 4048)
+ Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior
+ versions including 1.0.x are also affected.)
- o Reassemble.c leaks memory for GLIB > 2.8. (Bug 4141)
+ o Xiaopeng Zhang of Fortinet's Fortiguard Labs discovered that
+ large LDAP Filter strings can consume excessive amounts of
+ memory. (Bug 5732)
- o Fuzz testing reports possible dissector bug: TCP. (Bug 4211)
+ Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior
+ versions including 1.0.x are also affected.)
- o Wrong length calculation in new_octet_aligned_subset_bits()
- (PER dissector). (Bug 5393)
+ The following bugs have been fixed:
+
+ o A TCP stream would not always be recognized as the same
+ stream. (Bug 2907)
- o Function dissect_per_bit_string_display might read more bytes
- than available (PER dissector). (Bug 5394)
+ o Wireshark Crashing by pressing 2 Buttons. (Bug 4645)
- o Cannot load wpcap.dll & packet.dll from Wireshark program
- directory. (Bug 5420)
+ o A crash can occur in the NTLMSSP dissector. (Bug 5157)
- o Wireshark crashes with Copy -> Description on date/time
- fields. (Bug 5421)
+ o The column texts from a Lua dissector could be mangled. (Bug
+ 5326) (Bug 5630)
- o DHCPv6 OPTION_CLIENT_FQDN parse error. (Bug 5426)
+ o Corrections to ANSI MAP ASN.1 specifications. (Bug 5584)
- o Information element Error for supported channels. (Bug 5430)
+ o When searching in packet bytes, the field and bytes are not
+ immediately shown. (Bug 5585)
- o Assert when using ASN.1 dissector with loading a 'type table'.
- (Bug 5447)
+ o Malformed Packet: ULP reported when dissecting ULP SessionID
+ PDU. (Bug 5593)
- o Bug with RWH parsing in Infiniband dissector. (Bug 5444)
+ o Wrong IEI in container of decode_gtp_mm_cntxt. (Bug 5598)
- o Help->About Wireshark mis-reports OS. (Bug 5453)
+ o Display filter does not work for expressions of type BASE_DEC,
+ BASE_DEC_HEX and BASE_HEX_DEC. (Bug 5606)
- o Delegated-IPv6-Prefix(123) is shown incorrect as
- X-Ascend-Call-Attempt-Limit(123). (Bug 5455)
+ o NTLMSSP dissector may fail to compile due to space embedded in
+ C comment delimiters. (Bug 5614)
- o "tshark -r file -T fields" is truncating exported data. (Bug
- 5463)
+ o Allow for name resolution of link-scope and multicast IPv6
+ addresses from local host file. (Bug 5615)
- o gsm_a_dtap: incorrect "Extraneous Data" when decoding Packet
- Flow Identifier. (Bug 5475)
+ o DHCPv6 dissector formats DUID_LLT time incorrectly. (Bug 5627)
- o Improper decode of TLS 1.2 packet containing both
- CertificateRequest and ServerHelloDone messages. (Bug 5485)
+ o Allow for IEEE 802.3bc-2009 style PoE TLVs. (Bug 5639)
- o LTE-PDCP UL and DL problem. (Bug 5505)
+ o Various fixes to the HIP packet dissector. (Bug 5646)
- o CIGI 3.2/3.3 support broken. (Bug 5510)
+ o Display "Day of Year" for January 1 as 1, not 0. (Bug 5653)
- o Prepare Filter in RTP Streams dialog does not work correctly.
- (Bug 5513)
+ o Accommodate the CMake build on Ubuntu 10.10. (Bug 5665)
- o Wrong decode at ethernet OAM Y.1731 ETH-CC. (Bug 5517)
+ o E.212 MCC 260 Poland update according to local national
+ regulatory. (Bug 5668)
- o WPS: RF bands decryption. (Bug 5523)
+ o IPP on ports other than 631 not recognized. (Bug 5677)
- o Incorrect LTP SDNV value handling. (Bug 5521)
+ o Potential access violation when writing to LANalyzer files.
+ (Bug 5698)
- o LTP bug found by randpkt. (Bug 5323)
+ o IEEE 802.15.4 Superframe Specification - Final CAP Slot always
+ 0. (Bug 5700)
- o Buffer overflow in SNMP EngineID preferences. (Bug 5530)
+ o Peer SRC and DST AS numbers are swapped for cflow. (Bug 5702)
+
+ o dumpcap: -q option behavior doesn't match documentation. (Bug
+ 5716)
New and Updated Features
@@ -102,13 +122,13 @@ What's New
Updated Protocol Support
- AMQP, ASN.1 BER, ASN.1 PER, CFM, CIGI, DHCPv6, Diameter, ENTTEC,
- GSM A GM, IEEE 802.11, InfiniBand, LTE-PDCP, LTP, MAC-LTE, MP2T,
- RADIUS, SAMR, SCCP, SIP, SNMP, TCP, TLS, TN3270, UNISTIM, WPS
+ ANSI MAP, BitTorrent, DCM, DHCPv6, DTAP, DTPT, E.212, GSM
+ Management, GTP, HIP, IEEE 802.15.4, IPP, LDAP, LLDP, Netflow,
+ NTLMSSP, P_Mul, Quake, Skinny, SMB, SNMP, ULP
New and Updated Capture File Support
- Endace ERF, Microsoft Network Monitor, VMS TCPtrace.
+ LANalyzer, Nokia DCT3, Pcap-ng
Getting Wireshark
@@ -162,8 +182,6 @@ Getting Help
archives for all of Wireshark's mailing lists can be found on the
web site.
- Commercial support is available from CACE Technologies.
-
Training is available from Wireshark University.
Frequently Asked Questions
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index ab5ac96315..ad5b005111 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -32,7 +32,7 @@ Wireshark Info
<para>
The following vulnerabilities have been fixed. See the
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-02.html">security advisory</ulink> for details and a workaround.
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-04.html">security advisory</ulink> for details and a workaround.
<itemizedlist>
diff --git a/version.conf b/version.conf
index 84c025e606..d98b1da17a 100644
--- a/version.conf
+++ b/version.conf
@@ -1,9 +1,9 @@
# Interim releases: Enable packaging, add a "pre" to the version.
-enable: 1
-pkg_format: pre1-%#
-pkg_enable: 1
+#enable: 1
+#pkg_format: pre1-%#
+#pkg_enable: 1
# Final release: Disable package version stamps.
-#enable: 1
-#pkg_format:
-#pkg_enable: 0
+enable: 1
+pkg_format:
+pkg_enable: 0