|
[-]
[+]
|
Changed |
wireshark.changes
|
|
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/ChangeLog
^
|
| @@ -1,940 +1,107 @@
------------------------------------------------------------------------
-r40436 | gerald | 2012-01-11 09:00:56 -0800 (Wed, 11 Jan 2012) | 6 lines
+r41830 | gerald | 2012-03-29 13:19:56 -0700 (Thu, 29 Mar 2012) | 2 lines
Changed paths:
- M /trunk-1.6/debian/wireshark-common.files
- M /trunk-1.6/epan/Makefile.am
- M /trunk-1.6/make-version.pl
- M /trunk-1.6/wiretap/Makefile.am
-
-Have "make-version.pl -v" update the library revision information for
-libwireshark and libwiretap. The source code for each changes with every
-release and according to the libtool documentation we should increment
-the revision number. (wsutil hardly ever changes so we don't update it
-here.)
-
-------------------------------------------------------------------------
-r40438 | cmaynard | 2012-01-11 10:38:20 -0800 (Wed, 11 Jan 2012) | 2 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
-
-Bug 5580 has been fixed, so don't list it as a known issue any longer.
-
-------------------------------------------------------------------------
-r40514 | gerald | 2012-01-15 07:33:51 -0800 (Sun, 15 Jan 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-01-15]
-------------------------------------------------------------------------
-r40652 | gerald | 2012-01-22 07:33:55 -0800 (Sun, 22 Jan 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-01-22]
-------------------------------------------------------------------------
-r40758 | gerald | 2012-01-29 07:33:44 -0800 (Sun, 29 Jan 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
-
-[Automatic manuf, services and enterprise-numbers update for 2012-01-29]
-------------------------------------------------------------------------
-r40870 | gerald | 2012-02-05 07:33:54 -0800 (Sun, 05 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-02-05]
-------------------------------------------------------------------------
-r40982 | gerald | 2012-02-12 07:33:48 -0800 (Sun, 12 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-02-12]
-------------------------------------------------------------------------
-r41037 | guy | 2012-02-15 22:39:44 -0800 (Wed, 15 Feb 2012) | 10 lines
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Support Section Header Block options of arbitrary size - change
-backported from the trunk.
-
-Should fix the immediate problem in bug 6846; we also need to make sure
-(in all branches) that, as long as the file begins with an SHB with a
-valid byte order field, we recognize the file as a pcap-NG file (so that
-if there really *is* a problem with the SHB, the error reported to the
-user is an error in a pcap-NG file's SHB, *not* an "unknown file type"
-error).
-
-------------------------------------------------------------------------
-r41057 | guy | 2012-02-17 16:01:02 -0800 (Fri, 17 Feb 2012) | 10 lines
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-mp2t.c
-
-Don't trust the pointer value in a packet; it could be invalid, and this
-could cause an unsigned length value to be reduced by more than its
-value, turning it into a very large value.
-
-This is, in effect, a backport of r41001 and r41002 to 1.6, although the
-code path is different enough that it had to be done by hand. I don't
-know whether bug 6833 would show up in 1.6, but, in any case, clearly
-setting remaining_length to a negative number Would Be Wrong, so let's
-not do that.
-
-------------------------------------------------------------------------
-r41067 | gerald | 2012-02-19 07:34:07 -0800 (Sun, 19 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-02-19]
-------------------------------------------------------------------------
-r41097 | etxrab | 2012-02-20 22:44:50 -0800 (Mon, 20 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Support options of arbitrary size - changes backported from the trunk.
-------------------------------------------------------------------------
-r41098 | etxrab | 2012-02-20 22:54:57 -0800 (Mon, 20 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Free the buffer
-------------------------------------------------------------------------
-r41100 | etxrab | 2012-02-20 23:24:53 -0800 (Mon, 20 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Declare opt_cont_buf_len
-------------------------------------------------------------------------
-r41130 | guy | 2012-02-21 14:25:13 -0800 (Tue, 21 Feb 2012) | 3 lines
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-WTAP_ERR_BAD_RECORD was renamed WTAP_ERR_BAD_FILE in the 1.7 branch; we
-still have to use WTAP_ERR_BAD_RECORD in 1.6 and before.
-
-------------------------------------------------------------------------
-r41142 | etxrab | 2012-02-22 09:42:05 -0800 (Wed, 22 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/diameter/Cisco.xml
- M /trunk-1.6/diameter/TGPPGmb.xml
- M /trunk-1.6/diameter/dictionary.xml
- M /trunk-1.6/diameter/imscxdx.xml
-
-Update diameter.xml files
-------------------------------------------------------------------------
-r41147 | etxrab | 2012-02-22 23:15:09 -0800 (Wed, 22 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-xml.c
-
-Update default_media_types
-------------------------------------------------------------------------
-r41153 | guy | 2012-02-23 02:12:51 -0800 (Thu, 23 Feb 2012) | 39 lines
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Copy over revisions from the trunk, with manual intervention:
-
- ------------------------------------------------------------------------
- r41152 | guy | 2012-02-23 02:03:16 -0800 (Thu, 23 Feb 2012) | 10 lines
-
- Do a check of the block total length in pcapng_read_unknown_block().
-
- That means we don't need to do the block length check in
- pcapng_read_block(); each block type reader, including the one for
- unknown block types, does a check that's as stringent as that block
- length check or more stringent, which means any block whose length is
- less than the minimum will fail with the same error in both cases.
-
- Fix the message for a too-short NRB.
-
- ------------------------------------------------------------------------
- r41145 | guy | 2012-02-22 15:44:25 -0800 (Wed, 22 Feb 2012) | 2 lines
-
- Fix typo introduced by previous checkin.
-
- ------------------------------------------------------------------------
- r41143 | guy | 2012-02-22 10:32:43 -0800 (Wed, 22 Feb 2012) | 16 lines
-
- Add sanity checks to make sure the claimed block size is big enough to:
-
- 1) contain the block length fields and block type field;
-
- 2) contain that plus the fixed-length portion of the block;
-
- 3) for blocks that have a variable-length portion other than the
- options, contain that variable-length portion.
-
- Fixes a crash we're seeing with a bad pcap-NG file in the Wireshark
- menagerie (7799-lastPacketWithoutComment.pcapng - the last packet's
- block length is 128, but it claims to have 98 bytes of packet data,
- which requires a 132-byte block).
-
- Clean up white space (use 8-space tabs).
-
-------------------------------------------------------------------------
-r41191 | gerald | 2012-02-26 07:34:19 -0800 (Sun, 26 Feb 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-02-26]
-------------------------------------------------------------------------
-r41287 | etxrab | 2012-03-01 22:52:09 -0800 (Thu, 01 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/README.irix
- M /trunk-1.6/config.nmake
- M /trunk-1.6/wiretap/pcapng.c
-
-Move over 41259
-------------------------------------------------------------------------
-r41288 | etxrab | 2012-03-01 22:55:50 -0800 (Thu, 01 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/README.irix
M /trunk-1.6/config.nmake
+ M /trunk-1.6/tools/win64-setup.sh
-Revert files commited by mistake
-------------------------------------------------------------------------
-r41333 | guy | 2012-03-03 23:52:36 -0800 (Sat, 03 Mar 2012) | 20 lines
-Changed paths:
- M /trunk-1.6/wiretap/pcapng.c
-
-Manually copy over rev 41332:
-
- r41332 | guy | 2012-03-03 18:20:25 -0800 (Sat, 03 Mar 2012) | 11 lines
-
- Make sure all names in NRB records are null-terminated; report an error
- if they're not. Also report an error for zero-length names.
-
- Handle multiple names per IP address - the pcap-NG spec says "one or
- more zero-terminated strings containing the DNS entries for that
- address."
-
- Use a Buffer to hold NRB records, so there's no maximum size (well,
- there is a maximum size, because the record length is 16 bits, but let's
- not allocate 64KiB on the stack if we don't have to).
-
-but process only the first name in a NRB record - for resolving IP
-addresses to names, only the first name matters, and, while for
-resolving names to IP addresses in, for example, display filters, all
-names would matter, we don't process all names.
-
-------------------------------------------------------------------------
-r41335 | gerald | 2012-03-04 07:34:08 -0800 (Sun, 04 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
+Use the GnuTLS 2.12.18-1.2-1 bundle.
-[Automatic manuf, services and enterprise-numbers update for 2012-03-04]
------------------------------------------------------------------------
-r41348 | guy | 2012-03-04 23:18:13 -0800 (Sun, 04 Mar 2012) | 6 lines
+r41854 | gerald | 2012-03-30 10:53:59 -0700 (Fri, 30 Mar 2012) | 3 lines
Changed paths:
- M /trunk-1.6/dumpcap.c
-
-Don't try to write an interface statistics block if we're capturing from
-a pipe - we don't have a pcap_t from which to get the statistics in that
-case.
+ M /trunk-1.6/Makefile.am
-Fixes bug 5939.
-
-------------------------------------------------------------------------
-r41372 | etxrab | 2012-03-06 01:44:15 -0800 (Tue, 06 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/gtk/capture_dlg.c
- M /trunk-1.6/gtk/capture_dlg.h
- M /trunk-1.6/gtk/main.c
+Remove the dependency on tools/make-services.pl for the services target.
+This is likely the cause of unwanted "services" file build attempts.
-From Bogdan Harjoc: Backport fix for 5 or 30 second UI hang when adding 'ip host ...' capture filter in Capture Options Dialog' gtk/main.c gtk/capture_dlg.h gtk/capture_dlg.c
------------------------------------------------------------------------
-r41484 | gerald | 2012-03-11 07:34:02 -0700 (Sun, 11 Mar 2012) | 1 line
+r41879 | gerald | 2012-04-01 07:33:58 -0700 (Sun, 01 Apr 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-03-11]
-------------------------------------------------------------------------
-r41549 | gerald | 2012-03-14 11:55:18 -0700 (Wed, 14 Mar 2012) | 183 lines
-Changed paths:
- M /trunk-1.6/asn1/goose/packet-goose-template.c
- M /trunk-1.6/doc/tshark.pod
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-dtls.c
- M /trunk-1.6/epan/dissectors/packet-goose.c
- M /trunk-1.6/epan/dissectors/packet-gsm_a_gm.c
- M /trunk-1.6/epan/dissectors/packet-gtp.c
- M /trunk-1.6/epan/dissectors/packet-iax2.c
- M /trunk-1.6/epan/dissectors/packet-mysql.c
- M /trunk-1.6/epan/dissectors/packet-packetbb.c
- M /trunk-1.6/epan/dissectors/packet-pgm.c
- M /trunk-1.6/epan/dissectors/packet-ssl.c
- M /trunk-1.6/epan/dissectors/packet-tcp.c
- M /trunk-1.6/epan/dissectors/packet-tcp.h
- M /trunk-1.6/epan/dissectors/packet-wsp.c
- M /trunk-1.6/epan/uat.h
- M /trunk-1.6/gtk/drag_and_drop.c
- M /trunk-1.6/gtk/main_toolbar.c
- M /trunk-1.6/gtk/main_toolbar.h
- M /trunk-1.6/gtk/menus.c
- M /trunk-1.6/gtk/tcp_graph.c
- M /trunk-1.6/plugins/mate/mate.h
- M /trunk-1.6/plugins/mate/mate_runtime.c
- M /trunk-1.6/plugins/mate/mate_util.c
- M /trunk-1.6/plugins/mate/mate_util.h
- M /trunk-1.6/wiretap/k12text.l
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r37752 | etxrab | 2011-06-22 07:49:26 -0700 (Wed, 22 Jun 2011) | 1 line
- Changed paths:
- M /trunk/epan/dissectors/packet-gsm_a_gm.c
-
- Protect the columns from beeing overwritten.
- ------------------------------------------------------------------------
- r39873 | guy | 2011-11-15 17:56:58 -0800 (Tue, 15 Nov 2011) | 2 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-mysql.c
-
- Thou shalt not use proto_tree_add_string() with an FT_BYTES field.
- ------------------------------------------------------------------------
- r40508 | guy | 2012-01-14 12:58:41 -0800 (Sat, 14 Jan 2012) | 6 lines
- Changed paths:
- M /trunk/wiretap/k12text.l
-
- wth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulation
- directly to k12text_set_pseudo_header(), so that it's passed the right
- encapsulation for seek-and-read as well as for read. Fixes the
- "malformed frames when reading some K12 text files" problem for which
- we're using bug 6735.
- ------------------------------------------------------------------------
- r40547 | wmeier | 2012-01-16 11:05:32 -0800 (Mon, 16 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/plugins/mate/mate.h
- M /trunk/plugins/mate/mate_runtime.c
- M /trunk/plugins/mate/mate_util.c
- M /trunk/plugins/mate/mate_util.h
-
- Use GSlice API instead of GMemChunk API for some memory allocation.
- ------------------------------------------------------------------------
- r40616 | cmaynard | 2012-01-20 14:03:52 -0800 (Fri, 20 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-packetbb.c
-
- Avoid a potential infinite loop by stopping dissection when a message has no tlvblock. Patch from Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687
- ------------------------------------------------------------------------
- r40644 | cmaynard | 2012-01-21 17:59:00 -0800 (Sat, 21 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-pgm.c
-
- Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name because I don't know how to enter Cyrillic letters) to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687 - Some PGM options are not parsed correctly.
- ------------------------------------------------------------------------
- r40702 | etxrab | 2012-01-24 11:23:05 -0800 (Tue, 24 Jan 2012) | 3 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-gtp.c
-
- max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.(Wrong length check)
-
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761
- ------------------------------------------------------------------------
- r40873 | etxrab | 2012-02-05 10:25:01 -0800 (Sun, 05 Feb 2012) | 5 lines
- Changed paths:
- M /trunk/asn1/goose/packet-goose-template.c
- M /trunk/epan/dissectors/packet-goose.c
-
- GOOSE Messages don't use the length field to perform the dissection.
-
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6734
-
- #BACKPORT:YES
- ------------------------------------------------------------------------
- r40911 | cmaynard | 2012-02-06 19:20:33 -0800 (Mon, 06 Feb 2012) | 5 lines
- Changed paths:
- M /trunk/doc/tshark.pod
-
- Update the documentation to match the sort order. This documentation error was pointed out by Markus Amend on -users.
- Reference: http://article.gmane.org/gmane.network.wireshark.user/14477
-
- (BTW, I quickly scanned through tap-iousers.c:iousers_draw() and the sorting seems to be very inefficient.)
- ------------------------------------------------------------------------
- r40944 | morriss | 2012-02-09 11:17:28 -0800 (Thu, 09 Feb 2012) | 5 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-iax2.c
-
- From Sean Bright via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815 :
-
- Don't use tvb_get_ptr() to retrieve a string being sent into
- proto_tree_add_string_format(): use tvb_get_ephemeral_string() instead.
- ------------------------------------------------------------------------
- r37856 | cmaynard | 2011-07-01 12:40:35 -0700 (Fri, 01 Jul 2011) | 7 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-tcp.c
-
- Since the TCP Flags tree encompasses 12 bits including the 3 reserved bits and
- the nonce bit, we should display 3 nibbles on the Flags summary line in order
- to represent all flag bits. While arguably we need not worry about reserved
- bits, the nonce bit is not currently represented, so that bit alone pushes us
- into the next nibble.
- ------------------------------------------------------------------------
- r40949 | cmaynard | 2012-02-09 19:37:28 -0800 (Thu, 09 Feb 2012) | 2 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-tcp.c
- M /trunk/epan/dissectors/packet-tcp.h
-
- Since the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits, so its type needs to be changed from an FT_UINT8 to an FT_UINT16. This should avoid the crash experienced by Lanell Allen as reported on -dev: http://article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash).
- ------------------------------------------------------------------------
-
-
-Copy over by hand:
-
- ------------------------------------------------------------------------
- r40615 | cmaynard | 2012-01-20 13:20:53 -0800 (Fri, 20 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/ui/gtk/drag_and_drop.c
-
- Convert forward slashes in URI to backslashes if WIN32. Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237
- ------------------------------------------------------------------------
- r40727 | guy | 2012-01-25 15:03:33 -0800 (Wed, 25 Jan 2012) | 4 lines
- Changed paths:
- M /trunk/epan/uat.h
- M /trunk/epan/wslua/wslua_proto.c
-
- Fix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
- modify the string in place, they return a g_mallocated modified version
- of the string passed into them.
- ------------------------------------------------------------------------
- r40730 | cmaynard | 2012-01-26 07:51:05 -0800 (Thu, 26 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-wsp.c
-
- Fix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_stringz().
- ------------------------------------------------------------------------
- r40769 | stig | 2012-01-30 05:05:27 -0800 (Mon, 30 Jan 2012) | 2 lines
- Changed paths:
- M /trunk/ui/gtk/main_menubar.c
- M /trunk/ui/gtk/main_toolbar.c
- M /trunk/ui/gtk/main_toolbar.h
-
- Disable the save-as button in the toolbar if we cannot save-as,
- because this will assert.
- ------------------------------------------------------------------------
- r40927 | stig | 2012-02-08 03:16:30 -0800 (Wed, 08 Feb 2012) | 2 lines
- Changed paths:
- M /trunk/ui/gtk/main_menubar.c
-
- Disable the File->Merge... menu item if we cannot save-as,
- because this will assert.
- ------------------------------------------------------------------------
- r40937 | etxrab | 2012-02-08 11:56:48 -0800 (Wed, 08 Feb 2012) | 8 lines
- Changed paths:
- M /trunk/ui/gtk/main_menubar.c
-
- From a.piesk:
- no menu item Fle->Export->SSL Session Keys in GTK
- Ported to 1.7 by me.
-
- #BACKPORT
- Use the patch in the bug report.
-
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813
- ------------------------------------------------------------------------
- r40950 | cmaynard | 2012-02-09 21:05:17 -0800 (Thu, 09 Feb 2012) | 2 lines
- Changed paths:
- M /trunk/ui/gtk/tcp_graph.c
-
- Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h.
- ------------------------------------------------------------------------
- r40952 | morriss | 2012-02-10 15:08:46 -0800 (Fri, 10 Feb 2012) | 13 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-dtls.c
- M /trunk/epan/dissectors/packet-ssl.c
-
- Fix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817 :
-
- r40200 made ssl_parse()/dtls_parse() post-update-callbacks for those
- dissector's UATs so that the dissector would be updated when the user changed
- the UAT. (This allows SSL/DTLS keys to be taken into account without requiring
- Wireshark to be restarted.)
-
- But, those functions also update the UAT themselves if the old-style keys_list
- preference is used, creating an infinite recursion.
-
- Fix this by splitting the *_parse() functions into two: one for the UAT and one
- for the old-style keys list.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r41568 | gerald | 2012-03-15 12:23:55 -0700 (Thu, 15 Mar 2012) | 14 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-ansi_a.c
-
-Copy over r40962 from the trunk:
-
- ------------------------------------------------------------------------
- r40962 | guy | 2012-02-10 18:31:52 -0800 (Fri, 10 Feb 2012) | 4 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ansi_a.c
-
- Global variables considered harmful. Pass pinfo along as a parameter;
- this appears to fix bug 6823 (the actual crash was a null pinfo being
- passed to call_dissector()).
- ------------------------------------------------------------------------
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r41576 | gerald | 2012-03-15 14:47:56 -0700 (Thu, 15 Mar 2012) | 46 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-ieee80211.c
-
-Copy over r40967 from the trunk:
-
- ------------------------------------------------------------------------
- r40967 | guy | 2012-02-10 23:12:34 -0800 (Fri, 10 Feb 2012) | 37 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
-
- Don't use 16-bit integers as counters. The code won't be any faster on
- anything that can run Wireshark (it might be slower), and if the maximum
- count value is 16-bit, you can loop forever if the maximum count value
- happens to be 65535.
-
- (Yes, this means that
-
- guint i, j;
-
- ...
-
- for (i = 0; i < j; i++)
- ...
-
- risks looping forever if j is 2^32-1, and the same applies to 64-bit
- counters. There are probably fewer protocols with 32-bit counts, and
- probably even fewer with 64-bit counts, but the way it should be done in
- those cases, for safety, is
-
- i = 0;
- for (;;) {
- if (i >= j)
- break;
-
- ...
-
- if (i == j - 1)
- break;
- }
-
- or something such as that.)
-
- Fixes bug 6809.
-
- #BACKPORT
- Will schedule for 1.6.x.
-
- ------------------------------------------------------------------------
-
+[Automatic manuf, services and enterprise-numbers update for 2012-04-01]
------------------------------------------------------------------------
-r41578 | gerald | 2012-03-15 15:04:33 -0700 (Thu, 15 Mar 2012) | 15 lines
+r41940 | cmaynard | 2012-04-04 12:39:52 -0700 (Wed, 04 Apr 2012) | 2 lines
Changed paths:
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/wiretap/pcap-common.c
-Copy over r41008 from the trunk with manual intervention:
-
- ------------------------------------------------------------------------
- r41008 | morriss | 2012-02-12 19:03:03 -0800 (Sun, 12 Feb 2012) | 7 lines
- Changed paths:
- M /trunk/wiretap/pcap-common.c
-
- Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804
-
- For WTAP_ENCAP_ERF files if we find an Extension and/or Multi-Channel header,
- ensure that the size of the full pseudoheader is smaller than the packet size
- to avoid an underflow and subsequent attempt to allocate a rather large amount
- of memory.
- ------------------------------------------------------------------------
+Bug 3046 was fixed at one point but is back again, so add it back to the list of known bugs.
------------------------------------------------------------------------
-r41583 | gerald | 2012-03-15 16:44:31 -0700 (Thu, 15 Mar 2012) | 131 lines
+r41972 | gerald | 2012-04-06 10:43:35 -0700 (Fri, 06 Apr 2012) | 65 lines
Changed paths:
- M /trunk-1.6/AUTHORS
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-dtls.c
- M /trunk-1.6/epan/dissectors/packet-http.c
- M /trunk-1.6/epan/dissectors/packet-ntp.c
- M /trunk-1.6/epan/dissectors/packet-ssl-utils.c
- M /trunk-1.6/file.c
- M /trunk-1.6/packaging/macosx/Makefile.am
- D /trunk-1.6/packaging/macosx/Wireshark package.pmdoc
- A /trunk-1.6/packaging/macosx/Wireshark_package.pmdoc (from /trunk/packaging/macosx/Wireshark_package.pmdoc:41040)
- M /trunk-1.6/packaging/macosx/osx-dmg.sh
- M /trunk-1.6/tshark.c
- M /trunk-1.6/wiretap/erf.c
- M /trunk-1.6/wiretap/pcapng.c
+ M /trunk-1.6/dumpcap.c
+ M /trunk-1.6/epan/dissectors/packet-h263.c
+ M /trunk-1.6/gtk/hostlist_table.c
+ M /trunk-1.6/ipmap.html
+ M /trunk-1.6/packaging/nsis/Makefile.nmake
+ M /trunk-1.6/packaging/nsis/wireshark.nsi
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r41025 | guy | 2012-02-13 22:00:14 -0800 (Mon, 13 Feb 2012) | 49 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-http.c
-
- To quote section "7.2.1 Type" of RFC 2068, "Hypertext Transfer Protocol
- -- HTTP/1.1":
-
- Any HTTP/1.1 message containing an entity-body SHOULD include a
- Content-Type header field defining the media type of that body. If
- and only if the media type is not given by a Content-Type field, the
- recipient MAY attempt to guess the media type via inspection of its
- content and/or the name extension(s) of the URL used to identify the
- resource. If the media type remains unknown, the recipient SHOULD
- treat it as type "application/octet-stream".
-
- To quote section "4. Encoding of Transport Layer" of RFC 2565, "Internet
- Printing Protocol/1.0: Encoding and Transport":
-
- HTTP/1.1 [RFC2068] is the transport layer for this protocol.
-
- ...
-
- Note: even though port 631 is the IPP default, port 80 remains the
- default for an HTTP URI. Thus a URI for a printer using port 631
- MUST contain an explicit port, e.g. "http://forest:631/pinetree". An
- HTTP URI for IPP with no explicit port implicitly reference port 80,
- which is consistent with the rules for HTTP/1.1. Each HTTP operation
- MUST use the POST method where the request-URI is the object target
- of the operation, and where the "Content-Type" of the message-body in
- each request and response MUST be "application/ipp". The message-body
- MUST contain the operation layer and MUST have the syntax described
- in section 3.2 "Syntax of Encoding". A client implementation MUST
- adhere to the rules for a client described for HTTP1.1 [RFC2068]. A
- printer (server) implementation MUST adhere the rules for an origin
- server described for HTTP1.1 [RFC2068].
-
- So, when choosing a subdissector for HTTP request bodies, search based
- on the media type first, and only if we *don't* find a dissector for the
- media type, do other stuff such as heuristics or choosing a subdissector
- based on the port number.
-
- This fixes a number of problems; in particular, it fixes bug 6765
- "non-IPP packets to or from port 631 are dissected as IPP" without
- requiring the IPP dissector to attempt to determine whether an entity
- body looks like IPP. It also ensures that the default dissector for
- HTTP entity bodies, the "media" dissector, will get the media type
- passed to it in pinfo->match_string.
-
- Don't use "!str*cmp()" while we're at it - it's valid C, but the "!" can
- make it look as if it's checking for something not being the case when,
- in fact, you're checking for equality rather than inequality. (The
- str*cmp() routines don't return Boolean results.)
- ------------------------------------------------------------------------
- r41040 | morriss | 2012-02-16 08:31:09 -0800 (Thu, 16 Feb 2012) | 6 lines
- Changed paths:
- M /trunk/packaging/macosx/Makefile.am
- D /trunk/packaging/macosx/Wireshark package.pmdoc
- A /trunk/packaging/macosx/Wireshark_package.pmdoc (from /trunk/packaging/macosx/Wireshark package.pmdoc:41039)
- M /trunk/packaging/macosx/osx-dmg.sh
-
- As suggested on the -dev list today, add Wireshark_package.pmdoc to the source
- distribution.
-
- To do this, however, requires renaming that directory because automake can't
- handle files with spaces in their names.
- ------------------------------------------------------------------------
- r41045 | morriss | 2012-02-16 19:02:32 -0800 (Thu, 16 Feb 2012) | 7 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-ntp.c
-
- Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6703 :
-
- r35887 added ntp_to_nstime() to packet-ntp since a couple of dissectors had
- their own versions. The version used was from packet-netflow; switch to the
- version from packet-zep because that one's math works better: the fractional
- time is actually shown.
- ------------------------------------------------------------------------
-
-
-Copy over by hand:
-
- ------------------------------------------------------------------------
- r41030 | guy | 2012-02-14 14:31:33 -0800 (Tue, 14 Feb 2012) | 3 lines
+ r41876 | etxrab | 2012-04-01 02:20:35 -0700 (Sun, 01 Apr 2012) | 1 line
Changed paths:
- M /trunk/wiretap/erf.c
-
- TYPE_PAD records can have zero bytes of payload; don't treat them as
- errors.
- ------------------------------------------------------------------------
- r41036 | etxrab | 2012-02-15 21:21:09 -0800 (Wed, 15 Feb 2012) | 4 lines
- Changed paths:
- M /trunk/AUTHORS
- M /trunk/epan/dissectors/packet-dtls.c
- M /trunk/epan/dissectors/packet-ssl-utils.c
-
- From Naoyoshi Ueda:
- Patch to fix DTLS decryption.
-
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6847
- ------------------------------------------------------------------------
- r41041 | guy | 2012-02-16 10:58:40 -0800 (Thu, 16 Feb 2012) | 16 lines
- Changed paths:
- M /trunk/file.c
- M /trunk/tshark.c
- M /trunk/wiretap/pcapng.c
-
- With the WTAP_ERR_UNSUPPORTED error, Wiretap supplies a string giving
- the details of what in particular is unsupported; report it in TShark
- and Wireshark.
-
- Handle WTAP_ERR_RANDOM_OPEN_PIPE in TShark.
-
- Handle WTAP_ERR_COMPRESSION_NOT_SUPPORTED in TShark, and have its error
- message in Wireshark not speak of gzip, in case we support compressed
- output in other formats in the future.
-
- If we see a second section header block in a pcap-NG file, don't report
- it as "the file is corrupted", report it as "the file uses a feature we
- don't support", as that's the case - and don't free up the interface
- data array, as the file remains open, and Wireshark might still try to
- access the packets we were able to read.
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-
+ M /trunk/epan/dissectors/packet-h263.c
-------------------------------------------------------------------------
-r41619 | gerald | 2012-03-16 09:38:37 -0700 (Fri, 16 Mar 2012) | 3 lines
-Changed paths:
- M /trunk-1.6/config.nmake
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/tools/win32-setup.sh
-
-Update the GTK+ bundle for 32-bit Windows. Fixes bug 6077. Hopefully the
-GNOME team will release a 64-bit bundle soon.
-
-------------------------------------------------------------------------
-r41620 | gerald | 2012-03-16 10:06:02 -0700 (Fri, 16 Mar 2012) | 2 lines
-Changed paths:
- M /trunk-1.6/config.nmake
-
-Allow the use of GTK+ 2.24.
-
-------------------------------------------------------------------------
-r41628 | etxrab | 2012-03-17 01:51:20 -0700 (Sat, 17 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-bssgp.c
-
-Copy over Revision 39260 Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID
-------------------------------------------------------------------------
-r41629 | etxrab | 2012-03-17 01:56:38 -0700 (Sat, 17 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-bssgp.c
-
-Copy over Revision 39640 BSSGP part Fix proto_tree_add_item( encoding args; Do whitespace cleanup
-------------------------------------------------------------------------
-r41630 | etxrab | 2012-03-17 02:00:06 -0700 (Sat, 17 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-bssgp.c
-
-Copy over Revision 40586 Fix some duplicate display filter names
-------------------------------------------------------------------------
-r41631 | etxrab | 2012-03-17 02:02:42 -0700 (Sat, 17 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-bssgp.c
-
-Copy over Revision 41043 Use the correct IE id
-------------------------------------------------------------------------
-r41632 | etxrab | 2012-03-17 02:04:24 -0700 (Sat, 17 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-bssgp.c
-
-Copy over Revision 41466 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
-------------------------------------------------------------------------
-r41642 | gerald | 2012-03-18 12:29:20 -0700 (Sun, 18 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-03-18]
-------------------------------------------------------------------------
-r41663 | etxrab | 2012-03-19 00:12:25 -0700 (Mon, 19 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-per.c
-
-Copy over Revision 37886 Do not trigger an assert when reaching an unknown extension in CHOICE and SEQUENCE types.
-------------------------------------------------------------------------
-r41664 | etxrab | 2012-03-19 00:17:32 -0700 (Mon, 19 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/dissectors/packet-per.c
-
-Copy over Revision 38095 Fix gcc 4.6 'set but not used [-Wunused-but-set-variable]' warnings.
-------------------------------------------------------------------------
-r41677 | gerald | 2012-03-19 11:06:01 -0700 (Mon, 19 Mar 2012) | 26 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-diameter.c
- M /trunk-1.6/epan/dissectors/packet-gtp.c
- M /trunk-1.6/epan/dissectors/packet-mpls-echo.c
- M /trunk-1.6/epan/dissectors/packet-ptp.c
- M /trunk-1.6/epan/dissectors/packet-radiotap.c
- M /trunk-1.6/epan/dissectors/packet-ses.c
- M /trunk-1.6/epan/dissectors/packet-usb.c
- M /trunk-1.6/gtk/dfilter_expr_dlg.c
-
-Copy over revisions from the trunk:
-
- ------------------------------------------------------------------------
- r41633 | guy | 2012-03-17 14:46:43 -0700 (Sat, 17 Mar 2012) | 6 lines
+ At least 4 bytes is required to check PSC, fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6996
+ r41937 | guy | 2012-04-04 12:13:39 -0700 (Wed, 04 Apr 2012) | 6 lines
Changed paths:
- M /trunk/epan/dissectors/packet-radiotap.c
+ M /trunk/dumpcap.c
- Mark the computed-from-the-MCS-field data rate as generated, and make it
- cover the entire MCS field, in the hopes of avoiding the need to ask
- questions such as
+ Work around WinPcap bug wherein pcap_open() returns -1 without putting
+ an error message into errbuf (the bug has been reported to
+ winpcap-bugs).
- http://ask.wireshark.org/questions/9461
+ Should fix bug 6922.
------------------------------------------------------------------------
- r41675 | morriss | 2012-03-19 10:12:04 -0700 (Mon, 19 Mar 2012) | 5 lines
+ r41941 | guy | 2012-04-04 12:46:45 -0700 (Wed, 04 Apr 2012) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-diameter.c
-
- Fix crash (caused by a corrupted Diameter dictionary) reported in
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6664 :
+ M /trunk/dumpcap.c
- Add some sanity checks before adding types, vendors, commands, and AVPs.
+ Fix tpo.
------------------------------------------------------------------------
-Update the release notes.
-
-------------------------------------------------------------------------
-r41729 | gerald | 2012-03-21 15:52:10 -0700 (Wed, 21 Mar 2012) | 3 lines
-Changed paths:
- M /trunk-1.6/configure.in
-
-Don't use GNUTLS 3.0, at least until we determine the impact of their
-license change.
-
-------------------------------------------------------------------------
-r41733 | gerald | 2012-03-21 16:20:21 -0700 (Wed, 21 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/debian/copyright
-
-Add a missing "T".
-------------------------------------------------------------------------
-r41759 | gerald | 2012-03-25 07:33:59 -0700 (Sun, 25 Mar 2012) | 1 line
-Changed paths:
- M /trunk-1.6/epan/enterprise-numbers
- M /trunk-1.6/manuf
- M /trunk-1.6/services
-
-[Automatic manuf, services and enterprise-numbers update for 2012-03-25]
-------------------------------------------------------------------------
-r41777 | gerald | 2012-03-26 13:27:20 -0700 (Mon, 26 Mar 2012) | 36 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-dtls.c
- M /trunk-1.6/epan/dissectors/packet-isakmp.c
- M /trunk-1.6/epan/dissectors/packet-udp.c
- M /trunk-1.6/packaging/macosx/Scripts/chmodbpf-postinstall.sh
- M /trunk-1.6/wiretap/pcapng.c
-
-Copy over revisions from the trunk:
+Copy over with manual intervention:
------------------------------------------------------------------------
- r41680 | guy | 2012-03-19 21:06:36 -0700 (Mon, 19 Mar 2012) | 10 lines
+ r41914 | gerald | 2012-04-03 17:47:21 -0700 (Tue, 03 Apr 2012) | 9 lines
Changed paths:
- M /trunk/packaging/macosx/Scripts/chmodbpf-postinstall.sh
-
- Now, isn't that swell! Leopard's dseditgroup doesn't return a failure
- exit status if the group in question doesn't exist, so we can't use
- dseditgroup on Leopard to check whether the access_bpf group exists.
+ M /trunk/packaging/nsis/Makefile.nmake
+ M /trunk/packaging/nsis/wireshark.nsi
- Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
- -read /groups/{group}" instead; the suggestion came from the addgroup.sh
- script in
+ Add and update a bunch of Programs and Features-related registry
+ keys. Sort the keys by name. Calculate the installation size after all
+ of the files have been installed and add that in the "EstimatedSize"
+ key. Fix the display icon. Add a hint about our target platform. Add
+ version information.
- https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf
+ We now look like a grown-up application in the Programs and Features
+ control panel.
------------------------------------------------------------------------
- r41718 | alagoutte | 2012-03-21 02:49:35 -0700 (Wed, 21 Mar 2012) | 5 lines
+ r41938 | guy | 2012-04-04 12:26:07 -0700 (Wed, 04 Apr 2012) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-isakmp.c
+ M /trunk/dumpcap.c
- From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6972
- ISAKMP : VendorID CheckPoint : Malformed Packet
-
- Wrong minimum length when there is not CheckPoint "Data" after VendorID
+ Work around that WinPcap bug for another pcap_open() call.
------------------------------------------------------------------------
- r41734 | cmaynard | 2012-03-21 20:41:58 -0700 (Wed, 21 Mar 2012) | 2 lines
+ r41967 | gerald | 2012-04-05 15:10:53 -0700 (Thu, 05 Apr 2012) | 7 lines
Changed paths:
- M /trunk/epan/dissectors/packet-udp.c
-
- If the checksum is 0, then only report "no checksum" for UDP/IPv4. This patch is from Jaap Keuter via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6232
- ------------------------------------------------------------------------
-
-
-Update the release notes.
-
-------------------------------------------------------------------------
-r41782 | gerald | 2012-03-26 15:34:36 -0700 (Mon, 26 Mar 2012) | 2 lines
-Changed paths:
- M /trunk-1.6/epan/Makefile.am
- M /trunk-1.6/tools/compare-abis.sh
- M /trunk-1.6/wiretap/Makefile.am
- M /trunk-1.6/wsutil/Makefile.am
-
-ABI checking / comparison updates from Balint.
+ M /trunk/ipmap.html
+ M /trunk/ui/gtk/hostlist_table.c
-------------------------------------------------------------------------
-r41784 | gerald | 2012-03-26 17:56:28 -0700 (Mon, 26 Mar 2012) | 2 lines
-Changed paths:
- M /trunk-1.6/config.nmake
- M /trunk-1.6/tools/win32-setup.sh
- M /trunk-1.6/tools/win64-setup.sh
-
-Use GNUTLS 2.12.18.
-
-------------------------------------------------------------------------
-r41800 | gerald | 2012-03-27 08:15:57 -0700 (Tue, 27 Mar 2012) | 20 lines
-Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-radiotap.c
-
-Copy over r41781 from the trunk:
+ Instead of loading our coordinates from a separate text file via
+ OpenLayers.Layer.Text, insert them into a JSON array and load them using
+ OpenLayers.Layer.Vector + OpenLayers.Format.GeoJSON. This should fix the
+ endpoint map feature on modern browsers.
+ Switch OpenStreetMap to a simpler map from OSGeo.
------------------------------------------------------------------------
- r41781 | guy | 2012-03-26 15:12:03 -0700 (Mon, 26 Mar 2012) | 10 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-radiotap.c
-
- There is no "dBm transmit attenuation" field in radiotap; there is,
- however, a dBm transmit *power* field.
-
- Fix up the capitalization of "dB" and "dBm", and improve the blurb for
- attenuation fields, while we're at it.
- Should fix bug 7000:
-
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7000
- ------------------------------------------------------------------------
Update the release notes.
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/Makefile.am
^
|
| @@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id: Makefile.am 39914 2011-11-17 20:11:41Z gerald $
+# $Id: Makefile.am 41854 2012-03-30 17:53:59Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -520,7 +520,7 @@
ps.c: print.ps $(srcdir)/tools/rdps.py
$(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
-services: tools/make-services.pl
+services:
$(PERL) $(srcdir)/tools/make-services.pl
#
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/Makefile.in
^
|
| @@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id: Makefile.am 39914 2011-11-17 20:11:41Z gerald $
+# $Id: Makefile.am 41854 2012-03-30 17:53:59Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -4369,7 +4369,7 @@
ps.c: print.ps $(srcdir)/tools/rdps.py
$(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
-services: tools/make-services.pl
+services:
$(PERL) $(srcdir)/tools/make-services.pl
install-exec-hook:
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/NEWS
^
|
| @@ -1,4 +1,4 @@
-Wireshark 1.6.6 Release Notes
+Wireshark 1.6.7 Release Notes
------------------------------------------------------------------
@@ -12,122 +12,15 @@
Bug Fixes
- The following vulnerabilities have been fixed.
-
- o wnpa-sec-2012-04
-
- The ANSI A dissector could dereference a NULL pointer and
- crash. (Bug 6823)
-
- Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.
-
- o wnpa-sec-2012-05
-
- The IEEE 802.11 dissector could go into an infinite loop. (Bug
- 6809)
-
- Versions affected: 1.6.0 to 1.6.5.
-
- o wnpa-sec-2012-06
-
- The pcap and pcap-ng file parsers could crash trying to read
- ERF data. (Bug 6804)
-
- Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.
-
- o wnpa-sec-2012-07
-
- The MP2T dissector could try to allocate too much memory and
- crash. (Bug 6804)
-
- Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.
-
- o The Windows installers now include GnuTLS 1.12.18, which fixes
- several vulnerabilities.
-
The following bugs have been fixed:
- o ISO SSAP: ActivityStart: Invalid decoding the activity
- parameter as a BER Integer. (Bug 2873)
-
- o Forward slashes in URI need to be converted to backslashes if
- WIN32. (Bug 5237)
-
- o Character echo pauses in Capture Filter field in Capture
- Options. (Bug 5356)
-
- o Some PGM options are not parsed correctly. (Bug 5687)
-
- o dumpcap crashes when capturing from pipe to a pcap-ng file
- (e.g., when passing data from CACE Pilot to Wireshark). (Bug
- 5939)
-
- o Unable to rearrange columns in preferences on Windows. (Bug
- 6077) (Note: this bug still affects the 64-bit package)
-
- o No error for UDP/IPv6 packet with zero checksum. (Bug 6232)
-
- o Wireshark installer doesn't add access_bpf in 10.5.8. (Bug
- 6526)
+ o Wireshark could crash while reading SSL decryption keys on
+ 64-bit Windows.
- o Corrupted Diameter dictionary file that crashes Wireshark.
- (Bug 6664)
+ o Malformed Packets H263-1996 (RFC2190). (Bug 6996)
- o packetBB dissector bug: More than 1000000 items in the tree --
- possible infinite loop. (Bug 6687)
-
- o ZEP dissector: Timestamp not always displayed correctly.
- Fractional seconds never displayed. (Bug 6703)
-
- o GOOSE Messages don't use the length field to perform the
- dissection. (Bug 6734)
-
- o Ethernet traces in K12 text format sometimes give bogus
- "malformed frame" errors and other problems. (Bug 6735)
-
- o max_ul_ext isn't printed/decoded to the packet details log in
- GTP protocol packet. (Bug 6761)
-
- o non-IPP packets to or from port 631 are dissected as IPP. (Bug
- 6765)
-
- o lua proto registration fails for uppercase proto /
- g_ascii_strdown problem. (Bug 6766)
-
- o no menu item Fle->Export->SSL Session Keys in GTK. (Bug 6813)
-
- o IAX2 dissector reads past end of packet for unknown IEs. (Bug
- 6815)
-
- o TShark 1.6.5 immediately crashes on SSL decryption (every
- time). (Bug 6817)
-
- o USB: unknown GET DESCRIPTOR response triggers assert failure.
- (Bug 6826)
-
- o IEEE1588 PTPv2 over IPv6. (Bug 6836)
-
- o Patch to fix DTLS decryption. (Bug 6847)
-
- o Expression... dialog crash. (Bug 6891)
-
- o display filter "gtp.msisdn" not working. (Bug 6947)
-
- o Multiprotocol Label Switching Echo - Return Code: Reserved
- (5). (Bug 6951)
-
- o ISAKMP : VendorID CheckPoint : Malformed Packet. (Bug 6972)
-
- o Adding a Custom HTTP Header Field with a trailing colon causes
- wireshark to immediately crash (and crash upon restart). (Bug
- 6982)
-
- o Radiotap dissector lists a bogus "DBM TX Attenuation" bit.
- (Bug 7000)
-
- o MySQL dissector assertion. (Ask 8649)
-
- o Radiotap header format data rate alignment issues. (Ask 8649)
+ o Wireshark could crash while trying to open an rpcap: URL. (Bug
+ 6922)
New and Updated Features
@@ -139,13 +32,11 @@
Updated Protocol Support
- ANSI A, BSSGP, DIAMETER, DTLS, GOOSE, GSM Management, GTP, HTTP,
- IAX2, IEEE 802.11, IPP, ISAKMP, ISO SSAP, MP2T, MPLS, MySQL, NTP,
- PacketBB, PGM, Radiotap, SSL, TCP, UDP, USB, WSP
+ H.263
New and Updated Capture File Support
- Endace ERF, Pcap-NG, Tektronix K12
+ There are no updates in this release.
Getting Wireshark
@@ -185,6 +76,8 @@
The 64-bit Windows installer does not ship with libsmi. (Win64
development page)
+ "Closing File!" Dialog Hangs. (Bug 3046)
+
Application crash when changing real-time option. (Bug 4035)
Hex pane display issue after startup. (Bug 4056)
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/config.nmake
^
|
| @@ -1,4 +1,4 @@
-# $Id: config.nmake 41784 2012-03-27 00:56:28Z gerald $
+# $Id: config.nmake 41830 2012-03-29 20:19:56Z gerald $
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
@@ -13,13 +13,13 @@
##### Versions #####
# The SVN revision of our build. Updated by make-version.pl
-SVN_REVISION=41803
+SVN_REVISION=41973
# The current Wireshark version. Recommended: Leave unchanged.
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=6
-VERSION_MICRO=6
+VERSION_MICRO=7
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your
@@ -332,11 +332,11 @@
#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
#
-# Optional: the GNUTLS library enables ssl decryption.
+# Optional: the GnuTLS library enables ssl decryption.
#
-# If you have the GNUTLS library, set this to the package version.
+# If you have the GnuTLS library, set this to the package version.
#
-# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG
+# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
@@ -539,15 +539,15 @@
#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
#
-# Optional: the GNUTLS library enables ssl decryption.
+# Optional: the GnuTLS library enables ssl decryption.
#
-# If you have the GNUTLS library, set this to the package version.
+# If you have the GnuTLS library, set this to the package version.
#
-# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG
+# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2
+GNUTLS_PKG=2.12.18-1.2-1
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for wireshark 1.6.6.
+# Generated by GNU Autoconf 2.65 for wireshark 1.6.7.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='wireshark'
PACKAGE_TARNAME='wireshark'
-PACKAGE_VERSION='1.6.6'
-PACKAGE_STRING='wireshark 1.6.6'
+PACKAGE_VERSION='1.6.7'
+PACKAGE_STRING='wireshark 1.6.7'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1629,7 +1629,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wireshark 1.6.6 to adapt to many kinds of systems.
+\`configure' configures wireshark 1.6.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1700,7 +1700,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wireshark 1.6.6:";;
+ short | recursive ) echo "Configuration of wireshark 1.6.7:";;
esac
cat <<\_ACEOF
@@ -1887,7 +1887,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wireshark configure 1.6.6
+wireshark configure 1.6.7
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2427,7 +2427,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wireshark $as_me 1.6.6, which was
+It was created by wireshark $as_me 1.6.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3199,7 +3199,7 @@
# Define the identity of the package.
PACKAGE='wireshark'
- VERSION='1.6.6'
+ VERSION='1.6.7'
cat >>confdefs.h <<_ACEOF
@@ -25619,7 +25619,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wireshark $as_me 1.6.6, which was
+This file was extended by wireshark $as_me 1.6.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25685,7 +25685,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wireshark config.status 1.6.6
+wireshark config.status 1.6.7
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/configure.in
^
|
| @@ -1,8 +1,8 @@
-# $Id: configure.in 41729 2012-03-21 22:52:10Z gerald $
+# $Id: configure.in 41808 2012-03-27 19:56:22Z gerald $
#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.6.6)
+AC_INIT(wireshark, 1.6.7)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/debian/changelog
^
|
| @@ -1,4 +1,4 @@
-wireshark (1.6.6) unstable; urgency=low
+wireshark (1.6.7) unstable; urgency=low
* Self-made package
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/debian/wireshark-common.files
^
|
| @@ -5,9 +5,9 @@
/usr/bin/text2pcap
/usr/bin/rawshark
/usr/lib/wireshark/libwireshark.so.1
-/usr/lib/wireshark/libwireshark.so.1.1.6
+/usr/lib/wireshark/libwireshark.so.1.1.7
/usr/lib/wireshark/libwiretap.so.1
-/usr/lib/wireshark/libwiretap.so.1.0.6
+/usr/lib/wireshark/libwiretap.so.1.0.7
/usr/lib/wireshark/libwsutil.so.1
/usr/lib/wireshark/libwsutil.so.1.0.0
/usr/lib/wireshark/plugins/*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/docbook/release-notes.xml
^
|
| @@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!-- $Id: release-notes.xml 41802 2012-03-27 15:52:55Z gerald $ -->
+<!-- $Id: release-notes.xml 41973 2012-04-06 18:42:40Z gerald $ -->
<!--
DOCUMENT SECTION
@@ -12,7 +12,7 @@
<!--
Wireshark Info
-->
-<!ENTITY WiresharkCurrentVersion "1.6.6">
+<!ENTITY WiresharkCurrentVersion "1.6.7">
]>
@@ -31,94 +31,6 @@
<para>
- The following vulnerabilities have been fixed.
- <itemizedlist>
-
- <listitem>
- <para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-04.html">wnpa-sec-2012-04</ulink>
- </para>
- <para>
- The ANSI A dissector could dereference a NULL pointer and crash.
- <!-- Fixed in trunk: r40962 -->
- <!-- Fixed in trunk-1.6: r41568 -->
- <!-- Fixed in trunk-1.4: r41768 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6823">Bug
- 6823</ulink>)
- </para>
- <para>Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
- </listitem>
-
- <listitem>
- <para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-05.html">wnpa-sec-2012-05</ulink>
- </para>
- <para>
- The IEEE 802.11 dissector could go into an infinite loop.
- <!-- Fixed in trunk: r40967 -->
- <!-- Fixed in trunk-1.6: r41576 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6809">Bug
- 6809</ulink>)
- </para>
- <para>Versions affected: 1.6.0 to 1.6.5.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
- </listitem>
-
- <listitem>
- <para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-06.html">wnpa-sec-2012-06</ulink>
- </para>
- <para>
- The pcap and pcap-ng file parsers could crash trying to read ERF data.
- <!-- Fixed in trunk: r41008 -->
- <!-- Fixed in trunk-1.6: r41578 -->
- <!-- Fixed in trunk-1.4: r41769 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804">Bug
- 6804</ulink>)
- </para>
- <para>Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
- </listitem>
-
- <listitem>
- <para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-07.html">wnpa-sec-2012-07</ulink>
- </para>
- <para>
- The MP2T dissector could try to allocate too much memory and crash.
- <!-- Fixed in trunk: r41001, r41002 -->
- <!-- Fixed in trunk-1.6: r41057 -->
- <!-- Fixed in trunk-1.4: r41776 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804">Bug
- 6804</ulink>)
- </para>
- <para>Versions affected: 1.4.0 to 1.4.11, 1.6.0 to 1.6.5.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
- </listitem>
-
- <listitem>
- <para>
- The Windows installers now include GnuTLS 1.12.18, which fixes
- <ulink url="http://www.gnu.org/software/gnutls/security.html">several
- vulnerabilities</ulink>.
- </para>
- </listitem>
-
- </itemizedlist>
-
- </para>
-
- <para>
-
The following bugs have been fixed:
<itemizedlist>
@@ -134,183 +46,19 @@
-->
<listitem><para>
- ISO SSAP: ActivityStart: Invalid decoding the activity parameter as a BER Integer.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2873">Bug
- 2873</ulink>)
- </para></listitem>
-
- <listitem><para>
- Forward slashes in URI need to be converted to backslashes if WIN32.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237">Bug
- 5237</ulink>)
- </para></listitem>
-
- <listitem><para>
- Character echo pauses in Capture Filter field in Capture Options.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5356">Bug
- 5356</ulink>)
- </para></listitem>
-
- <listitem><para>
- Some PGM options are not parsed correctly.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687">Bug
- 5687</ulink>)
- </para></listitem>
-
- <listitem><para>
- dumpcap crashes when capturing from pipe to a pcap-ng file (e.g., when passing data from CACE Pilot to Wireshark).
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5939">Bug
- 5939</ulink>)
- </para></listitem>
-
- <listitem><para>
- Unable to rearrange columns in preferences on Windows.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6077">Bug
- 6077</ulink>) (Note: this bug still affects the 64-bit package)
- </para></listitem>
-
- <listitem><para>
- No error for UDP/IPv6 packet with zero checksum.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6232">Bug
- 6232</ulink>)
- </para></listitem>
-
- <listitem><para>
- Wireshark installer doesn't add access_bpf in 10.5.8.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6526">Bug
- 6526</ulink>)
- </para></listitem>
-
- <listitem><para>
- Corrupted Diameter dictionary file that crashes Wireshark.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6664">Bug
- 6664</ulink>)
- </para></listitem>
-
- <listitem><para>
- packetBB dissector bug: More than 1000000 items in the tree -- possible infinite loop.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687">Bug
- 6687</ulink>)
- </para></listitem>
-
- <listitem><para>
- ZEP dissector: Timestamp not always displayed correctly. Fractional seconds never displayed.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6703">Bug
- 6703</ulink>)
- </para></listitem>
-
- <listitem><para>
- GOOSE Messages don't use the length field to perform the dissection.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6734">Bug
- 6734</ulink>)
- </para></listitem>
-
- <listitem><para>
- Ethernet traces in K12 text format sometimes give bogus "malformed frame" errors and other problems.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6735">Bug
- 6735</ulink>)
- </para></listitem>
-
- <listitem><para>
- max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761">Bug
- 6761</ulink>)
- </para></listitem>
-
- <listitem><para>
- non-IPP packets to or from port 631 are dissected as IPP.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6765">Bug
- 6765</ulink>)
- </para></listitem>
-
- <listitem><para>
- lua proto registration fails for uppercase proto / g_ascii_strdown problem.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6766">Bug
- 6766</ulink>)
- </para></listitem>
-
- <listitem><para>
- no menu item Fle->Export->SSL Session Keys in GTK.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813">Bug
- 6813</ulink>)
- </para></listitem>
-
- <listitem><para>
- IAX2 dissector reads past end of packet for unknown IEs.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815">Bug
- 6815</ulink>)
- </para></listitem>
-
- <listitem><para>
- TShark 1.6.5 immediately crashes on SSL decryption (every time).
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817">Bug
- 6817</ulink>)
- </para></listitem>
-
- <listitem><para>
- USB: unknown GET DESCRIPTOR response triggers assert failure.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6826">Bug
- 6826</ulink>)
- </para></listitem>
-
- <listitem><para>
- IEEE1588 PTPv2 over IPv6.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6836">Bug
- 6836</ulink>)
- </para></listitem>
-
- <listitem><para>
- Patch to fix DTLS decryption.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6847">Bug
- 6847</ulink>)
- </para></listitem>
-
- <listitem><para>
- Expression... dialog crash.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6891">Bug
- 6891</ulink>)
- </para></listitem>
-
- <listitem><para>
- display filter "gtp.msisdn" not working.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6947">Bug
- 6947</ulink>)
- </para></listitem>
-
- <listitem><para>
- Multiprotocol Label Switching Echo - Return Code: Reserved (5).
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6951">Bug
- 6951</ulink>)
+ Wireshark could crash while reading SSL decryption keys on 64-bit Windows.
</para></listitem>
<listitem><para>
- ISAKMP : VendorID CheckPoint : Malformed Packet.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6972">Bug
- 6972</ulink>)
+ Malformed Packets H263-1996 (RFC2190).
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6996">Bug
+ 6996</ulink>)
</para></listitem>
<listitem><para>
- Adding a Custom HTTP Header Field with a trailing colon causes wireshark to immediately crash (and crash upon restart).
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6982">Bug
- 6982</ulink>)
- </para></listitem>
-
- <listitem><para>
- Radiotap dissector lists a bogus "DBM TX Attenuation" bit.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7000">Bug
- 7000</ulink>)
- </para></listitem>
-
- <listitem><para>
- MySQL dissector assertion.
- (<ulink url="http://ask.wireshark.org/questions/8649">Ask
- 8649</ulink>)
- </para></listitem>
-
- <listitem><para>
- Radiotap header format data rate alignment issues.
- (<ulink url="http://ask.wireshark.org/questions/8649">Ask
- 8649</ulink>)
+ Wireshark could crash while trying to open an rpcap: URL.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6922">Bug
+ 6922</ulink>)
</para></listitem>
</itemizedlist>
@@ -339,31 +87,7 @@
<!-- Sort alphabetically -->
-ANSI A,
-BSSGP,
-DIAMETER,
-DTLS,
-GOOSE,
-GSM Management,
-GTP,
-HTTP,
-IAX2,
-IEEE 802.11,
-IPP,
-ISAKMP,
-ISO SSAP,
-MP2T,
-MPLS,
-MySQL,
-NTP,
-PacketBB,
-PGM,
-Radiotap,
-SSL,
-TCP,
-UDP,
-USB,
-WSP
+H.263
</para>
</section>
@@ -371,7 +95,7 @@
<section id="NewCapture"><title>New and Updated Capture File Support</title>
<para>
-Endace ERF, Pcap-NG, Tektronix K12
+There are no updates in this release.
</para>
</section>
@@ -453,6 +177,12 @@
</para>
<para>
+ "Closing File!" Dialog Hangs.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046">Bug
+ 3046</ulink>)
+ </para>
+
+ <para>
Application crash when changing real-time option.
(<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035">Bug
4035</ulink>)
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/dumpcap.c
^
|
| @@ -1,6 +1,6 @@
/* dumpcap.c
*
- * $Id: dumpcap.c 41348 2012-03-05 07:18:13Z guy $
+ * $Id: dumpcap.c 41972 2012-04-06 17:43:35Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -553,6 +553,13 @@
(capture_opts->datatx_udp ? PCAP_OPENFLAG_DATATX_UDP : 0) |
(capture_opts->nocap_rpcap ? PCAP_OPENFLAG_NOCAPTURE_RPCAP : 0),
CAP_READ_TIMEOUT, &auth, *open_err_str);
+ if ((*open_err_str)[0] == '\0') {
+ /* Work around known WinPcap bug wherein no error message is
+ filled in on a failure to open an rpcap: URL. */
+ g_strlcpy(*open_err_str,
+ "Unknown error (pcap bug; actual error cause not reported)",
+ sizeof *open_err_str);
+ }
} else
#endif /* HAVE_PCAP_OPEN */
{
@@ -964,12 +971,27 @@
*/
caps = g_malloc(sizeof *caps);
+ /*
+ * WinPcap 4.1.2, and possibly earlier versions, have a bug
+ * wherein, when an open with an rpcap: URL fails, the error
+ * message for the error is not copied to errbuf and whatever
+ * on-the-stack junk is in errbuf is treated as the error
+ * message.
+ *
+ * To work around that (and any other bugs of that sort, we
+ * initialize errbuf to an empty string. If we get an error
+ * and the string is empty, we report it as an unknown error.
+ * (If we *don't* get an error, and the string is *non*-empty,
+ * that could be a warning returned, such as "can't turn
+ * promiscuous mode on"; we currently don't do so.)
+ */
+ errbuf[0] = '\0';
#ifdef HAVE_PCAP_OPEN
pch = pcap_open(devname, MIN_PACKET_SIZE, 0, 0, NULL, errbuf);
caps->can_set_rfmon = FALSE;
if (pch == NULL) {
if (err_str != NULL)
- *err_str = g_strdup(errbuf);
+ *err_str = g_strdup(errbuf[0] == '\0' ? "Unknown error (pcap bug; actual error cause not reported)" : errbuf);
g_free(caps);
return NULL;
}
@@ -1028,7 +1050,7 @@
caps->can_set_rfmon = FALSE;
if (pch == NULL) {
if (err_str != NULL)
- *err_str = g_strdup(errbuf);
+ *err_str = g_strdup(errbuf[0] == '\0' ? "Unknown error (pcap bug; actual error cause not reported)" : errbuf);
g_free(caps);
return NULL;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/epan/Makefile.am
^
|
| @@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $
+# $Id: Makefile.am 41808 2012-03-27 19:56:22Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -54,7 +54,7 @@
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
-libwireshark_la_LDFLAGS = -version-info 2:6:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:7:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
include Makefile.common
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/epan/Makefile.in
^
|
| @@ -18,7 +18,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $
+# $Id: Makefile.am 41808 2012-03-27 19:56:22Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -517,7 +517,7 @@
ACLOCAL_AMFLAGS = `../aclocal-flags`
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
-libwireshark_la_LDFLAGS = -version-info 2:6:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:7:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
LIBWIRESHARK_SRC = \
addr_and_mask.c \
addr_resolv.c \
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/epan/dissectors/packet-h263.c
^
|
| @@ -8,7 +8,7 @@
* Copyright 2008 Richard van der Hoff, MX Telecom
* <richardv@mxtelecom.com>
*
- * $Id: packet-h263.c 32410 2010-04-06 21:14:01Z wmeier $
+ * $Id: packet-h263.c 41972 2012-04-06 17:43:35Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -638,6 +638,7 @@
proto_tree *h263_payload_tree = NULL;
guint32 data;
guint8 startcode;
+ int length;
col_append_str( pinfo->cinfo, COL_INFO, "H263 payload ");
@@ -646,6 +647,12 @@
h263_payload_tree = proto_item_add_subtree( h263_payload_item, ett_h263_payload );
}
+ length = tvb_reported_length_remaining(tvb,0);
+ if(length<4){
+ if( tree )
+ proto_tree_add_item( h263_payload_tree, hf_h263_data, tvb, offset, -1, ENC_NA );
+ return;
+ }
/* Check for PSC, PSC is a word of 22 bits. Its value is 0000 0000 0000 0000' 1000 00xx xxxx xxxx. */
data = tvb_get_ntohl(tvb, offset);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/epan/enterprise-numbers
^
|
| @@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2012-03-25)
+(last updated 2012-03-30)
SMI Network Management Private Enterprise Codes:
@@ -63260,8 +63260,8 @@
schenkd&cartierpartners.ca
15927
Point Loma Nazarene University
- Scottie Thompson
- oid-admin&ptloma.edu
+ Corey Fling
+ oid-admin&pointloma.edu
15928
SNB
Egon Barfuss
@@ -158106,6 +158106,170 @@
mailplus.co.at
Johannes Schulz
office&mailplus.co.at
+39631
+ mocube
+ Alexander Mette
+ admin&mocube.net
+39632
+ Hyro Pty Ltd
+ David Rhee
+ david.rhee&hyro.com
+39633
+ Dos Tek Group
+ Zakon Kuruchbekov
+ pki&dostek.kg
+39634
+ HighGrand Technology
+ Pun Lam
+ phl&highgrand.com.cn
+39635
+ Beijing ZhongChuang Telecom Test Co.,LTD
+ Huiling Shen
+ happyshlshl&126.com
+39636
+ Comet Computer GmbH
+ Florian Albrechtskirchinger
+ albrechtskirchinger&comet.de
+39637
+ IMP Solutions Network Operations
+ Jeff Warnica
+ jeff.warnica&impsolutions.com
+39638
+ Cornerstone Backup, Inc.
+ Nigel Whillier
+ nwhillier&cornerstonebackup.com
+39639
+ Vigilent Corporation
+ Kennard White
+ kennardwhite&vigilent.com
+39640
+ Europalab Networks
+ Michael Schloh von Bennewitz
+ michael&schloh.com
+39641
+ SPICE DIGITAL LIMITED
+ Gurpreet Singh Gondara
+ gurpreet.singh&spicedigital.in
+39642
+ S3 s.r.l.
+ Ruben Castelletti
+ ruben.castelletti&s3srl.com
+39643
+ WedaCon Informationstechnologien GmbH
+ Thorsten H. Niebuhr
+ info&wedacon.net
+39644
+ The University of North Carolina at Greensboro
+ Robert Gorrell
+ idm-admin&uncg.edu
+39645
+ Anglo-American School of Moscow
+ Ilya Pekshev
+ iana-pen&aas.ru
+39646
+ Mikro Odeme Sistemleri A.S
+ Deniz Bektas
+ deniz.bektas&mikro-odeme.com
+39647
+ iNic AS
+ Bjornar Ness
+ bjornar&fastname.no
+39648
+ Enovacom
+ Christophe Marcel
+ cmarcel&enovacom.fr
+39649
+ General Data Technology Co. Ltd.
+ Yin Lina
+ info&gbase.cn
+39650
+ AEMO Ltd
+ Kerrod Fuller
+ iana.administrator&aemo.com.au
+39651
+ ComTecT
+ Werner Saathoff
+ saathoff&comtect.de
+39652
+ The William Carter Company
+ Richard Hunt
+ rich.hunt&carters.com
+39653
+ Imbio
+ Ryan Chamberlain
+ ryanchamberlain&imbio.com
+39654
+ TISSOT
+ Andrés M. Tissot
+ info&etissot.com.ar
+39655
+ Humbug Telecom Labs Limited
+ Nir Simionovich
+ nirs&humbuglabs.org
+39656
+ ING Insurance /IM
+ R.E. Flinkerbusch
+ ray.flinkerbusch&ingim.com
+39657
+ Administration of the Vladimir Region
+ Pavel Shuba
+ shuba&avo.ru
+39658
+ TollNet a.s.
+ Petr Vokac
+ petr.vokac&tollnet.cz
+39659
+ NSD CO., LTD.
+ Kenji Yuasa
+ yuasa&nsd.co.jp
+39660
+ Tarana Wireless Inc
+ Rakesh Tiwari
+ rakesh&taranawireless.com
+39661
+ Allianz Managed Operations and Services SE - oneWeb
+ Markus Moltenbrey
+ extern.moltenbrey_markus&allianz.de
+39662
+ metafinanz Informationssysteme GmbH
+ Markus Moltenbrey
+ markus.moltenbrey&metafinanz.de
+39663
+ RENK AG
+ Helmut Wirth
+ helmut.wirth&renk.biz
+39664
+ Lingua-IT Sp. z o.o.
+ Marcin Suchocki
+ m.suchocki&lingua-it.pl
+39665
+ Fat Mongoose Technologies, Inc.
+ Alan Chan
+ ac&fatmongoose.com
+39666
+ Consult A Nerd
+ Rod Miller
+ rod&consultanerd.com
+39667
+ CodeMettle, LLC
+ Cliff Ford
+ cliff&codemettle.com
+39668
+ Iridium Digital Systems Corporation
+ Falcon Darkstar Momot
+ falcon&iridiumlinux.org
+39669
+ Koning Corporation
+ Shaohua Liu
+ shaohua.l&koningcorporation.com
+39670
+ knaute.info
+ Thomas Knaute
+ thomas&knaute.info
+39671
+ NEXTDC Ltd
+ Bob Purdon
+ bob.purdon&nextdc.com
End of Document
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/epan/sminmpec.c
^
|
| @@ -39652,6 +39652,47 @@
{ 39628, "Vegayan Systems" },
{ 39629, "Auxilium" },
{ 39630, "mailplus.co.at" },
+ { 39631, "mocube" },
+ { 39632, "Hyro Pty Ltd" },
+ { 39633, "Dos Tek Group" },
+ { 39634, "HighGrand Technology" },
+ { 39635, sminmpec_unknown }, /* (Added by Wireshark) */
+ { 39636, "Comet Computer GmbH" },
+ { 39637, "IMP Solutions Network Operations" },
+ { 39638, "Cornerstone Backup, Inc." },
+ { 39639, "Vigilent Corporation" },
+ { 39640, "Europalab Networks" },
+ { 39641, "SPICE DIGITAL LIMITED " },
+ { 39642, "S3 s.r.l." },
+ { 39643, "WedaCon Informationstechnologien GmbH" },
+ { 39644, "The University of North Carolina at Greensboro" },
+ { 39645, "Anglo-American School of Moscow" },
+ { 39646, "Mikro Odeme Sistemleri A.S" },
+ { 39647, "iNic AS" },
+ { 39648, "Enovacom" },
+ { 39649, "General Data Technology Co. Ltd." },
+ { 39650, "AEMO Ltd" },
+ { 39651, "ComTecT " },
+ { 39652, "The William Carter Company" },
+ { 39653, "Imbio" },
+ { 39654, "TISSOT" },
+ { 39655, "Humbug Telecom Labs Limited" },
+ { 39656, "ING Insurance /IM" },
+ { 39657, "Administration of the Vladimir Region" },
+ { 39658, "TollNet a.s." },
+ { 39659, "NSD CO., LTD." },
+ { 39660, "Tarana Wireless Inc" },
+ { 39661, "Allianz Managed Operations and Services SE - oneWeb" },
+ { 39662, "metafinanz Informationssysteme GmbH" },
+ { 39663, "RENK AG" },
+ { 39664, "Lingua-IT Sp. z o.o." },
+ { 39665, "Fat Mongoose Technologies, Inc." },
+ { 39666, "Consult A Nerd" },
+ { 39667, "CodeMettle, LLC" },
+ { 39668, "Iridium Digital Systems Corporation" },
+ { 39669, "Koning Corporation" },
+ { 39670, "knaute.info" },
+ { 39671, "NEXTDC Ltd" },
{ 0, NULL}
};
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/gtk/hostlist_table.c
^
|
| @@ -2,7 +2,7 @@
* modified from endpoint_talkers_table.c 2003 Ronnie Sahlberg
* Helper routines common to all host list taps.
*
- * $Id: hostlist_table.c 36797 2011-04-22 07:15:45Z darkjames $
+ * $Id: hostlist_table.c 41972 2012-04-06 17:43:35Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -926,7 +926,7 @@
gpointer data)
{
map_t *map = (map_t *)data;
- gchar *table_entry;
+ gchar *table_entry, *esc_entry;
guint64 value;
/* Add the column values to the TSV data */
@@ -943,46 +943,66 @@
return FALSE;
}
- /* Latitude */
- gtk_tree_model_get(model, iter, map->col_lat, &table_entry, -1);
- fputs(table_entry, map->out_file);
- g_free(table_entry);
- fputs("\t", map->out_file);
+/*
+{
+ 'type': 'Feature', 'geometry': { 'type': 'Point', 'coordinates': [-122.583889, 37.898889] },
+ 'properties': { 'title': 'host.example.com', 'description': 'AS: AS12345 Ewok Holdings, Inc.<br/>Country: US<br/>City: Muir Woods, CA<br/>Packets: 6<br/>Bytes: 980' }
+},
+ */
+
+ fputs("{\n", map->out_file);
+ fputs(" 'type': 'Feature', 'geometry': { 'type': 'Point', 'coordinates': [", map->out_file);
/* Longitude */
gtk_tree_model_get(model, iter, map->col_lon, &table_entry, -1);
fputs(table_entry, map->out_file);
g_free(table_entry);
- fputs("\t", map->out_file);
+ fputs(", ", map->out_file);
+
+ /* Latitude */
+ gtk_tree_model_get(model, iter, map->col_lat, &table_entry, -1);
+ fputs(table_entry, map->out_file);
+ g_free(table_entry);
+ fputs("] },\n", map->out_file);
+
+ fputs(" 'properties': { 'title': '", map->out_file);
/* Title */
gtk_tree_model_get(model, iter, map->col_ip, &table_entry, -1);
- fputs(table_entry, map->out_file);
+ esc_entry = string_replace(table_entry, "'", "'");
+ fputs(esc_entry, map->out_file);
g_free(table_entry);
- fputs("\t", map->out_file);
+ g_free(esc_entry);
+ fputs("', 'description': '", map->out_file);
/* Description */
if (map->col_as_num >= 0) {
gtk_tree_model_get(model, iter, map->col_as_num, &table_entry, -1);
fputs("AS: ", map->out_file);
- fputs(table_entry, map->out_file);
+ esc_entry = string_replace(table_entry, "'", "'");
+ fputs(esc_entry, map->out_file);
g_free(table_entry);
+ g_free(esc_entry);
fputs("<br/>", map->out_file);
}
if (map->col_country >= 0) {
gtk_tree_model_get(model, iter, map->col_country, &table_entry, -1);
fputs("Country: ", map->out_file);
- fputs(table_entry, map->out_file);
+ esc_entry = string_replace(table_entry, "'", "'");
+ fputs(esc_entry, map->out_file);
g_free(table_entry);
+ g_free(esc_entry);
fputs("<br/>", map->out_file);
}
if (map->col_country >= 0) {
gtk_tree_model_get(model, iter, map->col_city, &table_entry, -1);
fputs("City: ", map->out_file);
- fputs(table_entry, map->out_file);
+ esc_entry = string_replace(table_entry, "'", "'");
+ fputs(esc_entry, map->out_file);
g_free(table_entry);
+ g_free(esc_entry);
fputs("<br/>", map->out_file);
}
@@ -990,29 +1010,32 @@
fprintf(map->out_file, "Packets: %" G_GINT64_MODIFIER "u<br/>", value);
gtk_tree_model_get(model, iter, map->col_bytes, &value, -1);
- fprintf(map->out_file, "Bytes: %" G_GINT64_MODIFIER "u\t", value);
+ fprintf(map->out_file, "Bytes: %" G_GINT64_MODIFIER "u", value);
/* XXX - we could add specific icons, e.g. depending on the amount of packets or bytes */
- fputs("\n", map->out_file); /* new row */
+ fputs("' }\n", map->out_file);
+ fputs("},\n", map->out_file); /* XXX - Trim the comma from the last item */
map->hosts_written = TRUE;
return FALSE;
}
+#define MAX_TPL_LINE_LEN 4096
static void
open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
{
guint32 i;
gchar *file_uri;
gboolean uri_open;
- char *map_path, *map_data_filename;
- char *src_file_path;
- char *dst_file_path;
+ char *map_path, *map_filename;
+ char *tpl_filename;
+ char *tpl_line;
GList *columns, *list;
GtkTreeViewColumn *column;
GtkListStore *store;
map_t map;
+ FILE *tpl_file;
map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
if (!map.talkers)
@@ -1068,47 +1091,58 @@
return;
}
- /* open the TSV output file */
+ /* Create a location map HTML file from a template */
/* XXX - add error handling */
+ tpl_filename = get_datafile_path("ipmap.html");
+ tpl_file = ws_fopen(tpl_filename, "r");
+ if(tpl_file == NULL) {
+ open_failure_alert_box(tpl_filename, errno, FALSE);
+ g_free(tpl_filename);
+ return;
+ }
+ g_free(tpl_filename);
+
+ /* We should probably create a file with a temporary name and a .html extension instead */
if (! create_tempdir(&map_path, "Wireshark IP Map ")) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Could not create temporary directory\n%s",
map_path);
return;
}
- map_data_filename = g_strdup_printf("%s%cipmap.txt", map_path, G_DIR_SEPARATOR);
- map.out_file = ws_fopen(map_data_filename, "w");
+
+ map_filename = g_strdup_printf("%s%cipmap.html", map_path, G_DIR_SEPARATOR);
+ map.out_file = ws_fopen(map_filename, "w");
if(map.out_file == NULL) {
- open_failure_alert_box(map_data_filename, errno, TRUE);
+ open_failure_alert_box(map_filename, errno, TRUE);
+ g_free(map_filename);
+ fclose(tpl_file);
return;
}
- fputs("lat\tlon\ttitle\tdescription\t\n", map.out_file);
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(map.talkers->table)));
- gtk_tree_model_foreach(GTK_TREE_MODEL(store), map_handle, &map);
+ tpl_line = g_malloc(MAX_TPL_LINE_LEN);
+ while (fgets(tpl_line, MAX_TPL_LINE_LEN, tpl_file) != NULL) {
+ fputs(tpl_line, map.out_file);
+ /* MUST match ipmap.html */
+ if (strstr(tpl_line, "// Start endpoint list")) {
+ gtk_tree_model_foreach(GTK_TREE_MODEL(store), map_handle, &map);
+ }
+ }
+ g_free(tpl_line);
+ fclose(tpl_file);
fclose(map.out_file);
if(!map.hosts_written) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No latitude/longitude data found");
+ g_free(map_filename);
return;
}
- /* copy ipmap.html to temp dir */
- src_file_path = get_datafile_path("ipmap.html");
- dst_file_path = g_strdup_printf("%s%cipmap.html", map_path, G_DIR_SEPARATOR);
-
- if (!copy_file_binary_mode(src_file_path, dst_file_path)) {
- g_free(src_file_path);
- g_free(dst_file_path);
- return;
- }
- g_free(src_file_path);
-
/* open the webbrowser */
- file_uri = filename2uri(dst_file_path);
- g_free(dst_file_path);
+ file_uri = filename2uri(map_filename);
+ g_free(map_filename);
uri_open = browser_open_url (file_uri);
if(!uri_open) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Couldn't open the file: \"%s\" in your web browser", file_uri);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/ipmap.html
^
|
| @@ -2,45 +2,104 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Wireshark: IP Location Map</title>
+ <style type="text/css">
+ body {
+ font-family: Arial, Helvetica, sans-serif; font-size: 13px;
+ line-height: 17px;
+ }
+ </style>
<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
<script type="text/javascript" src="http://openstreetmap.org/openlayers/OpenStreetMap.js"></script>
<script type="text/javascript">
<!--
- var map;
+ var map, layer;
+ var selectControl, selectedFeature;
+
+ function onPopupClose(event) {
+ selectControl.unselect(this.feature);
+ }
+
+ function EndpointSelected(event) {
+ var feature = event.feature;
+ popup = new OpenLayers.Popup.FramedCloud("endpoint",
+ feature.geometry.getBounds().getCenterLonLat(),
+ new OpenLayers.Size(25,25),
+ "<h3>"+ feature.attributes.title + "</h3>" +
+ feature.attributes.description,
+ null, true, onPopupClose);
+ feature.popup = popup;
+ popup.feature = feature;
+ map.addPopup(popup);
+ }
+
+ function EndpointUnselected(event) {
+ var feature = event.feature;
+ if (feature.popup) {
+ popup.feature = null;
+ map.removePopup(feature.popup);
+ feature.popup.destroy();
+ feature.popup = null;
+ }
+ }
function init() {
- var map = new OpenLayers.Map("map", {
+ var endpoints = {
+ "type": "FeatureCollection",
+ "features": [ // Start endpoint list - MUST match hostlist_table.c
+ ]
+ };
+ map = new OpenLayers.Map('map', {
controls: [
new OpenLayers.Control.PanZoomBar(),
+ new OpenLayers.Control.ZoomBox(),
new OpenLayers.Control.ScaleLine(),
new OpenLayers.Control.MousePosition(),
new OpenLayers.Control.MouseDefaults(),
- new OpenLayers.Control.Attribution()],
- projection: new OpenLayers.Projection("EPSG:900913"),
- displayProjection: new OpenLayers.Projection("EPSG:4326"),
- maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34),
- numZoomLevels: 18,
- maxResolution: 156543,
- units: "m"}
- );
-
- map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
- map_file = "ipmap.txt";
- if (document.location.hash.length > 1) {
- map_file = document.location.hash.substr(1);
+ new OpenLayers.Control.Attribution()
+ ],
+ //projection: new OpenLayers.Projection("EPSG:900913"),
+ //displayProjection: new OpenLayers.Projection("EPSG:4326"),
+ //maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34),
+ //numZoomLevels: 18,
+ //maxResolution: 156543,
+ //units: "m"
+ });
+ layer = new OpenLayers.Layer.WMS("OpenLayers WMS",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0",
+ {layers: 'basic'} );
+ map.addLayer(layer);
+ //map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
+ //map.addLayer(new OpenLayers.Layer.Text("IP Locations", {
+ // location: map_file, projection: new OpenLayers.Projection("EPSG:4326")} ) );
+ //
+ //map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
+
+ var geojson_format = new OpenLayers.Format.GeoJSON();
+ var vector_layer = new OpenLayers.Layer.Vector("IP Endpoints");
+ map.addLayer(vector_layer);
+ vector_layer.addFeatures(geojson_format.read(endpoints));
+
+ if (endpoints.features.length < 1) {
+ document.getElementById("statusmsg").innerHTML = "No endpoints to map";
+ } else {
+ map.zoomToExtent(vector_layer.getDataExtent());
}
- map.addLayer(new OpenLayers.Layer.Text("IP Locations", {
- location: map_file, projection: new OpenLayers.Projection("EPSG:4326")} ) );
- var lonlat = (new OpenLayers.LonLat(0.0, 0.0));
- lonlat.transform(map.displayProjection, map.projection);
- map.setCenter(lonlat, 2);
+ selectControl = new OpenLayers.Control.SelectFeature(vector_layer);
+ map.addControl(selectControl);
+ selectControl.activate();
+
+ vector_layer.events.on({
+ 'featureselected': EndpointSelected,
+ 'featureunselected': EndpointUnselected
+ });
}
// -->
</script>
</head>
<body onload="init()">
- <div id="map"></div>
+ <div id="statusmsg" style="float: right; z-index: 9999;"></div>
+ <div id="map" style="z-index: 0;"></div>
</body>
</html>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/make-version.pl
^
|
| @@ -2,7 +2,7 @@
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl 40436 2012-01-11 17:00:56Z gerald $
+# $Id: make-version.pl 41808 2012-03-27 19:56:22Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -75,7 +75,7 @@
my %version_pref = (
"version_major" => 1,
"version_minor" => 6,
- "version_micro" => 6,
+ "version_micro" => 7,
"version_build" => 0,
"enable" => 1,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/manuf
^
|
| @@ -4,7 +4,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf 41759 2012-03-25 14:33:59Z gerald $
+# $Id: manuf 41879 2012-04-01 14:33:58Z gerald $
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -8046,7 +8046,7 @@
00:1F:55 Honeywel # Honeywell Security (China) Co., Ltd.
00:1F:56 DigitalF # DIGITAL FORECAST
00:1F:57 PhonikIn # Phonik Innovation Co.,LTD
-00:1F:58 EmhEnerg # EMH Energiemesstechnik GmbH
+00:1F:58 EmhEnerg # EMH Energiemesstechnik GmbH & co.KG
00:1F:59 Kronback # Kronback Tracers
00:1F:5A Beckwith # Beckwith Electric Co.
00:1F:5B Apple # Apple, Inc.
@@ -14659,6 +14659,15 @@
00:50:C2:F5:B0:00/36 Saia-Bur # Saia-Burgess Controls AG
00:50:C2:F5:C0:00/36 DspDesig # DSP DESIGN LTD
00:50:C2:F5:D0:00/36 SmartbTe # SMARTB TECHNOLOGIES
+00:50:C2:F5:E0:00/36 Y-CamSol # Y-cam Solutions Ltd
+00:50:C2:F5:F0:00/36 BoryeuTe # BORYEU TECHNOLOGY CO.,LTD
+00:50:C2:F6:00:00/36 Deckma # Deckma GmbH
+00:50:C2:F6:10:00/36 BrauchEl # Brauch Elektronik GmbH&Co.KG
+00:50:C2:F6:20:00/36 Emac # EMAC, Inc.
+00:50:C2:F6:30:00/36 Triax # Triax A/S
+00:50:C2:F6:40:00/36 ChrissoT # Chrisso Technologies LLC
+00:50:C2:F6:50:00/36 Telebyte # Telebyte Inc.
+00:50:C2:F6:60:00/36 GwtLlc # GWT LLC
00:50:C4 Imd
00:50:C5 AdsTechn # ADS Technologies, Inc
00:50:C6 LoopTele # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -17021,6 +17030,7 @@
14:54:12 Entis # Entis Co., Ltd.
14:5A:05 Apple # Apple, Inc.
14:63:08 JabilCir # JABIL CIRCUIT (SHANGHAI) LTD.
+14:6A:0B CypressE # Cypress Electronics Limited
14:6E:0A Private
14:73:73 TubitakU # TUBITAK UEKAE
14:74:11 Rim
@@ -17152,8 +17162,10 @@
1C:E1:92 Qisda # Qisda Corporation
1C:E2:CC TexasIns # Texas Instruments
1C:F0:61 Scaps # SCAPS GmbH
+1C:F4:CA Aviwest
1C:F5:E7 TurtleIn # Turtle Industry Co., Ltd.
1C:FE:A7 Identyte # IDentytech Solutins Ltd.
+20:01:4F LineaRes # Linea Research Ltd
20:05:05 RadmaxCo # RADMAX COMMUNICATION PRIVATE LIMITED
20:05:E8 Ooo"Inpr # OOO "InProMedia"
20:0A:5E Xiangsha # Xiangshan Giant Eagle Technology Developing co.,LTD
@@ -17176,6 +17188,7 @@
20:59:A0 ParagonT # Paragon Technologies Inc.
20:5B:2A Private
20:5B:5E Shenzhen # Shenzhen Wonhe Technology Co., Ltd
+20:64:32 SamsungE # SAMSUNG ELECTRO MECHANICS CO.,LTD.
20:6A:8A WistronI # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd.
20:6A:FF AtlasEle # Atlas Elektronik UK Limited
20:6F:EC BraemacC # Braemac CA LLC
@@ -17202,6 +17215,7 @@
20:FD:F1 3comEuro # 3COM EUROPE LTD
20:FE:CD SystemIn # System In Frontier Inc.
20:FE:DB M2mSolut # M2M Solution S.A.S.
+24:09:17 DevlinEl # Devlin Electronics Limited
24:0B:2A ViettelG # Viettel Group
24:0B:B1 KostalIn # KOSTAL Industrie Elektrik GmbH
24:11:25 Hutek # Hutek Co., Ltd.
@@ -17485,6 +17499,7 @@
38:E8:DF BMedien+ # b gmbh medien + datenbanken
38:E9:8C RecoSPA # Reco S.p.A.
38:EC:E4 SamsungE # Samsung Electronics
+38:EE:9D Anedo # Anedo Ltd.
38:F8:B7 V2comPar # V2COM PARTICIPACOES S.A.
38:FE:C5 EllipsBV # Ellips B.V.
3C:00:00 3Com
@@ -17568,6 +17583,7 @@
40:2B:A1 SonyEric # Sony Ericsson Mobile Communications AB
40:2C:F4 Universa # Universal Global Scientific Industrial Co., Ltd.
40:30:04 Apple # Apple, Inc.
+40:33:6C GodrejBo # Godrej & Boyce Mfg. co. ltd
40:37:AD MacroIma # Macro Image Technology, Inc.
40:3C:FC Apple # Apple, Inc.
40:40:22 Ziv
@@ -17590,6 +17606,7 @@
40:7B:1B MettleNe # Mettle Networks Inc.
40:83:DE Motorola
40:84:93 Claviste # Clavister AB
+40:88:E0 BeijingE # Beijing Ereneben Information Technology Limited Shenzhen Branch
40:8A:9A Titeng # TITENG CO., Ltd.
40:8B:07 Actionte # Actiontec Electronics, Inc
40:8B:F6 Shenzhen # Shenzhen TCL New Technology Co; Ltd.
@@ -17707,6 +17724,7 @@
48:6F:D2 Storsimp # StorSimple Inc
48:71:19 SgbGroup # SGB GROUP LTD.
48:8E:42 Digalog # DIGALOG GmbH
+48:91:53 Weinmann # Weinmann Ger�te f�r Medizin GmbH + Co. KG
48:91:F6 Shenzhen # Shenzhen Reach software technology CO.,LTD
48:9B:E2 SciInnov # SCI Innovations Ltd
48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd
@@ -17807,7 +17825,7 @@
50:87:B8 Nuvyyo # Nuvyyo Inc
50:8A:42 UptmateT # Uptmate Technology Co., LTD
50:8A:CB Shenzhen # SHENZHEN MAXMADE TECHNOLOGY CO., LTD.
-50:8C:77 Dirmeier # DIRMEIER Systems
+50:8C:77 Dirmeier # DIRMEIER Systems GmbH
50:93:4F GradualT # Gradual Tecnologia Ltda.
50:97:72 Westingh # Westinghouse Digital
50:A6:E3 DavidCla # David Clark Company
@@ -17855,6 +17873,7 @@
54:94:78 Silversh # Silvershore Technology Partners
54:9A:16 UzushioE # Uzushio Electric Co.,Ltd.
54:9B:12 SamsungE # Samsung Electronics
+54:9D:85 Eneracce # EnerAccess inc
54:A5:1B HuaweiDe # Huawei Device Co., Ltd
54:A9:D4 Minibar # Minibar Systems
54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd.
@@ -17907,6 +17926,7 @@
58:B9:E1 Crystalf # Crystalfontz America, Inc.
58:BC:27 Cisco # Cisco Systems
58:BD:A3 Nintendo # Nintendo Co., Ltd.
+58:BF:EA Cisco # Cisco Systems
58:D0:8F Ieee1904 # IEEE 1904.1 Working Group
58:DB:8D Fast # Fast Co., Ltd.
58:E4:76 CentronC # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD
@@ -17961,7 +17981,9 @@
5C:DA:D4 MurataMa # Murata Manufacturing Co., Ltd.
5C:E2:23 DelphinT # Delphin Technology AG
5C:E2:86 NortelNe # Nortel Networks
+5C:E2:F4 AcsipTec # AcSiP Technology Corp.
5C:EB:4E RStahlHm # R. STAHL HMI Systems GmbH
+5C:EE:79 GlobalDi # Global Digitech Co LTD
5C:F2:07 SpecoTec # Speco Technologies
5C:F3:FC Ibm # IBM Corp
5C:F9:DD Dell # Dell Inc
@@ -18001,6 +18023,7 @@
60:A1:0A SamsungE # Samsung Electronics Co.,Ltd
60:B3:C4 ElberSrl # Elber Srl
60:B6:06 Phorus
+60:B9:33 DeutronE # Deutron Electronics Corp.
60:B9:82 RoVeRLab # RO.VE.R. Laboratories S.p.A.
60:C5:47 Apple # Apple, Inc.
60:C9:80 Trymus
@@ -18224,6 +18247,7 @@
70:82:8E Oleumtec # OleumTech Corporation
70:8B:78 Citygrow # citygrow technology co., ltd
70:97:56 Happyele # Happyelectronics Co.,Ltd
+70:9A:0B ItalianI # Italian Institute of Technology
70:9E:86 X6d # X6D Limited
70:A1:91 Trendset # Trendsetter Medical, LLC
70:A4:1C Advanced # Advanced Wireless Dynamics S.L.
@@ -18272,6 +18296,7 @@
74:91:1A RuckusWi # Ruckus Wireless
74:A4:A7 QrsMusic # QRS Music Technologies, Inc.
74:A7:22 LgElectr # LG Electronics
+74:AE:76 InovoBro # iNovo Broadband, Inc.
74:B0:0C NetworkV # Network Video Technologies, Inc
74:B9:EB FujianJi # Fujian JinQianMao Electronic Technology Co.,Ltd
74:BE:08 AtekProd # ATEK Products, LLC
@@ -18338,7 +18363,9 @@
78:B8:1A InterSal # INTER SALES A/S
78:BA:D0 Shinybow # Shinybow Technology Co. Ltd.
78:BE:B6 Enhanced # Enhanced Vision
+78:BE:BD Stulz # STULZ GmbH
78:C4:0E H&DWirel # H&D Wireless
+78:C4:AB Shenzhen # Shenzhen Runsil Technology Co.,Ltd
78:C5:E5 TexasIns # Texas Instruments
78:C6:BB Innovasi # Innovasic, Inc.
78:CA:04 Nokia # Nokia Corporation
@@ -18395,6 +18422,7 @@
7C:A6:1D MhlLlc # MHL, LLC
7C:AC:B2 BoschSof # Bosch Software Innovations GmbH
7C:B0:3E Osram # OSRAM AG
+7C:B2:1B CiscoSpv # Cisco SPVTG
7C:B5:42 AcesTech # ACES Technology
7C:BB:6F CoscoEle # Cosco Electronics Co., Ltd.
7C:C3:A1 Apple # Apple, Inc.
@@ -18450,6 +18478,7 @@
80:7D:E3 Chongqin # Chongqing Sichuan Instrument Microcircuit Co.LTD.
80:81:A5 Tongqing # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
80:86:98 Netronic # Netronics Technologies Inc.
+80:90:23 JiaxingJ # Jiaxing Jiali Electronics Co.,Ltd
80:91:2A LihRongE # Lih Rong electronic Enterprise Co., Ltd.
80:91:C0 Agilemes # AgileMesh, Inc.
80:93:93 Xapt # Xapt GmbH
@@ -18467,7 +18496,9 @@
80:C6:AB Technico # Technicolor USA Inc.
80:C6:CA EndianSR # Endian s.r.l.
80:C8:62 Openpeak # Openpeak, Inc
+80:CE:B1 Theissen # Theissen Training Systems GmbH
80:D0:19 Embed # Embed, Inc
+80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd
80:DB:31 PowerQuo # Power Quotient International Co., Ltd.
80:EE:73 Shuttle # Shuttle Inc.
80:F5:93 IrcoSist # IRCO Sistemas de Telecomunicación S.A.
@@ -18597,6 +18628,7 @@
8C:B8:2C IpitomyC # IPitomy Communications
8C:B8:64 AcsipTec # AcSiP Technology Corp.
8C:C1:21 Panasoni # Panasonic AVC Networks Company
+8C:C7:AA RadinetC # Radinet Communications Inc.
8C:C8:CD SamsungE # Samsung Electronics Co., LTD
8C:CF:5C Befega # BEFEGA GmbH
8C:D1:7B CgMobile # CG Mobile
@@ -18800,6 +18832,7 @@
9C:5C:8D FiremaxI # FIREMAX INDÚSTRIA E COMÉRCIO DE PRODUTOS ELETRÔNICOS LTDA
9C:5D:95 VtcElect # VTC Electronics Corp.
9C:5E:73 CalibreU # Calibre UK Ltd
+9C:61:1D Omni-IdU # Omni-ID USA, Inc.
9C:64:5E HarmanCo # Harman Consumer Group
9C:6A:BE QeesAps # QEES ApS.
9C:75:14 WildixSr # Wildix srl
@@ -18808,6 +18841,7 @@
9C:80:7D Syscable # SYSCABLE Korea Inc.
9C:8B:F1 Warehous # The Warehouse Limited
9C:8E:99 Hewlett- # Hewlett-Packard Company
+9C:8E:DC Teracom # Teracom Limited
9C:93:4E Xerox # Xerox Corporation
9C:95:F8 Smartdoo # SmartDoor Systems, LLC
9C:A1:34 Nike # Nike, Inc.
@@ -18918,6 +18952,7 @@
A4:7C:1F GlobalMi # Global Microwave Systems Inc.
A4:85:6B QElectro # Q Electronics Ltd
A4:90:05 ChinaGre # CHINA GREATWALL COMPUTER SHENZHEN CO.,LTD
+A4:93:4C Cisco # Cisco Systems
A4:99:81 FujianEl # FuJian Elite Power Tech CO.,LTD.
A4:9B:13 Burrough # Burroughs Payment Systems, Inc.
A4:A2:4A CiscoSpv # Cisco SPVTG
@@ -19067,6 +19102,7 @@
B0:5C:E5 Nokia # Nokia Corporation
B0:65:63 Shanghai # Shanghai Railway Communication Factory
B0:6C:BF 3alityDi # 3ality Digital Systems GmbH
+B0:75:0C QaCafe # QA Cafe
B0:75:D5 Zte # ZTE Corporation
B0:7D:62 Dipl-Ing # Dipl.-Ing. H. Horstmann GmbH
B0:81:D8 I-Sys # I-sys Corp
@@ -19133,6 +19169,7 @@
B4:94:4E Weteleco # WeTelecom Co., Ltd.
B4:99:BA Hewlett- # Hewlett-Packard Company
B4:9E:E6 Shenzhen # SHENZHEN TECHNOLOGY CO LTD
+B4:A4:B5 ZenEye # Zen Eye Co.,Ltd
B4:A4:E3 Cisco # Cisco Systems
B4:A5:A9 Modi # MODI GmbH
B4:AA:4D Ensequen # Ensequence, Inc.
@@ -19149,6 +19186,7 @@
B4:D8:A9 Betterbo # BetterBots
B4:D8:DE IotaComp # iota Computing, Inc.
B4:E0:CD IoTurbin # IO Turbine, Inc.
+B4:E1:EB Private
B4:ED:19 PieDigit # Pie Digital, Inc.
B4:ED:54 WohlerTe # Wohler Technologies
B4:EE:D4 TexasIns # Texas Instruments
@@ -19269,6 +19307,7 @@
BC:E5:9F Waterwor # WATERWORLD Technology Co.,LTD
BC:EA:2B Citycom # CityCom GmbH
BC:F2:AF Devolo # devolo AG
+BC:F6:85 D-LinkIn # D-Link International
BC:FE:8C Altronic # Altronic, LLC
BC:FF:AC Topcon # TOPCON CORPORATION
C0:00:00 WesternD # Western Digital (may be reversed 00 00 C0?)
@@ -19293,6 +19332,7 @@
C0:62:6B Cisco # Cisco Systems
C0:6C:0F DobbsSta # Dobbs Stanford
C0:7E:40 Shenzhen # SHENZHEN XDK COMMUNICATION EQUIPMENT CO.,LTD
+C0:81:70 EffigisG # Effigis GeoSolutions
C0:83:0A 2wire
C0:84:7A Apple # Apple, Inc.
C0:8A:DE RuckusWi # Ruckus Wireless
@@ -19369,6 +19409,7 @@
C8:02:A6 BeijingN # Beijing Newmine Technology
C8:07:18 Tdsi
C8:0A:A9 QuantaCo # Quanta Computer Inc.
+C8:0E:77 LeShiZhi # Le Shi Zhi Xin Electronic Technology (Tianjin) Co.,Ltd
C8:1A:FE Dlogic # DLOGIC GmbH
C8:1E:8E AdvSecur # ADV Security (S) Pte Ltd
C8:20:8E Storaged # Storagedata
@@ -19426,6 +19467,7 @@
C8:D1:D1 AgaitTec # AGAiT Technology Corporation
C8:D2:C1 JetlunSh # Jetlun (Shenzhen) Corporation
C8:D5:FE Shenzhen # Shenzhen Zowee Technology Co., Ltd
+C8:D7:19 CiscoCon # Cisco Consumer Products, LLC
C8:DF:7C Nokia # Nokia Corporation
C8:EE:08 TangtopT # TANGTOP TECHNOLOGY CO.,LTD
C8:EF:2E BeijingG # Beijing Gefei Tech. Co., Ltd
@@ -19531,6 +19573,7 @@
D0:C2:82 Cisco # Cisco Systems
D0:CF:5E EnergyMi # Energy Micro AS
D0:D0:FD Cisco # Cisco Systems
+D0:D2:12 K2net # K2NET Co.,Ltd.
D0:D2:86 BeckmanC # Beckman Coulter Biomedical K.K.
D0:D3:FC Mios # Mios, Ltd.
D0:DF:9A LiteonTe # Liteon Technology Corporation
@@ -19674,6 +19717,7 @@
DC:2E:6A Hct # HCT. Co., Ltd.
DC:30:9C Say # SAY Systems Limited
DC:33:50 Techsat # TechSAT GmbH
+DC:37:D2 HunanHkt # Hunan HKT Electronic Technology Co., Ltd
DC:3C:2E Manufact # Manufacturing System Insights, Inc.
DC:3C:84 TicomGeo # Ticom Geomatics, Inc.
DC:3E:51 SolbergA # Solberg & Andersen AS
@@ -19828,6 +19872,8 @@
E8:43:B6 Qnap # QNAP Systems, Inc.
E8:4E:06 EdupInte # EDUP INTERNATIONAL (HK) CO., LTD
E8:4E:CE Nintendo # Nintendo Co., Ltd.
+E8:54:84 NeoInfor # NEO INFORMATION SYSTEMS CO., LTD.
+E8:56:D6 Nctech # NCTech Ltd
E8:5B:5B LgElectr # LG ELECTRONICS INC
E8:5E:53 Infratec # Infratec Datentechnik GmbH
E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center
@@ -19862,6 +19908,7 @@
E8:E7:76 Shenzhen # Shenzhen Kootion Technology Co., Ltd
E8:F1:B0 Sagemcom # SAGEMCOM SAS
E8:F9:28 RftechSr # RFTECH SRL
+EC:0E:D6 ItechIns # ITECH INSTRUMENTS SAS
EC:10:00 EnanceSo # Enance Source Co., Ltd. PC clones(?)
EC:11:20 Flodesig # FloDesign Wind Turbine Corporation
EC:14:F6 Biocontr # BioControl AS
@@ -20003,6 +20050,7 @@
F4:7F:35 Cisco # Cisco Systems
F4:87:71 Infoblox
F4:8E:09 Nokia # Nokia Corporation
+F4:90:EA DecisoBV # Deciso B.V.
F4:94:61 NexgenSt # NexGen Storage
F4:9F:54 SamsungE # Samsung Electronics
F4:A5:2A HawaTech # Hawa Technologies Inc
@@ -20086,6 +20134,7 @@
FC:0F:E6 SonyComp # Sony Computer Entertainment Inc.
FC:10:BD ControlS # Control Sistematizado S.A.
FC:17:94 Intercre # InterCreative Co., Ltd
+FC:1D:59 ISmartCi # I Smart Cities HK Ltd
FC:1F:C0 Eurecam
FC:25:3F Apple # Apple, Inc.
FC:2A:54 Connecte # connected data
@@ -20134,7 +20183,7 @@
#
# Well-known addresses.
#
-# $Id: manuf 41759 2012-03-25 14:33:59Z gerald $
+# $Id: manuf 41879 2012-04-01 14:33:58Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/packaging/macosx/Info.plist
^
|
| @@ -8,7 +8,7 @@
<key>CFBundleExecutable</key>
<string>Wireshark</string>
<key>CFBundleGetInfoString</key>
- <string>1.6.6, Copyright 1998-2012 Wireshark Development Team</string>
+ <string>1.6.7, Copyright 1998-2012 Wireshark Development Team</string>
<key>CFBundleIconFile</key>
<string>Wireshark.icns</string>
<key>CFBundleIdentifier</key>
@@ -42,11 +42,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.6</string>
+ <string>1.6.7</string>
<key>CFBundleSignature</key>
<string>Wshk</string>
<key>CFBundleVersion</key>
- <string>1.6.6</string>
+ <string>1.6.7</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/packaging/nsis/Makefile.nmake
^
|
| @@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake 36113 2011-03-01 19:40:51Z gerald $
+# $Id: Makefile.nmake 41972 2012-04-06 17:43:35Z gerald $
#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
@@ -139,6 +139,10 @@
/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
/DINTL_DLL=$(INTL_DLL) \
/DVERSION=$(VERSION) \
+ /DVERSION_MAJOR=$(VERSION_MAJOR) \
+ /DVERSION_MINOR=$(VERSION_MINOR) \
+ /DVERSION_MICRO=$(VERSION_MICRO) \
+ /DVERSION_BUILD=$(VERSION_BUILD) \
/DPRODUCT_VERSION=$(PRODUCT_VERSION) \
/DWTAP_VERSION=$(WTAP_VERSION) \
!IF "$(C_ARES_DIR)" != ""
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/packaging/nsis/wireshark.nsi
^
|
| @@ -1,7 +1,7 @@
;
; wireshark.nsi
;
-; $Id: wireshark.nsi 40402 2012-01-06 20:57:11Z gerald $
+; $Id: wireshark.nsi 41972 2012-04-06 17:43:35Z gerald $
; Set the compression mechanism first.
@@ -32,7 +32,8 @@
!define BITS 64
!endif
-Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
+!define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
+Name "${DISPLAY_NAME}"
;
VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
@@ -687,15 +688,29 @@
File "..\..\wireshark-gtk2\help\faq.txt"
; Write the uninstall keys for Windows
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "DisplayVersion" "${VERSION}"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "DisplayName" "Wireshark ${VERSION}"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "UninstallString" '"$INSTDIR\uninstall.exe"'
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "Publisher" "The Wireshark developer community, http://www.wireshark.org"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "HelpLink" "mailto:wireshark-users@wireshark.org"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "URLInfoAbout" "http://www.wireshark.org"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "URLUpdateInfo" "http://www.wireshark.org/download/win32/"
-WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "NoModify" 1
-WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "NoRepair" 1
+; http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs
+; http://msdn.microsoft.com/en-us/library/ms954376.aspx
+; http://msdn.microsoft.com/en-us/library/windows/desktop/aa372105.aspx
+!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}"
+
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Comments" "${DISPLAY_NAME}"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\wireshark.exe,0"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayName" "${DISPLAY_NAME}"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "http://ask.wireshark.org/"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "InstallLocation" "$INSTDIR"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Wireshark developer community, http://www.wireshark.org"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "http://www.wireshark.org"
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "http://www.wireshark.org/download.html"
+
+WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "NoModify" 1
+WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "NoRepair" 1
+WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "VersionMajor" ${VERSION_MAJOR}
+WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "VersionMinor" ${VERSION_MINOR}
+
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
+
WriteUninstaller "uninstall.exe"
; Write an entry for ShellExecute
@@ -997,6 +1012,15 @@
SectionEnd
!endif
+Section "-Finally"
+
+; Compute and write the installation directory size
+${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+IntFmt $0 "0x%08X" $0
+WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "EstimatedSize" "$0"
+
+SectionEnd
+
Section "Uninstall" un.SecUinstall
;-------------------------------------------
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/services
^
|
| @@ -1,6 +1,6 @@
# This is a local copy of the IANA port-numbers file.
#
-# $Id: services 41759 2012-03-25 14:33:59Z gerald $
+# $Id: services 41879 2012-04-01 14:33:58Z gerald $
#
# Wireshark uses it to resolve port numbers into human readable
# service names, e.g. TCP port 80 -> http.
@@ -14,7 +14,7 @@
# Service Name and Transport Protocol Port Number Registry
#
# Last Updated
-# 2012-03-23
+# 2012-03-28
#
# Note
#
@@ -4685,8 +4685,13 @@
kme-trap-port 2081/tcp # KME PRINTER TRAP PORT [Masakatsu_Matsuo] [Masakatsu_Matsuo]
kme-trap-port 2081/udp # KME PRINTER TRAP PORT [Masakatsu_Matsuo] [Masakatsu_Matsuo]
infowave 2082/tcp # Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku]
-infowave 2082/udp # Infowave Mobiltiy Server [Kaz_Kylheku] [Kaz_Kylheku]
-radsec 2083/tcp # Secure Radius Service [Mike_McCauley] [Mike_McCauley] 2005-05
+infowave 2082/udp # Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku]
+# The TCP port 2083 was already previously assigned by IANA for
+# "RadSec", an early implementation of RADIUS/TLS, prior to
+radsec 2083/tcp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 [RFC-ietf-radext-radsec-12] issuance of this RFC. This early implementation can be
+# configured to be compatible to RADIUS/TLS as specified by the
+# IETF. See [RFC-ietf-radext-radsec-12], Appendix A for
+# details.
radsec 2083/udp # Secure Radius Service [Mike_McCauley] [Mike_McCauley] 2005-05
sunclustergeo 2084/tcp # SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11
sunclustergeo 2084/udp # SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11
@@ -13311,8 +13316,8 @@
cisco-avp 8470/tcp # Cisco Address Validation [Cullen_Jennings] [Cullen_Jennings] 2009-02-13
# Protocol
# 8470 udp Reserved
-pim-port 8471/tcp # PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC-ietf-pim-port-09]
-pim-port 8471/sctp # PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC-ietf-pim-port-09]
+pim-port 8471/tcp # PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC6559]
+pim-port 8471/sctp # PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC6559]
# 8471 udp Reserved
otv 8472/tcp # Overlay Transport [Dino_Farinacci] [Dino_Farinacci] 2008-01-07
# Virtualization (OTV)
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/svnversion.h
^
|
| @@ -1,2 +1,2 @@
-#define SVNVERSION "SVN Rev 41803"
+#define SVNVERSION "SVN Rev 41973"
#define SVNPATH "/trunk-1.6"
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/tools/win64-setup.sh
^
|
| @@ -1,10 +1,10 @@
#!/bin/bash
#
-# $Id: win64-setup.sh 41784 2012-03-27 00:56:28Z gerald $
+# $Id: win64-setup.sh 41830 2012-03-29 20:19:56Z gerald $
# 64-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2012-03-26-1.6"
+export DOWNLOAD_TAG="2012-03-29-1.6"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/`
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/wiretap/Makefile.am
^
|
| @@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $
+# $Id: Makefile.am 41808 2012-03-27 19:56:22Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -29,7 +29,7 @@
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
-libwiretap_la_LDFLAGS = -version-info 1:6:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 1:7:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror
|
|
[-]
[+]
|
Changed |
wireshark-1.6.7.tar.bz2/wiretap/Makefile.in
^
|
| @@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $
+# $Id: Makefile.am 41808 2012-03-27 19:56:22Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -596,7 +596,7 @@
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
-libwiretap_la_LDFLAGS = -version-info 1:6:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 1:7:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
@HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror
INCLUDES = -I$(srcdir)/..
CLEANFILES = \
|
