aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-09-10 19:59:42 +0000
committerGerald Combs <gerald@wireshark.org>2013-09-10 19:59:42 +0000
commit1f3d99b0252419d21f2ae1bf91310c0446e50cf3 (patch)
treeecf32330f48ba08d11add7eceb1bd990f7a29455
parentb18db33cd7559587d6d836db4aa05bb95c437803 (diff)
downloadwireshark-1f3d99b0252419d21f2ae1bf91310c0446e50cf3.tar.gz
wireshark-1f3d99b0252419d21f2ae1bf91310c0446e50cf3.tar.bz2
wireshark-1f3d99b0252419d21f2ae1bf91310c0446e50cf3.zip
1.10.2 → 1.10.3.v1.10.3-rc1
svn path=/trunk-1.10/; revision=51940
Diffstat
-rw-r--r--ChangeLog1366
-rw-r--r--config.nmake2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog2
-rw-r--r--docbook/asciidoc.conf2
-rw-r--r--docbook/release-notes.asciidoc150
-rw-r--r--epan/Makefile.am2
-rwxr-xr-xmake-version.pl2
-rw-r--r--wiretap/Makefile.am2
9 files changed, 17 insertions, 1513 deletions
diff --git a/ChangeLog b/ChangeLog
index c8ebb6d2fd..00e76bfb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1365 +1 @@
-------------------------------------------------------------------------
-r50926 | guy | 2013-07-26 11:52:02 -0700 (Fri, 26 Jul 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/reordercap.c
-
-Copy over r50054 from trunk:
-
- ------------------------------------------------------------------------
- r50054 | pascal | 2013-06-19 12:31:06 -0700 (Wed, 19 Jun 2013) | 2 lines
-
- Preserve summary information when reordering a file
-
-------------------------------------------------------------------------
-r50929 | guy | 2013-07-26 14:26:21 -0700 (Fri, 26 Jul 2013) | 8 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/reordercap.c
-
-Copy over r50928 from trunk:
-
- ------------------------------------------------------------------------
- r50928 | guy | 2013-07-26 14:25:33 -0700 (Fri, 26 Jul 2013) | 3 lines
-
- Send error messages to the standard error, and include the program name
- in the error message.
-
-------------------------------------------------------------------------
-r50936 | guy | 2013-07-26 14:51:57 -0700 (Fri, 26 Jul 2013) | 9 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/reordercap.c
-
-Copy over r50934 from trunk:
-
- ------------------------------------------------------------------------
- r50934 | guy | 2013-07-26 14:49:42 -0700 (Fri, 26 Jul 2013) | 4 lines
-
- Give more detailed diagnostics for errors.
-
- Actually *check* for errors when reading.
-
-------------------------------------------------------------------------
-r50937 | gerald | 2013-07-26 15:00:35 -0700 (Fri, 26 Jul 2013) | 2 lines
-Changed paths:
- M /trunk-1.10/ChangeLog
- M /trunk-1.10/config.nmake
- M /trunk-1.10/configure.ac
- M /trunk-1.10/debian/changelog
- M /trunk-1.10/debian/wireshark-common.files
- M /trunk-1.10/docbook/asciidoc.conf
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/Makefile.am
- M /trunk-1.10/make-version.pl
- M /trunk-1.10/version.conf
- M /trunk-1.10/wiretap/Makefile.am
-
-1.10.1 → 1.10.2.
-
-------------------------------------------------------------------------
-r50957 | guy | 2013-07-27 15:44:41 -0700 (Sat, 27 Jul 2013) | 14 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/gtk/Makefile.common
- M /trunk-1.10/ui/gtk/capture_dlg.c
- D /trunk-1.10/ui/gtk/cfilter_combo_utils.c
- M /trunk-1.10/ui/gtk/cfilter_combo_utils.h
- M /trunk-1.10/ui/qt/display_filter_combo.cpp
- M /trunk-1.10/ui/recent.c
- M /trunk-1.10/ui/recent.h
- M /trunk-1.10/ui/recent_utils.h
-
-Copy over r50956 from trunk with some manual intervention:
-
- ------------------------------------------------------------------------
- r50956 | guy | 2013-07-27 15:37:26 -0700 (Sat, 27 Jul 2013) | 11 lines
-
- Have separate lists of recent capture filters for all interfaces, in
- addition to a "global" list. Store all of those lists in the recent
- file. Maintain the lists in ui/recent.c, rather than attaching them to
- widgets; have the code that populates the combo boxes get the lists from
- the ui/recent.c code.
-
- This makes a little more of the code GUI-toolkit-independent, and should
- fix bug 7278.
-
-------------------------------------------------------------------------
-r50974 | gerald | 2013-07-28 07:19:08 -0700 (Sun, 28 Jul 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2013-07-28]
-------------------------------------------------------------------------
-r50980 | guy | 2013-07-28 10:28:26 -0700 (Sun, 28 Jul 2013) | 9 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/gtk/CMakeLists.txt
-
-Copy over r50978 from trunk:
-
- ------------------------------------------------------------------------
- r50978 | jmayer | 2013-07-28 08:48:34 -0700 (Sun, 28 Jul 2013) | 2 lines
-
- Looks like cfilter_combo_utils.c got removed.
-
-(Yes, it did, in r50956.)
-
-------------------------------------------------------------------------
-r50985 | guy | 2013-07-28 13:25:17 -0700 (Sun, 28 Jul 2013) | 12 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/recent.c
-
-Copy over r50984 from trunk:
-
- ------------------------------------------------------------------------
- r50984 | guy | 2013-07-28 13:24:27 -0700 (Sun, 28 Jul 2013) | 7 lines
-
- Add a comment.
-
- In recent_add_cfilter(), the list we're working on is cfilter_list;
- properly remove an item from it - don't assign the result to
- recent_cfilter_list, assign it to cfilter_list. This may fix some
- crashes and Valgrind errors.
-
-------------------------------------------------------------------------
-r50987 | guy | 2013-07-28 13:38:33 -0700 (Sun, 28 Jul 2013) | 17 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/gtk/capture_dlg.c
-
-Copy over r50986 from trunk:
-
- ------------------------------------------------------------------------
- r50986 | guy | 2013-07-28 13:34:52 -0700 (Sun, 28 Jul 2013) | 12 lines
-
- Explain what the big loop in update_properties_all() is doing, and
- what's done after that.
-
- If we want to set the all-interfaces capture filter string, just set it,
- don't add anything to the drop-down list for it.
-
- If, after we've succeeded starting a capture, all active interfaces have
- the same capture filter, *do* add that filter to the all-interfaces
- recent capture filters list.
-
- Also, free g_strduped capture filter strings when we're done with them.
-
-------------------------------------------------------------------------
-r50990 | guy | 2013-07-28 14:13:08 -0700 (Sun, 28 Jul 2013) | 17 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/doc/dumpcap.pod
- M /trunk-1.10/doc/editcap.pod
- M /trunk-1.10/doc/mergecap.pod
- M /trunk-1.10/doc/randpkt.pod
- M /trunk-1.10/doc/rawshark.pod
- M /trunk-1.10/doc/text2pcap.pod
- M /trunk-1.10/doc/tshark.pod
- M /trunk-1.10/doc/wireshark.pod.template
- M /trunk-1.10/wiretap/file_access.c
-
-Copy over r50989 from trunk:
-
- ------------------------------------------------------------------------
- r50989 | guy | 2013-07-28 14:12:07 -0700 (Sun, 28 Jul 2013) | 12 lines
-
- If a core Wireshark developer repeatedly can't remember that the
- argument to the -F flag for pcap format is "libpcap", not "pcap", we
- have a problem. Make it "pcap", and add a backwards-compatibility hack
- to support using "libpcap" as well.
-
- Update the man pages to refer to it as pcap as well, and fix the
- capitalization of "WinPcap" (see http://www.winpcap.org) while we're at
- it.
-
- Also, refer to http://www.tcpdump.org/linktypes.html for the list of
- link-layer header types for pcap and pcap-ng.
-
-------------------------------------------------------------------------
-r50991 | guy | 2013-07-28 14:27:01 -0700 (Sun, 28 Jul 2013) | 17 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/doc/capinfos.pod
- M /trunk-1.10/doc/dumpcap.pod
- M /trunk-1.10/doc/editcap.pod
- M /trunk-1.10/doc/mergecap.pod
- M /trunk-1.10/doc/rawshark.pod
- M /trunk-1.10/doc/reordercap.pod
- M /trunk-1.10/doc/text2pcap.pod
- M /trunk-1.10/doc/tshark.pod
- M /trunk-1.10/doc/wireshark.pod.template
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r49436 | eapache | 2013-05-20 07:56:18 -0700 (Mon, 20 May 2013) | 2 lines
-
- Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
-
- ------------------------------------------------------------------------
- r49427 | cmaynard | 2013-05-19 19:21:07 -0700 (Sun, 19 May 2013) | 2 lines
-
- If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.
-
- ------------------------------------------------------------------------
- r49424 | cmaynard | 2013-05-19 18:41:52 -0700 (Sun, 19 May 2013) | 2 lines
-
- Clean up some documentation a bit, removing non-ASCII characters, formatting like other pages, alphabetizing options, describing options under their own headingadding missing newline at end of file, fixing typos and some minor rewording.
-
-------------------------------------------------------------------------
-r50994 | guy | 2013-07-28 16:19:33 -0700 (Sun, 28 Jul 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/recent.c
-
-Copy over r50993 from trunk:
-
- ------------------------------------------------------------------------
- r50993 | guy | 2013-07-28 15:37:45 -0700 (Sun, 28 Jul 2013) | 2 lines
-
- Close a memory leak.
-
-------------------------------------------------------------------------
-r50995 | guy | 2013-07-28 16:21:44 -0700 (Sun, 28 Jul 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/gtk/capture_dlg.c
-
-Copy over r50992 from trunk:
-
- ------------------------------------------------------------------------
- r50992 | eapache | 2013-07-28 15:02:00 -0700 (Sun, 28 Jul 2013) | 2 lines
-
- Remove unused variable caught by GCC 4.8.
-
-------------------------------------------------------------------------
-r51006 | guy | 2013-07-29 01:31:27 -0700 (Mon, 29 Jul 2013) | 16 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/doc/text2pcap.pod
-
-Copy over r51005 from trunk:
-
- ------------------------------------------------------------------------
- r51005 | guy | 2013-07-29 01:30:42 -0700 (Mon, 29 Jul 2013) | 11 lines
-
- The argument to the -l flag to text2pcap is a LINKTYPE_ value, not a
- DLT_ value, which is good because it's a numerical value and the
- numerical values for some link-layer header types are OS-dependent, but
- the numerical values for all LINKTYPE_ values are OS-independent. Use
- LINKTYPE_RAW, not the value for the DLT_RAW on some but not all OSes,
- for raw IP.
-
- Also, 7 is LINKTYPE_ARCNET_BSD, emphasis on the "_BSD"; there's also a
- Linux encapsulation for ARCNet that is different. Note that it's the
- BSD flavor.
-
-------------------------------------------------------------------------
-r51009 | guy | 2013-07-29 01:38:16 -0700 (Mon, 29 Jul 2013) | 15 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/text2pcap.c
-
-Copy over r51008 from trunk:
-
- ------------------------------------------------------------------------
- r51008 | guy | 2013-07-29 01:37:18 -0700 (Mon, 29 Jul 2013) | 10 lines
-
- In the comments for pcap_link_type, point to
- http://www.tcpdump.org/linktypes.html for the details, rather than to
- some particular OS's net/bpf.h (assuming it even has one), and speak of
- it as a LINKTYPE_ value rather than a DLT_ value (in those cases where
- the LINKTYPE_ value for a given link-layer header type is different from
- the DLT_ value, it's the LINKTYPE_ value that should be passed to
- text2pcap, as it's what gets written to the file, and those should be
- the always-platform-independent LINKTYPE_ values rather than the
- possibly-platform-dependent DLT_ values).
-
-------------------------------------------------------------------------
-r51015 | rbalint | 2013-07-29 10:20:36 -0700 (Mon, 29 Jul 2013) | 9 lines
-Changed paths:
- M /trunk-1.10/debian/wireshark-common.files
- M /trunk-1.10/debian/wireshark-common.shlibs
- M /trunk-1.10/epan/CMakeLists.txt
- M /trunk-1.10/epan/Makefile.am
- M /trunk-1.10/wiretap/Makefile.am
-
-Use proper shared library versions
-
-Unfortunately 1.10.1 went out with library version numbers (compared
-to 1.10.0) not conforming to the library versioning guide at:
-http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-
-This change sets the library version numbers to the ones suggested
-by the guide and also matching the versions used in the official
-Debian packages for 1.10.1.
-------------------------------------------------------------------------
-r51052 | guy | 2013-07-30 22:04:51 -0700 (Tue, 30 Jul 2013) | 10 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/macosx-setup.sh
-
-Copy over r51049 from trunk:
-
- ------------------------------------------------------------------------
- r51049 | guy | 2013-07-30 22:00:28 -0700 (Tue, 30 Jul 2013) | 5 lines
-
- If no target OS version was specified, default to the major version on
- which we're running, so we *always* build against an SDK. (The "10" in
- "10.x.y" is not *really* part of the version number, so the "major
- version" includes the "10" and the major version number following it.)
-
-------------------------------------------------------------------------
-r51055 | guy | 2013-07-30 23:28:06 -0700 (Tue, 30 Jul 2013) | 13 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/macosx-setup.sh
-
-Copy over r51054 from trunk with manual intervention:
-
- ------------------------------------------------------------------------
- r51054 | guy | 2013-07-30 23:25:40 -0700 (Tue, 30 Jul 2013) | 8 lines
-
- Put the GTK2 vs. GTK3 and autofoo vs. CMake options at the beginning,
- before either of them are tested.
-
- Put the code to get the OS major version number just before we first use
- it.
-
- Fix indentation.
-
-------------------------------------------------------------------------
-r51058 | guy | 2013-07-31 00:18:57 -0700 (Wed, 31 Jul 2013) | 15 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/configure.ac
-
-Copy over r51057 from trunk:
-
- ------------------------------------------------------------------------
- r51057 | guy | 2013-07-31 00:17:45 -0700 (Wed, 31 Jul 2013) | 10 lines
-
- If you use --enable-osx-deploy-target or --disable-osx-deploy-target on
- anything other than OS X, fail; whatever it is you're trying to do won't
- work (unless and until there exists a platform that fully supports
- cross-development for OS X, *including* building against SDKs and
- building with -mmacosx-version-min).
-
- If you use neither on OS X, default to the OS major version on which
- you're building. If you use --disable-osx-deploy-target, don't build
- against an SDK and don't use -mmacosx-version-min.
-
-------------------------------------------------------------------------
-r51062 | guy | 2013-07-31 00:42:55 -0700 (Wed, 31 Jul 2013) | 16 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/configure.ac
- M /trunk-1.10/packaging/macosx/Makefile.am
- M /trunk-1.10/packaging/macosx/Wireshark_package.pmdoc
- D /trunk-1.10/packaging/macosx/Wireshark_package.pmdoc/index.xml
- A /trunk-1.10/packaging/macosx/Wireshark_package.pmdoc/index.xml.in (from /trunk/packaging/macosx/Wireshark_package.pmdoc/index.xml.in:51060)
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r51060 | guy | 2013-07-31 00:39:11 -0700 (Wed, 31 Jul 2013) | 6 lines
-
- Set the minimum OS X version in the installer package based on the
- deployment target; if --disable-osx-deploy-target was specified, set it
- to the OS version on which we're building - minor/dot-dot version and
- all - as there's no guarantee that it'll work on *any* version earlier
- than that.
-
- ------------------------------------------------------------------------
- r51061 | guy | 2013-07-31 00:41:19 -0700 (Wed, 31 Jul 2013) | 2 lines
-
- Ignore the generated index.xml file.
-
-------------------------------------------------------------------------
-r51076 | guy | 2013-07-31 13:43:00 -0700 (Wed, 31 Jul 2013) | 11 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/configure.ac
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r51074 | guy | 2013-07-31 13:40:19 -0700 (Wed, 31 Jul 2013) | 2 lines
-
- Only use sw_vers if we're on OS X.
- ------------------------------------------------------------------------
- r51075 | guy | 2013-07-31 13:41:56 -0700 (Wed, 31 Jul 2013) | 2 lines
-
- Get rid of extra comment line.
-
-------------------------------------------------------------------------
-r51129 | morriss | 2013-08-02 18:03:13 -0700 (Fri, 02 Aug 2013) | 38 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ui/gtk/packet_panes.c
-
-Revert r50739 to bring the tree-expansion fixes back in to trunk-1.10.
-
-Copy over revisions from the trunk (with some manual intervention) to fix the
-issues that revision still had:
-
- ------------------------------------------------------------------------
- r50740 | darkjames | 2013-07-19 13:31:32 -0400 (Fri, 19 Jul 2013) | 7 lines
- Changed paths:
- M /trunk/ui/gtk/packet_panes.c
-
- Fix gtk warnings when clicking on some byte on byte pane.
-
- When we don't have path don't check for subtrees.
- (Originally report by Jeff on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c17)
-
- XXX, we could create a path pointing on begin of tree - but do we want to do it?
-
- ------------------------------------------------------------------------
- r50741 | darkjames | 2013-07-19 13:51:05 -0400 (Fri, 19 Jul 2013) | 4 lines
- Changed paths:
- M /trunk/ui/gtk/packet_panes.c
-
- Fix problems when expanding whole tree '*' / all subtree nodes <Shift>-Right
-
- Remove gtk_tree_view_collapse_row from check_expand_trees()
-
- ------------------------------------------------------------------------
- r50903 | morriss | 2013-07-25 21:45:48 -0400 (Thu, 25 Jul 2013) | 6 lines
- Changed paths:
- M /trunk/ui/gtk/packet_panes.c
-
- From Cal Turney and Jiří Engelthaler via
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :
-
- The fix for bug 5585 (r35583) is no longer necessary (thanks to r50516) and it
- causes the screen to flicker when clicking on bytes in the bytes pane.
-
-
-------------------------------------------------------------------------
-r51130 | eapache | 2013-08-02 18:47:05 -0700 (Fri, 02 Aug 2013) | 9 lines
-Changed paths:
- M /trunk-1.10/epan/wmem/wmem_allocator_block.c
-
-Don't re-add popped chunks to the free list. I played for a while with logic to
-ensure they don't go right back to the head of the list, but it ended up being
-quite complicated. This is much simpler, and doesn't really affect the
-efficiency of the allocator anyways (mostly because it would be hard to make it
-any worse).
-
-Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8827
-Hopefully doesn't break anything else.
-
-------------------------------------------------------------------------
-r51138 | gerald | 2013-08-04 07:19:11 -0700 (Sun, 04 Aug 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2013-08-04]
-------------------------------------------------------------------------
-r51190 | gerald | 2013-08-07 09:43:53 -0700 (Wed, 07 Aug 2013) | 25 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/Makefile.am
- M /trunk-1.10/Makefile.nmake
- M /trunk-1.10/services
- M /trunk-1.10/tools/Makefile.am
- A /trunk-1.10/tools/make-services.py (from /trunk/tools/make-services.py:51178)
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51178 | gerald | 2013-08-06 16:45:51 -0700 (Tue, 06 Aug 2013) | 7 lines
- Changed paths:
- M /trunk/services
- A /trunk/tools/make-services.py
-
- Add a Python version of make-services.pl. Instead of trying to parse the
- plain text version of the registry it parses the CSV version (which
- should hopefully be more reliable). Tested with Pythons 2.5, 2.6, 2.7,
- and 3.3.
-
- Update the services file.
- ------------------------------------------------------------------------
- r51189 | gerald | 2013-08-07 09:33:39 -0700 (Wed, 07 Aug 2013) | 2 lines
- Changed paths:
- M /trunk/Makefile.am
- M /trunk/Makefile.nmake
- M /trunk/tools/Makefile.am
- M /trunk/tools/make-services.py
-
- Switch to make-services.py. Fix some variable names and version tests.
- ------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51228 | morriss | 2013-08-08 18:30:12 -0700 (Thu, 08 Aug 2013) | 13 lines
-Changed paths:
- M /trunk-1.10/asn1/nbap/nbap.cnf
- M /trunk-1.10/epan/dissectors/packet-nbap.c
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r51195 | martink | 2013-08-07 16:18:11 -0400 (Wed, 07 Aug 2013) | 4 lines
- Changed paths:
- M /trunk/asn1/nbap/nbap.cnf
- M /trunk/epan/dissectors/packet-nbap.c
-
- add a range check for dch_id
-
- this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005
- ------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51231 | morriss | 2013-08-08 19:04:46 -0700 (Thu, 08 Aug 2013) | 12 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/epan/dissectors/packet-assa_r3.c
-
-Copy over revision from trunk (before the fuzz bot picks up the capture file
-and starts generating duplicates of the bug):
-
- ------------------------------------------------------------------------
- r51196 | martink | 2013-08-07 17:17:53 -0400 (Wed, 07 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-assa_r3.c
-
- fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9020
- make sure that the loop counter is always incremented
- ------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51295 | gerald | 2013-08-11 07:19:12 -0700 (Sun, 11 Aug 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2013-08-11]
-------------------------------------------------------------------------
-r51353 | guy | 2013-08-14 00:39:31 -0700 (Wed, 14 Aug 2013) | 53 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ws_symbol_export.h
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r50382 | guy | 2013-07-04 11:11:59 -0700 (Thu, 04 Jul 2013) | 2 lines
-
- More details in a comment.
- ------------------------------------------------------------------------
- r50379 | guy | 2013-07-03 17:39:54 -0700 (Wed, 03 Jul 2013) | 2 lines
-
- Add more comments indicating what this is doing.
- ------------------------------------------------------------------------
- r50334 | guy | 2013-07-02 18:43:39 -0700 (Tue, 02 Jul 2013) | 12 lines
-
- WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;
- just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define
- WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern".
-
- Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that
- it's what should be used for definitions; at least on Windows, you
- *have* to use it when declaring arrays without a size, and, whilst you
- might be able to use WS_DLL_PUBLIC for definitions of functions and
- perhaps data definitions other than no-size arrays, it might be clearer
- to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for
- declarations.
- ------------------------------------------------------------------------
- r50332 | guy | 2013-07-02 17:38:41 -0700 (Tue, 02 Jul 2013) | 14 lines
-
- OK, try having WS_DLL_PUBLIC always say "extern". If *that* doesn't
- work, because it can't be used with definitions, we'll probably have to
- have separate macros for declarations and definitions, as I don't think
- MSVC likes
-
- int foo[];
-
- in a header file but should be fine with
-
- extern int foo[];
-
- Add some more comments while we're at it; you are in a twisty little
- maze of #ifdefs, all different.
- ------------------------------------------------------------------------
- r50329 | guy | 2013-07-02 15:08:23 -0700 (Tue, 02 Jul 2013) | 7 lines
-
- Methinks the "not GCC 4 or later" #defines for WS_DLL_PUBLIC and
- WS_DLL_LOCAL were reversed; that might be what's causing a build error
- with ui/qt/main_status_bar.cpp.
-
- Add some comments for #else's while we're at it, so it's easier to
- figure out when particular sets of #defines are used.
-
-and then back out the "rename WS_DLL_PUBLIC_NOEXTERN to
-WS_DLL_PUBLIC_DEF" change, to minimize the number of changes.
-
-------------------------------------------------------------------------
-r51354 | guy | 2013-08-14 00:44:30 -0700 (Wed, 14 Aug 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/epan/etypes.h
-
-Copy over r51332 from trunk, with manual intervention:
-
- ------------------------------------------------------------------------
- r51332 | guy | 2013-08-13 00:58:06 -0700 (Tue, 13 Aug 2013) | 2 lines
-
- Wrap in "extern "C"" for the benefit of C++ code including it.
-
-------------------------------------------------------------------------
-r51357 | guy | 2013-08-14 11:47:04 -0700 (Wed, 14 Aug 2013) | 3 lines
-Changed paths:
- M /trunk-1.10/ws_symbol_export.h
-
-Revert r51353, to see if that un-breaks the test stage of the 32-bit
-Windows build.
-
-------------------------------------------------------------------------
-r51367 | guy | 2013-08-14 20:39:38 -0700 (Wed, 14 Aug 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/epan/dissectors/packet-rtcdc.c
-
-Copy over r51366 from trunk:
-
- ------------------------------------------------------------------------
- r51366 | guy | 2013-08-14 20:37:51 -0700 (Wed, 14 Aug 2013) | 2 lines
-
- Add SVN properties to expand $Id$ and use native line endings.
-
-------------------------------------------------------------------------
-r51370 | guy | 2013-08-14 20:52:19 -0700 (Wed, 14 Aug 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/epan/dissectors/packet-gmr1_dtap.c
- M /trunk-1.10/epan/dissectors/packet-json.c
- M /trunk-1.10/epan/dissectors/packet-pulse.c
-
-Copy over r51369 from trunk, with manual intervention:
-
- ------------------------------------------------------------------------
- r51369 | guy | 2013-08-14 20:50:36 -0700 (Wed, 14 Aug 2013) | 2 lines
-
- Expand $Id$, use native line endings.
-
-------------------------------------------------------------------------
-r51374 | guy | 2013-08-14 20:57:10 -0700 (Wed, 14 Aug 2013) | 12 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/asn1/lcsap/packet-lcsap-template.c
- M /trunk-1.10/epan/dissectors/packet-lcsap.c
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r51372 | guy | 2013-08-14 20:54:23 -0700 (Wed, 14 Aug 2013) | 2 lines
-
- Fix $Id$
-
- ------------------------------------------------------------------------
- r51373 | guy | 2013-08-14 20:55:09 -0700 (Wed, 14 Aug 2013) | 2 lines
-
- Fix $Id$.
-
-------------------------------------------------------------------------
-r51377 | guy | 2013-08-14 21:02:10 -0700 (Wed, 14 Aug 2013) | 7 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/ws_symbol_export.h
-
-Copy over r51376 from trunk:
-
- ------------------------------------------------------------------------
- r51376 | guy | 2013-08-14 21:01:23 -0700 (Wed, 14 Aug 2013) | 2 lines
-
- Add $Id$.
-
-------------------------------------------------------------------------
-r51413 | gerald | 2013-08-18 07:19:26 -0700 (Sun, 18 Aug 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
- M /trunk-1.10/services
-
-[Automatic manuf, services and enterprise-numbers update for 2013-08-18]
-------------------------------------------------------------------------
-r51425 | pascal | 2013-08-19 04:25:35 -0700 (Mon, 19 Aug 2013) | 14 lines
-Changed paths:
- M /trunk-1.10/asn1/snmp/packet-snmp-template.c
- M /trunk-1.10/epan/dissectors/packet-ansi_637.c
- M /trunk-1.10/epan/dissectors/packet-bmc.c
- M /trunk-1.10/epan/dissectors/packet-cell_broadcast.c
- M /trunk-1.10/epan/dissectors/packet-dcerpc-netlogon.c
- M /trunk-1.10/epan/dissectors/packet-lapsat.c
- M /trunk-1.10/epan/dissectors/packet-opensafety.c
- M /trunk-1.10/epan/dissectors/packet-rlc-lte.c
- M /trunk-1.10/epan/dissectors/packet-rohc.c
- M /trunk-1.10/epan/dissectors/packet-snmp.c
- M /trunk-1.10/epan/dissectors/packet-xml.c
-
-Copy over from the trunk with manual intervention
-
-------------------------------------------------------------------------
-r51423 | pascal | 2013-08-19 12:39:43 +0200 (lun., 19 août 2013) | 2 lines
-
-Do not use ephemeral memory when adding a new data source
-
-------------------------------------------------------------------------
-r51424 | pascal | 2013-08-19 13:11:11 +0200 (lun., 19 août 2013) | 2 lines
-
-Do not use ephemeral memory when adding a new data source
-
-------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51426 | pascal | 2013-08-19 07:03:43 -0700 (Mon, 19 Aug 2013) | 2 lines
-Changed paths:
- M /trunk-1.10/epan/dissectors/packet-ansi_637.c
-
-Use pinfo memory pool instead of malloc in order to prevent a memory leak if an exception is thrown between buffer allocation and tvb_set_free_cb call
-
-------------------------------------------------------------------------
-r51463 | guy | 2013-08-21 20:35:04 -0700 (Wed, 21 Aug 2013) | 13 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/wiretap/file_access.c
-
-Copy over r51462 from trunk:
-
- ------------------------------------------------------------------------
- r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines
-
- What was I thinking? ".caz" is used for compressed *Windows* Sniffer
- files (which are just gzipped uncompressed Windows Sniffer files, albeit
- with the checksum computed differently in some fashion, or perhaps just
- being computed incorrectly), not compressed *DOS* Sniffer files (which
- use their own form of compression, which doesn't compress the entire
- file, just most of it, and which use the same extensions as uncompressed
- DOS Sniffer files).
-
-------------------------------------------------------------------------
-r51468 | guy | 2013-08-21 20:44:50 -0700 (Wed, 21 Aug 2013) | 10 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/wiretap/file_access.c
-
-Copy over r51467 from trunk:
-
- ------------------------------------------------------------------------
- r51467 | guy | 2013-08-21 20:43:39 -0700 (Wed, 21 Aug 2013) | 5 lines
-
- From Stephen Donnelly <stephen.donnelly@emulex.com>:
-
- Move the check for vwr files *after* the check for ERF files, as it
- sometimes thinks ERF files are VWR files.
-
-------------------------------------------------------------------------
-r51482 | guy | 2013-08-22 17:26:07 -0700 (Thu, 22 Aug 2013) | 2 lines
-Changed paths:
- M /trunk-1.10/ui/win32/file_dlg_win32.c
-
-Plug a memory leak.
-
-------------------------------------------------------------------------
-r51511 | gerald | 2013-08-25 07:19:16 -0700 (Sun, 25 Aug 2013) | 1 line
-Changed paths:
- M /trunk-1.10/epan/dissectors/usb.c
- M /trunk-1.10/manuf
- M /trunk-1.10/services
-
-[Automatic manuf, services and enterprise-numbers update for 2013-08-25]
-------------------------------------------------------------------------
-r51601 | pascal | 2013-08-30 10:43:07 -0700 (Fri, 30 Aug 2013) | 9 lines
-Changed paths:
- M /trunk-1.10/epan/dissectors/packet-gsm_a_common.c
- M /trunk-1.10/epan/dissectors/packet-gsm_a_gm.c
-
-Merge from trunk with manual intervention:
-------------------------------------------------------------------------
-r51599 | pascal | 2013-08-30 19:23:36 +0200 (ven., 30 août 2013) | 3 lines
-
-Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9085 :
-GSM A-I/F DTAP - Detach Request - Detach type is not displayed
-
-------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51623 | eapache | 2013-09-01 05:36:18 -0700 (Sun, 01 Sep 2013) | 25 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/asn1/ldap/packet-ldap-template.c
- M /trunk-1.10/epan/dissectors/packet-ldap.c
- M /trunk-1.10/epan/dissectors/packet-mq.c
- M /trunk-1.10/epan/dissectors/packet-rtps.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51213 | eapache | 2013-08-08 06:50:11 -0400 (Thu, 08 Aug 2013) | 4 lines
-
- Correctly check bounds on dim_max.
-
- Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9019
-
- ------------------------------------------------------------------------
- r51516 | eapache | 2013-08-25 13:31:15 -0400 (Sun, 25 Aug 2013) | 4 lines
-
- Make sure our ldap_call_response_t struct is always completely initialized,
- fixing a "Conditional jump or move depends on uninitialised value" error found
- by valgrind fuzzing.
-
- ------------------------------------------------------------------------
- r51603 | martink | 2013-08-30 14:13:54 -0400 (Fri, 30 Aug 2013) | 4 lines
-
- (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9079
-
- don't enter the for loop if there are no components to dissect
-
- ------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51630 | gerald | 2013-09-01 07:19:25 -0700 (Sun, 01 Sep 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
- M /trunk-1.10/services
-
-[Automatic manuf, services and enterprise-numbers update for 2013-09-01]
-------------------------------------------------------------------------
-r51793 | guy | 2013-09-05 16:56:49 -0700 (Thu, 05 Sep 2013) | 9 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/packaging/nsis/wireshark.nsi
-
-Copy over r51788 from trunk:
-
- ------------------------------------------------------------------------
- r51788 | cmaynard | 2013-09-05 10:51:17 -0700 (Thu, 05 Sep 2013) | 4 lines
-
- Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4, we need to use $\n for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103.
-
- #BACKPORT(1.10,1.8)
-
-------------------------------------------------------------------------
-r51807 | gerald | 2013-09-06 17:30:29 -0700 (Fri, 06 Sep 2013) | 45 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/dissectors/packet-netflow.c
- M /trunk-1.10/epan/dissectors/packet-per.c
- M /trunk-1.10/rawshark.c
- M /trunk-1.10/tools/make-dissector-reg.py
- M /trunk-1.10/ui/gtk/io_stat.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r50923 | darkjames | 2013-07-26 11:10:55 -0700 (Fri, 26 Jul 2013) | 4 lines
- Changed paths:
- M /trunk/ui/gtk/io_stat.c
-
- Fix bug #8980 - IO graph/advanced, max/min/summ error on frames with multiple Diameter messages
-
- tap_iostat_packet() was fetching only first item for FT_RELATIVE_TIME.
- ------------------------------------------------------------------------
- r50940 | eapache | 2013-07-26 16:16:16 -0700 (Fri, 26 Jul 2013) | 6 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-netflow.c
-
- Switch on field length for the length_min/max fields of IPFix. Like several
- other nearby fields, they are different lengths in different versions of the
- spec.
-
- Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8918
- ------------------------------------------------------------------------
- r49436 | eapache | 2013-05-20 07:56:18 -0700 (Mon, 20 May 2013) | 2 lines
- Changed paths:
- M /trunk/doc/reordercap.pod
-
- Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
- ------------------------------------------------------------------------
- r50969 | pascal | 2013-07-28 05:36:48 -0700 (Sun, 28 Jul 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-per.c
-
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8841 :
- Fix PER normally small non-negative whole number dissection when it is greater than or equal to 64
- ------------------------------------------------------------------------
- r51073 | gerald | 2013-07-31 13:14:35 -0700 (Wed, 31 Jul 2013) | 4 lines
- Changed paths:
- M /trunk/tools/make-dissector-reg.py
-
- Add support for Python 3. Make sure we pass bytes to hashlib.sha1 as
- suggested in bug 8995. Call print as a function instead of a builtin as
- suggested by 2to3.
- ------------------------------------------------------------------------
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51809 | gerald | 2013-09-06 18:19:23 -0700 (Fri, 06 Sep 2013) | 11 lines
-Changed paths:
- M /trunk-1.10/tools/make-dissector-reg.py
-
-Copy over r51079 from the trunk:
-
- ------------------------------------------------------------------------
- r51079 | gerald | 2013-07-31 16:32:45 -0700 (Wed, 31 Jul 2013) | 3 lines
- Changed paths:
- M /trunk/tools/make-dissector-reg.py
-
- Fix compatibility with older versions of Python. Tested with 2.5, 2.6,
- and 3.3.
- ------------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r51810 | gerald | 2013-09-06 18:37:32 -0700 (Fri, 06 Sep 2013) | 3 lines
-Changed paths:
- M /trunk-1.10/configure.ac
-
-Copy + paste the Python check block from trunk instead of trying to
-backport its associated changes.
-
-------------------------------------------------------------------------
-r51826 | eapache | 2013-09-07 11:39:47 -0700 (Sat, 07 Sep 2013) | 7 lines
-Changed paths:
- M /trunk-1.10/epan/reassemble.c
-
-Backport an entirely different fix for
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027
-
-This adds a memory leak, but that's better than the crash, and I have not found
-a sane way to fix this otherwise given the reassembly architecture in 1.10 (and
-prior).
-
-------------------------------------------------------------------------
-r51836 | gerald | 2013-09-08 07:19:21 -0700 (Sun, 08 Sep 2013) | 1 line
-Changed paths:
- M /trunk-1.10/manuf
- M /trunk-1.10/services
-
-[Automatic manuf, services and enterprise-numbers update for 2013-09-08]
-------------------------------------------------------------------------
-r51870 | gerald | 2013-09-09 10:34:35 -0700 (Mon, 09 Sep 2013) | 96 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/AUTHORS
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/dissectors/packet-ieee80211.c
- M /trunk-1.10/epan/dissectors/packet-scsi.c
- M /trunk-1.10/epan/dissectors/packet-sip.c
- M /trunk-1.10/plugins/ethercat/packet-ams.c
- M /trunk-1.10/plugins/profinet/packet-pn-mrp.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51152 | mmann | 2013-08-05 08:55:10 -0700 (Mon, 05 Aug 2013) | 31 lines
- Changed paths:
- M /trunk/AUTHORS
- M /trunk/epan/dissectors/packet-scsi.c
-
- SCSI dissector does not parse PERSISTENT RESERVE commands correctly. Bug 9012 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9012).
-
- From Bart Van Assche.
-
- Changes:
- - Add REGISTER AND MOVE and REPLACE LOST RESERVATION service actions.
- - Decode the PARAMETER LIST LENGTH field correctly - this is a four
- byte field instead of a two byte field.
- - For the REGISTER AND MOVE service action, add support for decoding
- the RELATIVE TARGET PORT IDENTIFIER, TRANSPORT ID LENGTH and
- TransportID fields.
- - Fix parsing of the SERVICE ACTION field - this field is five bits
- wide instead of four.
- - Move the definition of the "scsi.persresv.control.unreg" field just
- below the other REGISTER AND MOVE service action parameter list fields.
-
- See also http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc4r36h.pdf.
-
- - Only display persistent reservation information in a PERSISTENT
- RESERVE IN response if the ALLOCATION LENGTH field in the request
- was not zero.
- - Correct the offset of the (SPC-2) SCOPE-SPECIFIC ADDRESS field.
- This field starts at offset 16 and not at offset 8.
- - Correct the offsets of the SCOPE and TYPE fields. These fields
- are both contained in the byte at offset 21.
- - Correct the base of the TRANSPORTID LENGTH field from BASE_HEX
- into BASE_NONE since this is the base required by non-numeric types.
-
- For more information, see also:
- * http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc4r36h.pdf
- * http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc2r20.pdf
- ------------------------------------------------------------------------
- r51233 | pascal | 2013-08-09 00:58:27 -0700 (Fri, 09 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
-
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9022 :
- Fix dissection of Feature-Caps header field
- ------------------------------------------------------------------------
- r51313 | martink | 2013-08-12 03:15:01 -0700 (Mon, 12 Aug 2013) | 4 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
-
- coverity 280403 (logically dead code)
-
- set first to FALSE after the first block was dissected
- ------------------------------------------------------------------------
- r51321 | pascal | 2013-08-12 12:23:08 -0700 (Mon, 12 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-sip.c
-
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
- SIP contact-param parsing should be stopped when finding a comma separator
- ------------------------------------------------------------------------
- r51333 | pascal | 2013-08-13 01:19:41 -0700 (Tue, 13 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/plugins/profinet/packet-pn-mrp.c
-
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9035 :
- Indicate the right direction in info column
- ------------------------------------------------------------------------
- r51339 | alagoutte | 2013-08-13 10:50:22 -0700 (Tue, 13 Aug 2013) | 8 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
-
- From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038
- 802.11 HT Extended Capabilities B10 decode incorrect
-
- #Backport 1.10 and 1.8
-
- Within the 802.11 HT Capabilities IE the "HT Extended Capabilities" B10's name is incorrect.
-
- It is currently titled "High Throughput". This is incorrect/missleading. It should be something like "High Throughput Control (+HTC)". The field indicates if the "High Throughput Control (HTC)" field is supported - not if HT itself is supported.
- ------------------------------------------------------------------------
- r51360 | eapache | 2013-08-14 19:06:49 -0700 (Wed, 14 Aug 2013) | 6 lines
- Changed paths:
- M /trunk/plugins/ethercat/packet-ams.c
-
- As suggested by Volcke Mario, fixing
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036
-
- Don't change the length *and* the offset when adjusting for the ethercat header,
- just the offset is enough (the length is then right).
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51874 | gerald | 2013-09-09 11:28:56 -0700 (Mon, 09 Sep 2013) | 90 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/AUTHORS
- M /trunk-1.10/capture_opts.c
- M /trunk-1.10/capture_opts.h
- M /trunk-1.10/capture_stop_conditions.c
- M /trunk-1.10/capture_sync.c
- M /trunk-1.10/doc/dumpcap.pod
- M /trunk-1.10/doc/tshark.pod
- M /trunk-1.10/doc/wireshark.pod.template
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/dumpcap.c
- M /trunk-1.10/epan/dissectors/packet-bpdu.c
- M /trunk-1.10/epan/dissectors/packet-ieee80211-radiotap.c
- M /trunk-1.10/epan/dissectors/packet-ieee80211.c
- M /trunk-1.10/epan/dissectors/packet-ncp-sss.c
- M /trunk-1.10/epan/dissectors/packet-rohc.c
- M /trunk-1.10/packaging/macosx/Resources/Wireshark.icns
- M /trunk-1.10/rawshark.c
- M /trunk-1.10/ui/gtk/capture_dlg.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51422 | mmann | 2013-08-18 17:11:50 -0700 (Sun, 18 Aug 2013) | 5 lines
- Changed paths:
- M /trunk/AUTHORS
- M /trunk/epan/dissectors/packet-ieee80211-radiotap.c
-
- Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8989)
-
- From Karl Beldan
-
- BACKPORT(1.8,1.10)
- ------------------------------------------------------------------------
- r51493 | gerald | 2013-08-23 11:42:51 -0700 (Fri, 23 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/rawshark.c
-
- Initialize our wtap_pkthdr struct so that we don't try to dereference an
- invalid opt_comment pointer down the line.
- ------------------------------------------------------------------------
- r51523 | gerald | 2013-08-26 09:53:17 -0700 (Mon, 26 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/packaging/macosx/Resources/Wireshark.icns
-
- Use oldiconutil (https://github.com/uliwitness/oldiconutil) to convert
- our PNG-based icons to JPEG 2000. Hopefully fixes bug 8993.
- ------------------------------------------------------------------------
- r51610 | pascal | 2013-08-31 02:42:11 -0700 (Sat, 31 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-bpdu.c
-
- From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9088 :
- STP: fix dissection of MSTI Root Identifiers for all MSTIs
- ------------------------------------------------------------------------
-
-
-Copy over with manual intervention:
-
- ------------------------------------------------------------------------
- r51395 | cmaynard | 2013-08-16 13:46:45 -0700 (Fri, 16 Aug 2013) | 4 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-rohc.c
-
- Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value. While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len.
-
- #BACKPORT(1.10)
- ------------------------------------------------------------------------
- r51448 | cmaynard | 2013-08-20 15:42:46 -0700 (Tue, 20 Aug 2013) | 9 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ncp-sss.c
-
- Simplify find_delimiter() by making use of tvb_find_guint8().
- In sss_string():
- -> Protect against tvb_length_remaining() possibly returning -1.
- -> Fix off-by-1 potential buffer overflow condition.
- -> Use isprint() rather than "do-it-yourself" code.
- -> Remove the extra unnecessary "length_remaining" checks in the for() loop.
-
- #BACKPORT(1.10, 1.8)
- ------------------------------------------------------------------------
- r51508 | eapache | 2013-08-24 05:13:11 -0700 (Sat, 24 Aug 2013) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
-
- Use the correct length field when tagging the SSID. Fixes the first valgrind
- fuzz failure.
- ------------------------------------------------------------------------
- r51576 | cmaynard | 2013-08-29 11:15:13 -0700 (Thu, 29 Aug 2013) | 6 lines
- Changed paths:
- M /trunk/capture_opts.c
- M /trunk/capture_opts.h
- M /trunk/capture_stop_conditions.c
- M /trunk/capture_sync.c
- M /trunk/doc/dumpcap.pod
- M /trunk/doc/tshark.pod
- M /trunk/doc/wireshark.pod.template
- M /trunk/dumpcap.c
- M /trunk/ui/gtk/capture_dlg.c
-
- Handle the 2GiB boundary case of the max filesize autostop condition properly so that we avoid overflow conditions and so that we ensure we don't capture more than 2GiB. Also, document the max filesize autostop value of 2GIB as well as indicating that it's truly GiB and not GB.
-
- This fixes the problem reported on ask: http://ask.wireshark.org/questions/23891/wireshark-wont-run-with-multiple-capture-files
-
- #BACKPORT(1.10) ... not sure about 1.8?
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51875 | gerald | 2013-09-09 11:52:33 -0700 (Mon, 09 Sep 2013) | 53 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/asn1/isdn-sup/isdn-sup.cnf
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/dissectors/packet-gtpv2.c
- M /trunk-1.10/epan/dissectors/packet-isdn-sup.c
- M /trunk-1.10/epan/req_resp_hdrs.c
- M /trunk-1.10/epan/wslua/wslua_proto.c
- M /trunk-1.10/make-version.pl
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51785 | eapache | 2013-09-05 08:48:50 -0700 (Thu, 05 Sep 2013) | 4 lines
- Changed paths:
- M /trunk/epan/req_resp_hdrs.c
-
- As per the HTTP spec, prefer chunked transfer-encoding to content-length if we
- get both. Fixes reassembly for
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101
- ------------------------------------------------------------------------
- r51789 | cmaynard | 2013-09-05 11:51:46 -0700 (Thu, 05 Sep 2013) | 6 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-gtpv2.c
-
- Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string".
-
- Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex
-
- #BACKPORT(1.10,1.8)
- ------------------------------------------------------------------------
- r51800 | gerald | 2013-09-06 10:39:03 -0700 (Fri, 06 Sep 2013) | 2 lines
- Changed paths:
- M /trunk/asn1/isdn-sup/isdn-sup.cnf
- M /trunk/epan/dissectors/packet-isdn-sup.c
-
- Deduplicate some type and field names.
- ------------------------------------------------------------------------
- r51805 | stig | 2013-09-06 15:22:27 -0700 (Fri, 06 Sep 2013) | 2 lines
- Changed paths:
- M /trunk/epan/wslua/wslua_proto.c
-
- Make the Lua dissector "init" routine work again.
- ------------------------------------------------------------------------
- r51815 | stig | 2013-09-07 03:56:52 -0700 (Sat, 07 Sep 2013) | 3 lines
- Changed paths:
- M /trunk/epan/wslua/wslua_proto.c
-
- Added syntax and range checks for Lua Prefs.range default values.
- Fixed some small memory leakages.
- ------------------------------------------------------------------------
- r51566 | jmayer | 2013-08-28 11:27:16 -0700 (Wed, 28 Aug 2013) | 4 lines
- Changed paths:
- M /trunk/make-version.pl
-
- svn version 1.7.11 no longer has local .svn directories,
- just one at the top level. So on my system, /trunk no longer
- contains a .svn directory. Check in parent directory as well.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51876 | gerald | 2013-09-09 12:05:44 -0700 (Mon, 09 Sep 2013) | 26 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/proto.c
- M /trunk-1.10/epan/wslua/wslua_tvb.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51020 | martink | 2013-07-29 14:10:13 -0700 (Mon, 29 Jul 2013) | 5 lines
- Changed paths:
- M /trunk/epan/proto.c
-
- add a NULL check to report_type_length_mismatch()
-
- this might be called via proto_tree_add_item() with tree==NULL
- which results in a crash
- ------------------------------------------------------------------------
- r51872 | stig | 2013-09-09 10:49:22 -0700 (Mon, 09 Sep 2013) | 6 lines
- Changed paths:
- M /trunk/epan/wslua/wslua_tvb.c
-
- Removed return value from ByteArray append and prepend, as this did push
- the same ByteArray twice (and thus calling the GC twice).
- This should fix bug 4461.
-
- Changed ByteArray concat to create a new array to be returned.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51910 | gerald | 2013-09-09 17:07:17 -0700 (Mon, 09 Sep 2013) | 19 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/filesystem.c
- M /trunk-1.10/wiretap/netmon.c
-
-Copy over r49673 from the trunk:
-
- ------------------------------------------------------------------------
- r49673 | guy | 2013-05-31 23:48:37 -0700 (Fri, 31 May 2013) | 7 lines
- Changed paths:
- M /trunk/epan/filesystem.c
- M /trunk/wiretap/netmon.c
-
- When allocating the frame table for a NetMon file, use g_try_malloc(),
- and fail with ENOMEM if that fails (and the frame table is not empty -
- g_try_malloc() will return NULL if you ask it to allocate zero bytes).
-
- Have an error message for ENOMEM on an open that attempts to tell the
- user what the problem is without making their head explode.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51912 | gerald | 2013-09-09 17:14:09 -0700 (Mon, 09 Sep 2013) | 23 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/wslua/wslua_field.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r51899 | stig | 2013-09-09 14:20:26 -0700 (Mon, 09 Sep 2013) | 4 lines
- Changed paths:
- M /trunk/epan/wslua/wslua_field.c
-
- Initialize all tvb values in FieldInfo_get_range.
-
- This fixes bug 5200.
- ------------------------------------------------------------------------
- r51903 | stig | 2013-09-09 14:42:49 -0700 (Mon, 09 Sep 2013) | 4 lines
- Changed paths:
- M /trunk/epan/wslua/wslua_field.c
-
- Return ByteArray as "value" for FieldInfo's with type FT_NONE (which has data).
-
- This fixes bug 5201.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r51925 | guy | 2013-09-10 03:35:50 -0700 (Tue, 10 Sep 2013) | 13 lines
-Changed paths:
- M /trunk-1.10
- M /trunk-1.10/configure.ac
-
-Copy over revisions from trunk:
-
- ------------------------------------------------------------------------
- r51921 | guy | 2013-09-10 03:24:00 -0700 (Tue, 10 Sep 2013) | 3 lines
-
- When building for 10.4 or 10.5, force 32-bit x86 on x86 and 32-bit PPC
- on PPC.
-
- ------------------------------------------------------------------------
- r51923 | guy | 2013-09-10 03:28:30 -0700 (Tue, 10 Sep 2013) | 2 lines
-
- Use -m32, instead, as per Michael Tuexen's suggestion.
-
-------------------------------------------------------------------------
-r51931 | gerald | 2013-09-10 08:39:51 -0700 (Tue, 10 Sep 2013) | 16 lines
-Changed paths:
- M /trunk-1.10/docbook/release-notes.asciidoc
- M /trunk-1.10/epan/CMakeLists.txt
- M /trunk-1.10/epan/Makefile.am
- M /trunk-1.10/file.c
- M /trunk-1.10/tools/compare-abis.sh
- M /trunk-1.10/wiretap/CMakeLists.txt
- M /trunk-1.10/wiretap/Makefile.am
-
-Add ABI check and library version updates from Balint.
-
-Copy over with manual intervention:
-
- ------------------------------------------------------------------------
- r51791 | pascal | 2013-09-05 13:35:03 -0700 (Thu, 05 Sep 2013) | 3 lines
- Changed paths:
- M /trunk/file.c
-
- Try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9106 :
- Intialize phdr structure to avoid an invalid access to phdr->opt_comment
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
+Last rev 51940
diff --git a/config.nmake b/config.nmake
index 536bbd8ff7..79ad220bf5 100644
--- a/config.nmake
+++ b/config.nmake
@@ -29,7 +29,7 @@ SVN_REVISION=0
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=10
-VERSION_MICRO=2
+VERSION_MICRO=3
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your
diff --git a/configure.ac b/configure.ac
index cfa8f05a53..6c058830f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
m4_define([version_major], [1])
m4_define([version_minor], [10])
-m4_define([version_micro], [2])
+m4_define([version_micro], [3])
m4_define([version_micro_extra], version_micro)
m4_append([version_micro_extra], [])
diff --git a/debian/changelog b/debian/changelog
index 2196941984..2f389ae1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.10.2) unstable; urgency=low
+wireshark (1.10.3) unstable; urgency=low
* Self-made package
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index a3dce91f5a..1d9a4ed5ce 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -4,7 +4,7 @@
[replacements]
# Yes, this is a fake macro.
-wireshark-version:\[\]=1.10.2
+wireshark-version:\[\]=1.10.3
[macros]
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index cd69666b36..308578fb9b 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -17,137 +17,24 @@ The following vulnerabilities have been fixed.
//* ws-salink:2013-11[]
//* cve-idlink:2013-2486[]
-* ws-salink:2013-54[]
+* ws-salink:2013-61[]
+
-The Bluetooth HCI ACL dissector could crash. Discovered by Laurent Butti.
-// Fixed in trunk: r50268
-// Fixed in trunk-1.10: r51330
-(ws-buglink:8827[])
+Something is up with a dissector.
+// Fixed in trunk: r?????
+// Fixed in trunk-1.10: r?????
+// Fixed in trunk-1.8: r?????
+(ws-buglink:????[])
+
-Versions affected: 1.10.0 to 1.10.1
+Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
//+
//cve-idlink:2013-????[]
-* ws-salink:2013-55[]
-+
-The NBAP dissector could crash. Discovered by Laurent Butti.
-// Fixed in trunk: r51195
-// Fixed in trunk-1.10: r51228
-// Fixed in trunk-1.8: r51230
-(ws-buglink:9005[])
-+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
-
-* ws-salink:2013-56[]
-+
-The ASSA R3 dissector could go into an infinite loop. Discovered by Ben Schmidt.
-// Fixed in trunk: r51196
-// Fixed in trunk-1.10: r51231
-// Fixed in trunk-1.8: r51232
-(ws-buglink:9020[])
-+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
-
-* ws-salink:2013-57[]
-+
-The RTPS dissector could overflow a buffer. Discovered by Ben Schmidt.
-// Fixed in trunk: r51213
-// Fixed in trunk-1.10: r51623
-// Fixed in trunk-1.8: r51624
-(ws-buglink:9019[])
-+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
-
-* ws-salink:2013-58[]
-+
-The MQ dissector could crash.
-// Fixed in trunk: r51603
-// Fixed in trunk-1.10: r51623
-// Fixed in trunk-1.8: r51624
-(ws-buglink:9079[])
-+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
-
-* ws-salink:2013-59[]
-+
-The LDAP dissector could crash.
-// Fixed in trunk: r51516
-// Fixed in trunk-1.10: r51623
-// Fixed in trunk-1.8: r51624
-// (ws-buglink:????[])
-//+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
-
-* ws-salink:2013-60[]
-+
-The Netmon file parser could crash. Discovered by G. Geshev.
-// Fixed in trunk: r49673
-// Fixed in trunk-1.10: r51910
-// Fixed in trunk-1.8: r51911
-(ws-buglink:8742[])
-+
-Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9
-//+
-//cve-idlink:2013-????[]
The following bugs have been fixed:
//* Wireshark will practice the jazz flute for hours on end when you're trying to sleep. ws-buglink:0000[]
-* Lua ByteArray:append() causes wireshark crash. (ws-buglink:4461[])
-
-* Lua script can not get "data-text-lines" protocol data. (ws-buglink:5200[])
-
-* Lua: Trying to use Field.new("tcp.segments") to get reassembled TCP data is failed. (ws-buglink:5201[])
-
-* "Edit Interface Settings": "Capture Filter" combo box is not populated across Wireshark sessions. (ws-buglink:7278[])
-
-* PER normally small non-negative whole number decoding is wrong when >= 64. (ws-buglink:8841[])
-
-* Strange behavior of tree expand/collapse in packet details. (ws-buglink:8908[])
-
-* Incorrect parsing of IPFIX *IpTotalLength elements. (ws-buglink:8918[])
-
-* IO graph/advanced, max/min/summ error on frames with multiple Diameter messages. (ws-buglink:8980[])
-
-* pod2man error on reordercap.pod. (ws-buglink:8982[])
-
-* SGI Nsym disambiguation is unconditionally displayed when dissecting VHT. (ws-buglink:8989[])
-
-* The Wireshark icon doesn't show up in OS X 10.5. (ws-buglink:8993[])
-
-* Build fails if system Python is version 3+. (ws-buglink:8995[])
-
-* SCSI dissector does not parse PERSISTENT RESERVE commands correctly. (ws-buglink:9012[])
-
-* SDP messages throws an assert. (ws-buglink:9022[])
-
-* Wireshark fails to decode single-line, multiple Contact: URIs in SIP responses. (ws-buglink:9031[])
-
-* PN_MRP LinkUp Message is shown as LinkDown in info. (ws-buglink:9035[])
-
-* Dissector for EtherCAT: ADS highlighting in the Packet Bytes Pane is incorrect. (ws-buglink:9036[])
-
-* 802.11 HT Extended Capabilities B10 decode incorrect. (ws-buglink:9038[])
-
-* Wrong dissection of MSTI Root Identifiers for all MSTIs. (ws-buglink:9088[])
-
-* Weird malformed HTTP error. (ws-buglink:9101[])
-
-* Warning for attempting to install 64-bit Wireshark on a 32-bit machine has an embedded "\n". (ws-buglink:9103[])
-
-* Wireshark crashes when using "Export Specified Packets" > "Displayed". (ws-buglink:9106[])
=== New and Updated Features
@@ -161,26 +48,7 @@ There are no new protocols in this release.
--sort-and-group--
-ASN.1 PER
-ASSA R3
-Bluetooth HCI ACL
-EtherCAT AMS
-GTPv2
-HTTP
-IEEE 802.11
-IPFIX
-ISDN SUP
-LDAP
-MQ
-NBAP
-Novell SSS
-PROFINET MRP
-Radiotap
-ROHC
-RTPS
-SCSI
-SIP
-STP
+.
--sort-and-group--
@@ -188,7 +56,7 @@ STP
--sort-and-group--
-Microsoft Network Monitor, pcap-ng.
+.
--sort-and-group--
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 78743891da..e9bbbe162a 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -56,7 +56,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 4:1:1 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 4:3:1 @LDFLAGS_SHAREDLIB@
include Makefile.common
diff --git a/make-version.pl b/make-version.pl
index 270ae39168..d77dd29c7f 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -75,7 +75,7 @@ my $set_release = 0;
my %version_pref = (
"version_major" => 1,
"version_minor" => 10,
- "version_micro" => 2,
+ "version_micro" => 3,
"version_build" => 0,
"enable" => 1,
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 6edd1ac93b..9b40da8f87 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -30,7 +30,7 @@ include Makefile.common
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 3:2:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 3:3:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-17 22:47:49 +0000