|
[-]
[+]
|
Changed |
wireshark.changes
|
|
|
|
[-]
[+]
|
Changed |
wireshark.spec
^
|
|
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/AUTHORS
^
|
| @@ -3273,6 +3273,7 @@
Markus Renz <Markus.Renz [AT] hirschmann.de>
Petr Lautrbach <plautrba [AT] redhat.com>
Toshihiro Kataoka <kataoka.toshihiro [AT] gmail.com>
+Romain Fliedel <romain.fliedel+wireshark [AT] gmail.com>
Dan Lasley <dlasley[AT]promus.com> gave permission for his
dumpit() hex-dump routine to be used.
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/ChangeLog
^
|
| @@ -1,16 +1,444 @@
------------------------------------------------------------------------
-r36678 | gerald | 2011-04-17 09:04:39 -0700 (Sun, 17 Apr 2011) | 1 line
+r36706 | gerald | 2011-04-18 11:36:21 -0700 (Mon, 18 Apr 2011) | 2 lines
+Changed paths:
+ M /trunk-1.4/ChangeLog
+ M /trunk-1.4/NEWS
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/version.conf
+
+Build 1.4.6.
+
+------------------------------------------------------------------------
+r36712 | gerald | 2011-04-18 15:28:34 -0700 (Mon, 18 Apr 2011) | 2 lines
+Changed paths:
+ M /trunk-1.4/config.nmake
+ M /trunk-1.4/configure.in
+ M /trunk-1.4/debian/changelog
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/version.conf
+
+1.4.6 → 1.4.7.
+
+------------------------------------------------------------------------
+r36835 | gerald | 2011-04-24 09:04:33 -0700 (Sun, 24 Apr 2011) | 1 line
+Changed paths:
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/manuf
+
+[Automatic manuf, services and enterprise-numbers update for 2011-04-24]
+------------------------------------------------------------------------
+r36960 | gerald | 2011-05-01 09:04:44 -0700 (Sun, 01 May 2011) | 1 line
Changed paths:
M /trunk-1.4/epan/enterprise-numbers
M /trunk-1.4/manuf
M /trunk-1.4/services
-[Automatic manuf, services and enterprise-numbers update for 2011-04-17]
+[Automatic manuf, services and enterprise-numbers update for 2011-05-01]
------------------------------------------------------------------------
-r36694 | cmaynard | 2011-04-17 18:07:41 -0700 (Sun, 17 Apr 2011) | 2 lines
+r37013 | gerald | 2011-05-06 16:11:15 -0700 (Fri, 06 May 2011) | 2 lines
Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-netflow.c
+
+Remove an uninitialized header field reported in bug 5898.
+
+------------------------------------------------------------------------
+r37018 | gerald | 2011-05-08 09:04:42 -0700 (Sun, 08 May 2011) | 1 line
+Changed paths:
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/manuf
+ M /trunk-1.4/services
+
+[Automatic manuf, services and enterprise-numbers update for 2011-05-08]
+------------------------------------------------------------------------
+r37034 | gerald | 2011-05-09 13:49:13 -0700 (Mon, 09 May 2011) | 12 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/wiretap/pcapng.c
+
+Copy over r36714 with manual intervention.
+
+ ------------------------------------------------------------------------
+ r36714 | tuexen | 2011-04-19 06:28:17 -0700 (Tue, 19 Apr 2011) | 2 lines
+ Changed paths:
+ M /trunk/wiretap/pcapng.c
+
+ Unbreak live capture using pcapng.
+ ------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37161 | gerald | 2011-05-15 10:05:35 -0700 (Sun, 15 May 2011) | 1 line
+Changed paths:
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/services
+
+[Automatic manuf, services and enterprise-numbers update for 2011-05-15]
+------------------------------------------------------------------------
+r37221 | gerald | 2011-05-17 16:23:15 -0700 (Tue, 17 May 2011) | 46 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/diam_dict.l
+ M /trunk-1.4/epan/dissectors/packet-m3ua.c
+ M /trunk-1.4/epan/dissectors/packet-ssl.c
M /trunk-1.4/epan/dissectors/packet-tcp.c
+ M /trunk-1.4/gtk/mtp3_stat.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r36723 | sfisher | 2011-04-19 12:52:50 -0700 (Tue, 19 Apr 2011) | 5 lines
+ Changed paths:
+ M /trunk/gtk/mtp3_stat.c
+
+ From Cecco via bug #5605: bug on gtk wireshark telephony->mtp3->msus
+ [doesn't show contents of window]
+ ------------------------------------------------------------------------
+ r36304 | morriss | 2011-03-23 19:10:04 -0700 (Wed, 23 Mar 2011) | 16 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-ssl.c
+ M /trunk/epan/dissectors/packet-tcp.c
+
+ If we've already seen a segment which starts a multi-segment pdu (i.e., it's
+ a retransmission), don't add it to the list (tree) of multi-segment pdus.
+
+ Otherwise, if we'd already seen the rest of the pdu and the other segments
+ were not retransmitted, the retransmission would break dissection of the pdu
+ because lookups for the segment would find the retransmission (to which the
+ other segments were not attached).
+
+ Since we know this segment is a retransmission, don't bother handing it off
+ to the subdissector either.
+
+ Use PINFO_FD_VISITED().
+ Add some white space in the desegmentation routine to improve readability.
+
+ Apply the same changes to the SSL dissector.
+ ------------------------------------------------------------------------
+
+
+Copy over with manual intervention:
+
+ ------------------------------------------------------------------------
+ r36691 | tuexen | 2011-04-17 12:37:46 -0700 (Sun, 17 Apr 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-m3ua.c
+
+ Decode the SI value in DATA messages correclty.
+ This fixes bug 5834.
+ ------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37222 | gerald | 2011-05-17 16:29:38 -0700 (Tue, 17 May 2011) | 12 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-dcm.c
+
+Copy over r36958 from the trunk:
+
+ ------------------------------------------------------------------------
+ r36958 | gerald | 2011-04-30 10:43:05 -0700 (Sat, 30 Apr 2011) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-dcm.c
+
+ Check our PDU length. Fixes the infinite loop found in bug 5876.
+ ------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37251 | gerald | 2011-05-18 11:21:32 -0700 (Wed, 18 May 2011) | 22 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-iec104.c
+ M /trunk-1.4/wiretap/netmon.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r36975 | guy | 2011-05-03 02:14:56 -0700 (Tue, 03 May 2011) | 5 lines
+ Changed paths:
+ M /trunk/wiretap/netmon.c
+
+ Note what NetMon 3 actually uses various types for.
+
+ For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP. (Yes,
+ NetMon checks for v4 vs. v6 for all of them.)
+ ------------------------------------------------------------------------
+ r36997 | cmaynard | 2011-05-05 07:20:22 -0700 (Thu, 05 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-iec104.c
+
+ Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37252 | gerald | 2011-05-18 11:30:02 -0700 (Wed, 18 May 2011) | 14 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/wiretap/snoop.c
+
+Copy over r37068 from the trunk:
+
+ ------------------------------------------------------------------------
+ r37068 | gerald | 2011-05-11 15:36:59 -0700 (Wed, 11 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/wiretap/snoop.c
+
+ Check our original record length. Fixes a crash bug found by Huzaifa
+ Sidhpurwala of the Red Hat Security Response Team.
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
-Use tvb_get_ptr() instead of NULL. Resolves bug 5837, which I caused. Sorry.
+------------------------------------------------------------------------
+r37256 | gerald | 2011-05-18 12:32:19 -0700 (Wed, 18 May 2011) | 32 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-dnp.c
+ M /trunk-1.4/packaging/macosx/Info.plist.in
+ M /trunk-1.4/wireshark.desktop
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r37114 | guy | 2011-05-12 23:11:19 -0700 (Thu, 12 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/packaging/macosx/Info.plist.in
+
+ Pcap files now have an official MIME type.
+ ------------------------------------------------------------------------
+ r37115 | guy | 2011-05-12 23:23:58 -0700 (Thu, 12 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/wireshark.desktop
+
+ Pcap files now have an official MIME type.
+ ------------------------------------------------------------------------
+ r37116 | guy | 2011-05-12 23:55:11 -0700 (Thu, 12 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/packaging/macosx/Info.plist.in
+ M /trunk/wireshark.desktop
+
+ That's *application*/vnd.tcpdump.pcap to you.
+ ------------------------------------------------------------------------
+ r37135 | wmeier | 2011-05-13 15:01:22 -0700 (Fri, 13 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-dnp.c
+
+ Fix Bug 5920: "DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF _FDCTR_32NF _FDCTR_16NF"
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5920
+ ------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37257 | gerald | 2011-05-18 13:01:54 -0700 (Wed, 18 May 2011) | 17 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/tvbuff.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r37081 | darkjames | 2011-05-12 09:31:42 -0700 (Thu, 12 May 2011) | 6 lines
+ Changed paths:
+ M /trunk/epan/tvbuff.c
+
+ Fix double free.
+
+ compr is also freed outside loop. So free it only when returning.
+
+ Might be related with bug #5908, but I don't have access to that bug ;-)
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37258 | gerald | 2011-05-18 13:03:00 -0700 (Wed, 18 May 2011) | 14 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/wiretap/visual.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r37128 | gerald | 2011-05-13 10:12:44 -0700 (Fri, 13 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/wiretap/visual.c
+
+ From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Fix an
+ integer overflow in wiretap/visual.c.
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37270 | gerald | 2011-05-18 17:29:51 -0700 (Wed, 18 May 2011) | 90 lines
+Changed paths:
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-aim-messaging.c
+ M /trunk-1.4/epan/dissectors/packet-gsm_a_gm.c
+ M /trunk-1.4/epan/dissectors/packet-ntlmssp.c
+ M /trunk-1.4/epan/dissectors/packet-smb.c
+ M /trunk-1.4/epan/proto.c
+ M /trunk-1.4/epan/wslua/wslua_proto.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r37197 | guy | 2011-05-16 19:29:43 -0700 (Mon, 16 May 2011) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-ntlmssp.c
+
+ According to MS-NLMP, the "version" field in the NTLMSSP blobs is
+ present only if the NTLMSSP_NEGOTIATE_VERSION flag is set in the flags
+ field, and that appears to be true in at least one capture I've seen.
+ ------------------------------------------------------------------------
+ r37199 | etxrab | 2011-05-17 01:23:30 -0700 (Tue, 17 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-gsm_a_gm.c
+
+ Use the correct value string and bitmasks.
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5928
+ ------------------------------------------------------------------------
+ r37236 | guy | 2011-05-18 00:20:45 -0700 (Wed, 18 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/proto.c
+
+ You cannot just make the "len" field of a GByteArray larger, if there's
+ no data to back that length; you can only make it smaller.
+ ------------------------------------------------------------------------
+ r37239 | morriss | 2011-05-18 08:33:07 -0700 (Wed, 18 May 2011) | 7 lines
+ Changed paths:
+ M /trunk/epan/wslua/wslua_proto.c
+
+ Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5930 :
+
+ with a variant of the patch submitted by Alexander Stein on the -dev list:
+
+ Allow FT_FRAMENUMs to be added (as base BASE_NONE). My change from Alexander's
+ patch is to disallow BASE_NONE for non-framenum integers.
+ ------------------------------------------------------------------------
+ r36890 | wmeier | 2011-04-26 22:09:00 -0700 (Tue, 26 Apr 2011) | 5 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-aim-messaging.c
+
+ From Yaniv Kaul: some 'set but not used' compilation fixes;
+ From me:
+ - Remove unneeded #include <stdlib.h> and <ctype.h>;
+ - Indentation cleanup.
+ ------------------------------------------------------------------------
+ r37188 | cmaynard | 2011-05-16 13:02:14 -0700 (Mon, 16 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-aim-messaging.c
+
+ Fix endian issues, especially w/endian arg to proto_tree_add_item().
+ Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5464.
+ ------------------------------------------------------------------------
+
+
+Copy over with manual intervention:
+
+ ------------------------------------------------------------------------
+ r37183 | guy | 2011-05-16 11:32:35 -0700 (Mon, 16 May 2011) | 11 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-smb.c
+
+ Fix some comments.
+
+ Get rid of null-pointer tests for t2i in the "not null" branch of an
+ earlier test whether it's null, as those tests are redundant.
+
+ Use a switch statement to check the subcommand for Trans2.
+
+ If t2i->info_level is -1, it means we don't know the info level, for
+ whatever reason (e.g., the request was cut short by the snapshot length
+ before the info level). Report it as such.
+
+ ------------------------------------------------------------------------
+ r37192 | guy | 2011-05-16 15:55:22 -0700 (Mon, 16 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-smb.c
+
+ Give the UNIX-extension routines used for info levels that appear both
+ in set and get names beginning with dissect_qspi_.
+ ------------------------------------------------------------------------
+ r37196 | guy | 2011-05-16 18:38:28 -0700 (Mon, 16 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-ntlmssp.c
+
+ Fix cut-and-pasteo.
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37348 | gerald | 2011-05-22 10:05:59 -0700 (Sun, 22 May 2011) | 1 line
+Changed paths:
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/services
+
+[Automatic manuf, services and enterprise-numbers update for 2011-05-22]
+------------------------------------------------------------------------
+r37443 | gerald | 2011-05-27 13:30:56 -0700 (Fri, 27 May 2011) | 35 lines
+Changed paths:
+ M /trunk-1.4/AUTHORS
+ M /trunk-1.4/docbook/release-notes.xml
+ M /trunk-1.4/epan/dissectors/packet-6lowpan.c
+ M /trunk-1.4/epan/dissectors/packet-dect.c
+ M /trunk-1.4/epan/dissectors/packet-dhcpv6.c
+ M /trunk-1.4/tshark.c
+
+Copy over revisions from the trunk:
+
+ ------------------------------------------------------------------------
+ r37370 | cmaynard | 2011-05-23 10:53:51 -0700 (Mon, 23 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/AUTHORS
+ M /trunk/epan/dissectors/packet-dect.c
+
+ From Romain Fliedel via bug 5947: Fix the mask for extracting FMID.
+ ------------------------------------------------------------------------
+ r37374 | guy | 2011-05-24 09:17:43 -0700 (Tue, 24 May 2011) | 2 lines
+ Changed paths:
+ M /trunk/tshark.c
+
+ Don't print hidden columns.
+ ------------------------------------------------------------------------
+ r37426 | jake | 2011-05-27 00:02:26 -0700 (Fri, 27 May 2011) | 3 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-6lowpan.c
+
+ From Colin O'Flynn:
+ Avoid processing tvb when fragment dissection didn't create one.
+ ------------------------------------------------------------------------
+ r37439 | cmaynard | 2011-05-27 07:38:42 -0700 (Fri, 27 May 2011) | 4 lines
+ Changed paths:
+ M /trunk/epan/dissectors/packet-dhcpv6.c
+
+ When parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
+ number of bytes consumed.
+ Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962
+ ------------------------------------------------------------------------
+
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r37464 | gerald | 2011-05-29 10:05:51 -0700 (Sun, 29 May 2011) | 1 line
+Changed paths:
+ M /trunk-1.4/epan/enterprise-numbers
+ M /trunk-1.4/services
+[Automatic manuf, services and enterprise-numbers update for 2011-05-29]
------------------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/NEWS
^
|
| @@ -1,4 +1,4 @@
-Wireshark 1.4.6 Release Notes
+Wireshark 1.4.7 Release Notes
------------------------------------------------------------------
@@ -12,10 +12,63 @@
Bug Fixes
+ The following vulnerabilities have been fixed. See the security
+ advisory for details and a workaround.
+
+ o Large/infinite loop in the DICOM dissector. (Bug 5876)
+
+ Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.
+
+ o Huzaifa Sidhpurwala of the Red Hat Security Response Team
+ discovered that a corrupted Diameter dictionary file could
+ crash Wireshark.
+
+ Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.
+
+ o Huzaifa Sidhpurwala of the Red Hat Security Response Team
+ discovered that a corrupted snoop file could crash Wireshark.
+ (Bug 5912)
+
+ Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.
+
+ o David Maciejak of Fortinet's FortiGuard Labs discovered that
+ malformed compressed capture data could crash Wireshark. (Bug
+ 5908)
+
+ Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.
+
+ o Huzaifa Sidhpurwala of the Red Hat Security Response Team
+ discovered that a corrupted Visual Networks file could crash
+ Wireshark. (Bug 5934)
+
+ Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.
+
The following bugs have been fixed:
- o Wireshark and TShark can crash while analyzing TCP packets.
- (Bug 5837)
+ o AIM dissector has some endian issues. (Bug 5464)
+
+ o Telephony→MTP3→MSUS doesn't display window. (Bug 5605)
+
+ o Support for MS NetMon 3.x traces containing raw IPv6 ("Type
+ 7") packets. (Bug 5817)
+
+ o Service Indicator in M3UA protocol data. (Bug 5834)
+
+ o IEC60870-5-104 protocol, incorrect decoding of timestamp type
+ CP56Time2a. (Bug 5889)
+
+ o DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF
+ _FDCTR_32NF _FDCTR_16NF. (Bug 5920)
+
+ o 3GPP QoS: Traffic class is not decoded properly. (Bug 5928)
+
+ o Wireshark crashes when creating ProtoField.framenum in Lua.
+ (Bug 5930)
+
+ o Fix a wrong mask to extract FMID from DECT packets dissector.
+ (Bug 5947)
+
+ o Incorrect DHCPv6 remote identifier option parsing. (Bug 5962)
New and Updated Features
@@ -27,11 +80,11 @@
Updated Protocol Support
- TCP
+ DICOM, IEC104, M3UA, TCP,
New and Updated Capture File Support
- There is no new or updated capture file support in this release.
+ Network Monitor.
Getting Wireshark
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/config.nmake
^
|
| @@ -1,4 +1,4 @@
-# $Id: config.nmake 36656 2011-04-15 22:15:15Z gerald $
+# $Id: config.nmake 36712 2011-04-18 22:28:34Z 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).
@@ -16,8 +16,8 @@
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
VERSION_MINOR=4
-VERSION_MICRO=6
-VERSION_BUILD=36706
+VERSION_MICRO=7
+VERSION_BUILD=37483
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
VERSION_EXTRA=
|
|
[-]
[+]
|
Changed |
wireshark-1.4.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.4.6.
+# Generated by GNU Autoconf 2.65 for wireshark 1.4.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.4.6'
-PACKAGE_STRING='wireshark 1.4.6'
+PACKAGE_VERSION='1.4.7'
+PACKAGE_STRING='wireshark 1.4.7'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1619,7 +1619,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.4.6 to adapt to many kinds of systems.
+\`configure' configures wireshark 1.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1690,7 +1690,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wireshark 1.4.6:";;
+ short | recursive ) echo "Configuration of wireshark 1.4.7:";;
esac
cat <<\_ACEOF
@@ -1874,7 +1874,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wireshark configure 1.4.6
+wireshark configure 1.4.7
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2414,7 +2414,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.4.6, which was
+It was created by wireshark $as_me 1.4.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3186,7 +3186,7 @@
# Define the identity of the package.
PACKAGE='wireshark'
- VERSION='1.4.6'
+ VERSION='1.4.7'
cat >>confdefs.h <<_ACEOF
@@ -24996,7 +24996,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.4.6, which was
+This file was extended by wireshark $as_me 1.4.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25062,7 +25062,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.4.6
+wireshark config.status 1.4.7
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/configure.in
^
|
| @@ -1,8 +1,8 @@
-# $Id: configure.in 36656 2011-04-15 22:15:15Z gerald $
+# $Id: configure.in 36712 2011-04-18 22:28:34Z gerald $
#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.4.6)
+AC_INIT(wireshark, 1.4.7)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/debian/changelog
^
|
| @@ -1,4 +1,4 @@
-wireshark (1.4.6) unstable; urgency=low
+wireshark (1.4.7) unstable; urgency=low
* Self-made package
|
|
[-]
[+]
|
Changed |
wireshark-1.4.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 36706 2011-04-18 18:36:21Z gerald $ -->
+<!-- $Id: release-notes.xml 37483 2011-05-31 16:05:34Z gerald $ -->
<!--
DOCUMENT SECTION
@@ -12,7 +12,7 @@
<!--
Wireshark Info
-->
- <!ENTITY WiresharkCurrentVersion "1.4.6">
+ <!ENTITY WiresharkCurrentVersion "1.4.7">
]>
@@ -31,6 +31,104 @@
<para>
+ The following vulnerabilities have been fixed. See the
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-08.html">security advisory</ulink> for details and a workaround.
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ Large/infinite loop in the DICOM dissector.
+ <!-- Fixed in trunk: r36958 -->
+ <!-- Fixed in trunk-1.4: r37222 -->
+ <!-- Fixed in trunk-1.2: r37213 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5876">Bug
+ 5876</ulink>)
+ </para>
+ <para>Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered
+ that a corrupted Diameter dictionary file could crash Wireshark.
+ <!-- Fixed in trunk: r37011 -->
+ <!-- Fixed in trunk-1.4: r37221 -->
+ <!-- Fixed in trunk-1.2: r37213 -->
+ </para>
+ <para>Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered
+ that a corrupted snoop file could crash Wireshark.
+ <!-- Fixed in trunk: r37068 -->
+ <!-- Fixed in trunk-1.4: r37252 -->
+ <!-- Fixed in trunk-1.2: r37213 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5912">Bug
+ 5912</ulink>)
+ </para>
+ <para>Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ David Maciejak of Fortinet's FortiGuard Labs discovered that
+ malformed compressed capture data could crash Wireshark.
+ <!-- Fixed in trunk: r37081 -->
+ <!-- Fixed in trunk-1.4: r37257 -->
+ <!-- Fixed in trunk-1.2: r37213 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5908">Bug
+ 5908</ulink>)
+ </para>
+ <para>Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered
+ that a corrupted Visual Networks file could crash Wireshark.
+ <!-- Fixed in trunk: r37128 -->
+ <!-- Fixed in trunk-1.4: r37258 -->
+ <!-- Fixed in trunk-1.2: r37213 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5934">Bug
+ 5934</ulink>)
+ </para>
+ <para>Versions affected: 1.2.0 to 1.2.16 and 1.4.0 to 1.4.6.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
+ </para>
+-->
+ </listitem>
+
+ </itemizedlist>
+
+ </para>
+
+ <para>
+
The following bugs have been fixed:
<itemizedlist>
@@ -45,9 +143,63 @@
-->
<listitem><para>
- Wireshark and TShark can crash while analyzing TCP packets.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5837">Bug
- 5837</ulink>)
+ AIM dissector has some endian issues.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5464">Bug
+ 5464</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Telephony→MTP3→MSUS doesn't display window.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5605">Bug
+ 5605</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Support for MS NetMon 3.x traces containing raw IPv6 ("Type 7") packets.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5817">Bug
+ 5817</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Service Indicator in M3UA protocol data.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5834">Bug
+ 5834</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ IEC60870-5-104 protocol, incorrect decoding of timestamp type CP56Time2a.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5889">Bug
+ 5889</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF _FDCTR_32NF _FDCTR_16NF.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5920">Bug
+ 5920</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ 3GPP QoS: Traffic class is not decoded properly.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5928">Bug
+ 5928</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Wireshark crashes when creating ProtoField.framenum in Lua.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5930">Bug
+ 5930</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Fix a wrong mask to extract FMID from DECT packets dissector.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5947">Bug
+ 5947</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ Incorrect DHCPv6 remote identifier option parsing.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962">Bug
+ 5962</ulink>)
</para></listitem>
</itemizedlist>
@@ -77,7 +229,10 @@
<!-- Sort alphabetically -->
-TCP
+DICOM,
+IEC104,
+M3UA,
+TCP,
</para>
</section>
@@ -85,7 +240,7 @@
<section id="NewCapture"><title>New and Updated Capture File Support</title>
<para>
-There is no new or updated capture file support in this release.
+Network Monitor.
</para>
</section>
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/diam_dict.c
^
|
| @@ -924,7 +924,7 @@
** diam_dict.h
** Diameter Dictionary Import Routines
**
- ** $Id: diam_dict.l 32783 2010-05-13 13:29:13Z morriss $
+ ** $Id: diam_dict.l 37221 2011-05-17 23:23:15Z gerald $
**
** (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
**
@@ -1510,9 +1510,6 @@
yyterminate();
}
- include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
-
-
for (e = ents.next; e; e = e->next) {
if (strcmp(e->name,DiamDicttext) == 0) {
DiamDictin = ddict_open(sys_dir,e->file);
@@ -1523,6 +1520,7 @@
yyterminate();
}
} else {
+ include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
DiamDict_switch_to_buffer(DiamDict_create_buffer(DiamDictin,YY_BUF_SIZE ) );
BEGIN LOADING;
}
@@ -1531,7 +1529,7 @@
}
if (!e) {
- fprintf(stderr, "Could not find entity: '%s'", e->name );
+ fprintf(stderr, "Could not find entity: '%s'\n", DiamDicttext );
yyterminate();
}
@@ -1565,7 +1563,7 @@
case YY_STATE_EOF(XMLPI_GETKEY):
case YY_STATE_EOF(XMLPI_GETVAL):
case YY_STATE_EOF(XMLPI_ENDATTR):
-#line 299 "diam_dict.l"
+#line 297 "diam_dict.l"
{
if (!DiamDictin) yyterminate();
@@ -1586,7 +1584,7 @@
case 29:
/* rule 29 can match eol */
YY_RULE_SETUP
-#line 317 "diam_dict.l"
+#line 315 "diam_dict.l"
{
*attr_str = strdup(DiamDicttext);
D(("%s\n",DiamDicttext));
@@ -1596,7 +1594,7 @@
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 324 "diam_dict.l"
+#line 322 "diam_dict.l"
{
*attr_uint = strtoul(DiamDicttext,NULL,10);
D(("%s\n",DiamDicttext););
@@ -1606,12 +1604,12 @@
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 331 "diam_dict.l"
+#line 329 "diam_dict.l"
{ yy_pop_state(); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 333 "diam_dict.l"
+#line 331 "diam_dict.l"
{
/* XXX: should go?*/
D(("{%s}",DiamDicttext));
@@ -1620,7 +1618,7 @@
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 338 "diam_dict.l"
+#line 336 "diam_dict.l"
{
D(("=>%s<=\n",DiamDicttext));
yy_pop_state();
@@ -1628,7 +1626,7 @@
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 343 "diam_dict.l"
+#line 341 "diam_dict.l"
{
D(("dictionary_start\n"));
@@ -1638,7 +1636,7 @@
case 35:
/* rule 35 can match eol */
YY_RULE_SETUP
-#line 349 "diam_dict.l"
+#line 347 "diam_dict.l"
{
D(("base_start\n"));
BEGIN IN_APPL;
@@ -1646,7 +1644,7 @@
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 354 "diam_dict.l"
+#line 352 "diam_dict.l"
{
D(("application_start\n"));
@@ -1663,32 +1661,32 @@
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 368 "diam_dict.l"
+#line 366 "diam_dict.l"
{ ATTR_STR(appl->name); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 369 "diam_dict.l"
+#line 367 "diam_dict.l"
{ ATTR_UINT(appl->code); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 371 "diam_dict.l"
+#line 369 "diam_dict.l"
BEGIN IN_APPL;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 372 "diam_dict.l"
+#line 370 "diam_dict.l"
BEGIN IN_DICT;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 374 "diam_dict.l"
+#line 372 "diam_dict.l"
;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 376 "diam_dict.l"
+#line 374 "diam_dict.l"
{
D(("command_start\n"));
@@ -1706,29 +1704,29 @@
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 391 "diam_dict.l"
+#line 389 "diam_dict.l"
{ ATTR_STR(cmd->name); }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 392 "diam_dict.l"
+#line 390 "diam_dict.l"
{ ATTR_STR(cmd->vendor); }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 393 "diam_dict.l"
+#line 391 "diam_dict.l"
{ ATTR_UINT(cmd->code); }
YY_BREAK
case 46:
-#line 395 "diam_dict.l"
+#line 393 "diam_dict.l"
case 47:
YY_RULE_SETUP
-#line 395 "diam_dict.l"
+#line 393 "diam_dict.l"
{ BEGIN IN_APPL; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 397 "diam_dict.l"
+#line 395 "diam_dict.l"
{
D(("vendor_start\n"));
@@ -1745,29 +1743,29 @@
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 411 "diam_dict.l"
+#line 409 "diam_dict.l"
{ ATTR_STR(vnd->desc); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 412 "diam_dict.l"
+#line 410 "diam_dict.l"
{ ATTR_STR(vnd->name); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 413 "diam_dict.l"
+#line 411 "diam_dict.l"
{ ATTR_UINT(vnd->code); }
YY_BREAK
case 52:
-#line 415 "diam_dict.l"
+#line 413 "diam_dict.l"
case 53:
YY_RULE_SETUP
-#line 415 "diam_dict.l"
+#line 413 "diam_dict.l"
{ BEGIN IN_APPL; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 417 "diam_dict.l"
+#line 415 "diam_dict.l"
{
D(("typedefn_start\n"));
@@ -1784,24 +1782,24 @@
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 431 "diam_dict.l"
+#line 429 "diam_dict.l"
{ ATTR_STR(typedefn->name); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 432 "diam_dict.l"
+#line 430 "diam_dict.l"
{ ATTR_STR(typedefn->parent); }
YY_BREAK
case 57:
-#line 434 "diam_dict.l"
+#line 432 "diam_dict.l"
case 58:
YY_RULE_SETUP
-#line 434 "diam_dict.l"
+#line 432 "diam_dict.l"
{ BEGIN IN_APPL; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 437 "diam_dict.l"
+#line 435 "diam_dict.l"
{
D(("avp_start\n"));
@@ -1823,57 +1821,57 @@
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 456 "diam_dict.l"
+#line 454 "diam_dict.l"
{ ATTR_STR(avp->name); }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 457 "diam_dict.l"
+#line 455 "diam_dict.l"
{ ATTR_STR(avp->description); }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 458 "diam_dict.l"
+#line 456 "diam_dict.l"
{ ATTR_STR(avp->vendor); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 459 "diam_dict.l"
+#line 457 "diam_dict.l"
{ ATTR_UINT(avp->code); }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 460 "diam_dict.l"
+#line 458 "diam_dict.l"
{ BEGIN IN_AVP; }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 461 "diam_dict.l"
+#line 459 "diam_dict.l"
{ BEGIN IN_APPL; }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 464 "diam_dict.l"
+#line 462 "diam_dict.l"
{ avp->type = strdup("Grouped"); };
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 465 "diam_dict.l"
+#line 463 "diam_dict.l"
;
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 467 "diam_dict.l"
+#line 465 "diam_dict.l"
{ BEGIN TYPE_ATTRS; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 468 "diam_dict.l"
+#line 466 "diam_dict.l"
{ ATTR_STR(avp->type); }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 470 "diam_dict.l"
+#line 468 "diam_dict.l"
{
D(("gavp_start\n"));
@@ -1890,12 +1888,12 @@
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 485 "diam_dict.l"
+#line 483 "diam_dict.l"
{ ATTR_STR(gavp->name); }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 488 "diam_dict.l"
+#line 486 "diam_dict.l"
{
D(("enum_start\n"));
@@ -1912,61 +1910,61 @@
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 503 "diam_dict.l"
+#line 501 "diam_dict.l"
{ ATTR_STR(enumitem->name); }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 504 "diam_dict.l"
+#line 502 "diam_dict.l"
{ ATTR_UINT(enumitem->code); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 506 "diam_dict.l"
+#line 504 "diam_dict.l"
{ BEGIN IN_AVP; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 507 "diam_dict.l"
+#line 505 "diam_dict.l"
{ BEGIN IN_AVP; }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 509 "diam_dict.l"
+#line 507 "diam_dict.l"
{ D(("avp_end")); BEGIN IN_APPL; }
YY_BREAK
case 78:
-#line 512 "diam_dict.l"
+#line 510 "diam_dict.l"
case 79:
YY_RULE_SETUP
-#line 512 "diam_dict.l"
+#line 510 "diam_dict.l"
{
BEGIN IN_DICT;
}
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 516 "diam_dict.l"
+#line 514 "diam_dict.l"
{
yyterminate();
}
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 520 "diam_dict.l"
+#line 518 "diam_dict.l"
IGNORE();
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 522 "diam_dict.l"
+#line 520 "diam_dict.l"
;
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 529 "diam_dict.l"
+#line 527 "diam_dict.l"
ECHO;
YY_BREAK
-#line 1970 "diam_dict.c"
+#line 1968 "diam_dict.c"
case YY_END_OF_BUFFER:
{
@@ -3004,7 +3002,7 @@
#define YYTABLES_NAME "yytables"
-#line 529 "diam_dict.l"
+#line 527 "diam_dict.l"
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/diam_dict.l
^
|
| @@ -26,7 +26,7 @@
** diam_dict.h
** Diameter Dictionary Import Routines
**
- ** $Id: diam_dict.l 32783 2010-05-13 13:29:13Z morriss $
+ ** $Id: diam_dict.l 37221 2011-05-17 23:23:15Z gerald $
**
** (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
**
@@ -269,9 +269,6 @@
yyterminate();
}
- include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
-
-
for (e = ents.next; e; e = e->next) {
if (strcmp(e->name,yytext) == 0) {
yyin = ddict_open(sys_dir,e->file);
@@ -282,6 +279,7 @@
yyterminate();
}
} else {
+ include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
BEGIN LOADING;
}
@@ -290,7 +288,7 @@
}
if (!e) {
- fprintf(stderr, "Could not find entity: '%s'", e->name );
+ fprintf(stderr, "Could not find entity: '%s'\n", yytext );
yyterminate();
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-6lowpan.c
^
|
| @@ -3,7 +3,7 @@
* By Owen Kirby <osk@exegin.com>
* Copyright 2009 Owen Kirby
*
- * $Id: packet-6lowpan.c 36036 2011-02-23 21:49:51Z gerald $
+ * $Id: packet-6lowpan.c 37443 2011-05-27 20:30:56Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2051,6 +2051,11 @@
return NULL;
}
+ /* Check call to dissect_6lowpan_xxx was successful */
+ if (frag_tvb == NULL) {
+ return NULL;
+ }
+
/* Add this datagram to the fragment table. */
frag_size = tvb_length(frag_tvb);
tvb_set_reported_length(frag_tvb, frag_size);
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-aim-messaging.c
^
|
| @@ -4,7 +4,7 @@
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
* Copyright 2004, Devin Heitmueller <dheitmueller@netilla.com>
*
- * $Id: packet-aim-messaging.c 32367 2010-04-03 21:55:23Z wmeier $
+ * $Id: packet-aim-messaging.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -29,12 +29,11 @@
# include "config.h"
#endif
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
#include <glib.h>
+#include <string.h>
+
#include <epan/packet.h>
#include <epan/strutil.h>
@@ -303,10 +302,10 @@
{
int offset = 0;
proto_tree *entry = proto_item_add_subtree(ti, ett_aim_rendezvous_data);
- proto_tree_add_item(entry, hf_aim_rendezvous_msg_type, tvb, offset, 2, FALSE);
+ proto_tree_add_item(entry, hf_aim_rendezvous_msg_type, tvb, offset, 2, ENC_BIG_ENDIAN);
offset+=2;
- proto_tree_add_item(entry, hf_aim_icbm_cookie, tvb, offset, 8, FALSE);
+ proto_tree_add_item(entry, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
offset += 8;
offset = dissect_aim_capability(entry, tvb, offset);
@@ -325,13 +324,13 @@
int buddyname_length;
/* ICBM Cookie */
- proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, FALSE);
+ proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
offset += 8;
/* Message Channel ID */
channel_id = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(msg_tree, hf_aim_message_channel_id, tvb, offset, 2,
- FALSE);
+ ENC_BIG_ENDIAN);
offset += 2;
/* Add the outgoing username to the info column */
@@ -360,12 +359,12 @@
guint16 channel_id;
/* ICBM Cookie */
- proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, FALSE);
+ proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
offset += 8;
/* Message Channel ID */
proto_tree_add_item(msg_tree, hf_aim_message_channel_id, tvb, offset, 2,
- FALSE);
+ ENC_BIG_ENDIAN);
channel_id = tvb_get_ntohs(tvb, offset);
offset += 2;
@@ -384,12 +383,12 @@
dissect_aim_msg_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *msg_tree)
{
int offset = 0;
- proto_tree_add_item(msg_tree, hf_aim_icbm_channel, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_icbm_msg_flags, tvb, offset, 4, tvb_get_ntoh24(tvb, offset)); offset+=4;
- proto_tree_add_item(msg_tree, hf_aim_icbm_max_snac_size, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_icbm_max_sender_warnlevel, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_icbm_max_receiver_warnlevel, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_icbm_min_msg_interval, tvb, offset, 4, tvb_get_ntohl(tvb, offset)); offset+=4;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_channel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_msg_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_max_snac_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_max_sender_warnlevel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_max_receiver_warnlevel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_min_msg_interval, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4;
return offset;
}
@@ -397,7 +396,7 @@
dissect_aim_msg_evil_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
{
int offset = 0;
- proto_tree_add_item(msg_tree, hf_aim_icbm_evil, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_evil, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
return dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
}
@@ -406,8 +405,8 @@
dissect_aim_msg_evil_repl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *msg_tree)
{
int offset = 0;
- proto_tree_add_item(msg_tree, hf_aim_evil_warn_level, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_evil_new_warn_level, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_evil_warn_level, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_evil_new_warn_level, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
return offset;
}
@@ -415,10 +414,10 @@
dissect_aim_msg_minityping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
{
int offset = 0;
- proto_tree_add_item(msg_tree,hf_aim_icbm_notification_cookie, tvb, offset, 8, FALSE); offset+=8;
- proto_tree_add_item(msg_tree,hf_aim_icbm_notification_channel, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_notification_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_notification_channel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
- proto_tree_add_item(msg_tree,hf_aim_icbm_notification_type, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_notification_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
return offset;
}
@@ -485,15 +484,16 @@
static int
dissect_aim_rendezvous_extended_message(tvbuff_t *tvb, proto_tree *msg_tree)
{
- guint8 message_type, message_flags;
+ guint8 /*message_type,*/message_flags;
int offset = 0;
proto_item *ti_flags;
proto_tree *flags_entry;
guint16 text_length;
guint8* text;
- message_type = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_type, tvb, offset, 1, FALSE); offset+=1;
+ /* TODO: parse and present message_type */
+ /* message_type = tvb_get_guint8(tvb, offset); */
+ proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1;
message_flags = tvb_get_guint8(tvb, offset);
ti_flags = proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_flags, tvb, offset, 1, message_flags);
flags_entry = proto_item_add_subtree(ti_flags, ett_aim_extended_data_message_flags);
@@ -501,10 +501,10 @@
proto_tree_add_boolean(flags_entry, hf_aim_rendezvous_extended_data_message_flags_auto, tvb, offset, 1, message_flags);
proto_tree_add_boolean(flags_entry, hf_aim_rendezvous_extended_data_message_flags_multi, tvb, offset, 1, message_flags);
offset+=1;
- proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_status_code, tvb, offset, 2, TRUE); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_priority_code, tvb, offset, 2, TRUE); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_status_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_priority_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
text_length = tvb_get_letohs(tvb, offset);
- proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_text_length, tvb, offset, 2, TRUE); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_text_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
text = tvb_get_ephemeral_string(tvb, offset, text_length);
proto_tree_add_text(msg_tree, tvb, offset, text_length, "Text: %s", text); offset+=text_length;
offset = tvb->length;
@@ -532,7 +532,7 @@
dissect_aim_tlv_value_extended_data(proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb, packet_info *pinfo _U_)
{
int offset = 0;
- guint16 length, protocol_version;
+ guint16 length/*, protocol_version*/;
int start_offset;
proto_tree *entry;
e_uuid_t plugin_uuid;
@@ -541,12 +541,13 @@
length = tvb_get_letohs(tvb, offset);
proto_tree_add_text(entry, tvb, offset, 2, "Length: %d", length); offset+=2;
start_offset = offset;
- protocol_version = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(entry, hf_aim_icbm_client_err_protocol_version, tvb, offset, 2, TRUE); offset+=2;
+ /* TODO: parse and present protocol version */
+ /* protocol_version = tvb_get_ntohs(tvb, offset); */
+ proto_tree_add_item(entry, hf_aim_icbm_client_err_protocol_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
offset = dissect_aim_plugin(entry, tvb, offset, &plugin_uuid);
proto_tree_add_text(entry, tvb, offset, 2, "Unknown"); offset += 2;
- proto_tree_add_item(entry, hf_aim_icbm_client_err_client_caps_flags, tvb, offset, 4, TRUE); offset+=4;
+ proto_tree_add_item(entry, hf_aim_icbm_client_err_client_caps_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4;
proto_tree_add_text(entry, tvb, offset, 1, "Unknown"); offset += 1;
proto_tree_add_text(entry, tvb, offset, 2, "Downcounter?"); offset += 2;
@@ -580,10 +581,10 @@
{
int offset = 0;
- proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, FALSE); offset+=8;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
proto_tree_add_item(msg_tree, hf_aim_message_channel_id, tvb, offset, 2,
- FALSE); offset += 2;
+ ENC_BIG_ENDIAN); offset += 2;
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
@@ -596,20 +597,20 @@
int offset = 0;
guint16 channel, reason;
- proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, FALSE); offset+=8;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
channel = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(msg_tree,hf_aim_icbm_channel, tvb, offset, 2, FALSE); offset+=2;
+ proto_tree_add_item(msg_tree,hf_aim_icbm_channel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
reason = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(msg_tree, hf_aim_icbm_client_err_reason, tvb, offset, 2, FALSE); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_client_err_reason, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
if (reason == CLIENT_ERR__REASON_CHANNEL_SPECIFIC && tvb_length_remaining(tvb, offset) > 0)
{
switch (channel)
{
case ICBM_CHANNEL_RENDEZVOUS:
- proto_tree_add_item(msg_tree, hf_aim_icbm_rendezvous_nak_length, tvb, offset, 2, FALSE); offset+=2;
- proto_tree_add_item(msg_tree, hf_aim_icbm_rendezvous_nak, tvb, offset, 2, FALSE); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_rendezvous_nak_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
+ proto_tree_add_item(msg_tree, hf_aim_icbm_rendezvous_nak, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
break;
default:
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-dcm.c
^
|
| @@ -7,7 +7,7 @@
* http://medical.nema.org/dicom/2008
* DICOM Part 8: Network Communication Support for Message Exchange
*
- * $Id: packet-dcm.c 36056 2011-02-24 22:12:02Z jake $
+ * $Id: packet-dcm.c 37222 2011-05-17 23:29:38Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -6542,6 +6542,7 @@
/* Process all PDUs in the buffer */
while (pdu_start < tlen) {
+ guint32 old_pdu_start;
if ((pdu_len+6) > (tlen-offset)) {
@@ -6562,7 +6563,13 @@
offset=dissect_dcm_pdu(tvb, pinfo, tree, pdu_start);
/* Next PDU */
+ old_pdu_start = pdu_start;
pdu_start = pdu_start + pdu_len + 6;
+ if (pdu_start <= old_pdu_start) {
+ expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR,
+ "Invalid PDU length (%u)", pdu_len);
+ THROW(ReportedBoundsError);
+ }
if (pdu_start < tlen - 6) {
/* we got at least 6 bytes of the next PDU still in the buffer */
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-dect.c
^
|
| @@ -3,7 +3,7 @@
* Dissector for the Digital Enhanced Cordless Telecommunications
* protocol.
*
- * $Id: packet-dect.c 36644 2011-04-14 17:17:08Z gerald $
+ * $Id: packet-dect.c 37443 2011-05-27 20:30:56Z gerald $
*
* Copyright 2008-2009:
* - Andreas Schuler <andreas (A) schulerdev.de>
@@ -2400,7 +2400,7 @@
{ &hf_dect_A_Tail_Mt_Mh_fmid,
{"Mh/FMID", "dect.afield.tail.Mt.Mh.fmid", FT_UINT16, BASE_HEX, NULL,
- 0x0FF0, NULL, HFILL}},
+ 0xFFF0, NULL, HFILL}},
{ &hf_dect_A_Tail_Mt_Mh_pmid,
{"Mh/PMID", "dect.afield.tail.Mt.Mh.pmid", FT_UINT24, BASE_HEX, NULL,
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-dhcpv6.c
^
|
| @@ -6,7 +6,7 @@
* SHIRASAKI Yasuhiro <yasuhiro@gnome.gr.jp>
* Tony Lindstrom <tony.lindstrom@ericsson.com>
*
- * $Id: packet-dhcpv6.c 36056 2011-02-24 22:12:02Z jake $
+ * $Id: packet-dhcpv6.c 37443 2011-05-27 20:30:56Z gerald $
*
* The information used comes from:
* RFC3315.txt (DHCPv6)
@@ -1593,9 +1593,8 @@
}
proto_tree_add_item(subtree, hf_remoteid_enterprise, tvb, off, 4, FALSE);
off += 4;
- optlen -= 4;
- buf = tvb_bytes_to_str(tvb, off, optlen);
- proto_tree_add_text(subtree, tvb, off, optlen, "Remote-ID: %s", buf);
+ buf = tvb_bytes_to_str(tvb, off, optlen - 4);
+ proto_tree_add_text(subtree, tvb, off, optlen - 4, "Remote-ID: %s", buf);
break;
case OPTION_SUBSCRIBER_ID:
if (optlen == 0) {
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-dnp.c
^
|
| @@ -7,7 +7,7 @@
*
* Major updates: tcp and application layer defragmentation, more object dissections by Graham Bloice
*
- * $Id: packet-dnp.c 32913 2010-05-21 06:33:25Z guy $
+ * $Id: packet-dnp.c 37256 2011-05-18 19:32:19Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -335,9 +335,9 @@
#define AL_OBJ_FDCTR_32T 0x1507 /* 21 07 32-Bit Frozen Delta Counter w/ Time of Freeze */
#define AL_OBJ_FDCTR_16T 0x1508 /* 21 08 16-Bit Frozen Delta Counter w/ Time of Freeze */
#define AL_OBJ_FCTR_32NF 0x1509 /* 21 09 32-Bit Frozen Counter Without Flag */
-#define AL_OBJ_FCTR_16NF 0x1510 /* 21 10 16-Bit Frozen Counter Without Flag */
-#define AL_OBJ_FDCTR_32NF 0x1511 /* 21 11 32-Bit Frozen Delta Counter Without Flag */
-#define AL_OBJ_FDCTR_16NF 0x1512 /* 21 12 16-Bit Frozen Delta Counter Without Flag */
+#define AL_OBJ_FCTR_16NF 0x150A /* 21 10 16-Bit Frozen Counter Without Flag */
+#define AL_OBJ_FDCTR_32NF 0x150B /* 21 11 32-Bit Frozen Delta Counter Without Flag */
+#define AL_OBJ_FDCTR_16NF 0x150C /* 21 12 16-Bit Frozen Delta Counter Without Flag */
#define AL_OBJ_CTRC_ALL 0x1600 /* 22 00 Counter Change Event Default Variation */
#define AL_OBJ_CTRC_32 0x1601 /* 22 01 32-Bit Counter Change Event w/o Time */
#define AL_OBJ_CTRC_16 0x1602 /* 22 02 16-Bit Counter Change Event w/o Time */
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-gsm_a_gm.c
^
|
| @@ -35,7 +35,7 @@
* Stage 3
* (3GPP TS 24.008 version 8.6.0 Release 8)
*
- * $Id: packet-gsm_a_gm.c 36057 2011-02-24 23:10:30Z gerald $
+ * $Id: packet-gsm_a_gm.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -5791,12 +5791,12 @@
},
{ &hf_gsm_a_qos_del_order,
{ "Delivery order", "gsm_a.qos.del_order",
- FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traffic_cls_vals), 0x18,
+ FT_UINT8, BASE_DEC, VALS(gsm_a_qos_del_order_vals), 0x18,
NULL, HFILL }
},
{ &hf_gsm_a_qos_del_of_err_sdu,
{ "Delivery of erroneous SDUs", "gsm_a.qos.del_of_err_sdu",
- FT_UINT8, BASE_DEC, VALS(gsm_a_qos_del_of_err_sdu_vals), 0x03,
+ FT_UINT8, BASE_DEC, VALS(gsm_a_qos_del_of_err_sdu_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_qos_ber,
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-iec104.c
^
|
| @@ -2,7 +2,7 @@
* Routines for IEC-60870-5-104 (iec104) Protocol disassembly
*
*
- * $Id: packet-iec104.c 33988 2010-08-29 04:11:06Z gerald $
+ * $Id: packet-iec104.c 37251 2011-05-18 18:21:32Z gerald $
*
* Copyright (c) 2008 by Joan Ramio <joan@ramio.cat>
* Joan is a masculine catalan name. Search the Internet for Joan Pujol (alias Garbo).
@@ -495,8 +495,8 @@
guint16 ms;
ms = tvb_get_letohs( tvb , *offset );
(*offset) += 2;
- cp56t->cp56t_s = (int)floor(ms/1000);
- cp56t->cp56t_ms = (int)(ms-(cp56t->cp56t_s*1000));
+ cp56t->cp56t_s = ms / 1000;
+ cp56t->cp56t_ms = ms % 1000;
cp56t->cp56t_min = tvb_get_guint8(tvb, *offset);
/* "Invalid" -- Todo: test */
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-m3ua.c
^
|
| @@ -8,7 +8,7 @@
*
* Copyright 2000, 2001, 2002, 2003, 2004 Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-m3ua.c 32929 2010-05-24 06:06:17Z guy $
+ * $Id: packet-m3ua.c 37221 2011-05-17 23:23:15Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2037,7 +2037,7 @@
{ &hf_protocol_data_mtp3_opc, { "OPC", "mtp3.opc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_protocol_data_mtp3_dpc, { "DPC", "mtp3.dpc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_protocol_data_mtp3_pc, { "PC", "mtp3.pc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
- { &hf_protocol_data_si, { "SI", "m3ua.protocol_data_si", FT_UINT8, BASE_DEC, VALS(user_identity_values), 0x0, NULL, HFILL } },
+ { &hf_protocol_data_si, { "SI", "m3ua.protocol_data_si", FT_UINT8, BASE_DEC, VALS(mtp3_service_indicator_code_short_vals), 0x0, "Service Indicator", HFILL } },
{ &hf_protocol_data_ni, { "NI", "m3ua.protocol_data_ni", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_protocol_data_mtp3_ni, { "NI", "mtp3.ni", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_protocol_data_mp, { "MP", "m3ua.protocol_data_mp", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-netflow.c
^
|
| @@ -1,7 +1,7 @@
/*
** packet-netflow.c
**
- ** $Id: packet-netflow.c 36058 2011-02-24 23:52:22Z gerald $
+ ** $Id: packet-netflow.c 37013 2011-05-06 23:11:15Z gerald $
**
** (c) 2002 bill fumerola <fumerola@yahoo-inc.com>
** (C) 2005-06 Luca Deri <deri@ntop.org>
@@ -329,7 +329,6 @@
static int hf_cflow_if_name = -1;
static int hf_cflow_if_descr = -1;
static int hf_cflow_sampler_name = -1;
-static int hf_cflow_forwarding_status_code = -1;
static int hf_cflow_forwarding_status = -1;
static int hf_cflow_forwarding_code = -1;
static int hf_cflow_nbar_appl_desc = -1;
@@ -1479,7 +1478,7 @@
int cmd_len;
gchar * cmd_str = NULL;
guint16 got_flags = 0;
-
+
gboolean vstr_long;
int vstr_len;
@@ -1487,8 +1486,8 @@
const guint8 *reftime;
guint16 count = ipfix_scope_flag ? tplt->count_scopes : tplt->count;
struct v9_template_entry *entries = ipfix_scope_flag ? tplt->scopes : tplt->entries;
- proto_tree * fwdstattree = 0;
-
+ proto_tree * fwdstattree = 0;
+
if (entries == NULL) {
/* I don't think we can actually hit this condition.
If we can, what would cause it? Does this need a
@@ -2137,8 +2136,7 @@
/* Forwarding status is encoded on 1 byte with
* the 2 left bits giving the status and the 6
* remaining bits giving the reason code. */
- ti = proto_tree_add_item(pdutree, hf_cflow_forwarding_status_code,
- tvb, offset, length, FALSE);
+ ti = proto_tree_add_text(pdutree, tvb, offset, length, "Forwarding Status");
fwdstattree = proto_item_add_subtree(ti, ett_fwdstat);
proto_tree_add_item(fwdstattree, hf_cflow_forwarding_status,
tvb, offset, length, FALSE);
@@ -3263,7 +3261,7 @@
proto_tree_add_item(pdutree, hf_cflow_aaa_username,
tvb, offset, length, FALSE);
break;
-
+
/* CACE Technologies */
case VENDOR_CACE << 16 | 0: /* caceLocalIPv4Address */
ti = proto_tree_add_item(pdutree, hf_pie_cace_local_ipv4_address,
@@ -3494,7 +3492,7 @@
tplt.scopes = se_alloc0(option_scope_len * sizeof(struct v9_template_entry));
tplt.entries = se_alloc0(option_len * sizeof(struct v9_template_entry));
}
-
+
for(i=0, len = 0;
flowset_id == 1 ? len < option_scope_len : i < tplt.count_scopes;
i++) {
@@ -3969,9 +3967,9 @@
/* Cisco ASA5500 Series NetFlow */
{ 33000, "INGRESS_ACL_ID" },
{ 33001, "EGRESS_ACL_ID" },
- { 33002, "FW_EXT_EVENT" },
+ { 33002, "FW_EXT_EVENT" },
{ 40000, "AAA_USERNAME" },
- { 40001, "XLATE_SRC_ADDR_IPV4" },
+ { 40001, "XLATE_SRC_ADDR_IPV4" },
{ 40002, "XLATE_DST_ADDR_IPV4" },
{ 40003, "XLATE_SRC_PORT" },
{ 40004, "XLATE_DST_PORT" },
@@ -4012,7 +4010,7 @@
{ 3, "Consume"}, /* Observed on 7200 12.4(9)T */
{ 0, NULL }
};
-static const value_string v9_forwarding_status_code[] = {
+static const value_string v9_forwarding_status_code[] = {
{ 64, "Forwarded (Unknown)" },
{ 65, "Forwarded Fragmented" },
{ 66, "Forwarded not Fragmented" },
@@ -4052,7 +4050,7 @@
{ 1001, "Flow denied by an ingress ACL"},
{ 1002, "Flow denied by an egress ACL"},
{ 1003, "Flow denied by security appliance"},
- { 1004, "Flow denied (TCP flow beginning with not TCP SYN)"},
+ { 1004, "Flow denied (TCP flow beginning with not TCP SYN)"},
{ 0, NULL }
};
static const value_string engine_type[] = {
@@ -4067,7 +4065,7 @@
{ 2, "Active timeout" },
{ 3, "End of Flow detected" },
{ 4, "Forced end" },
- { 5, "Lack of resources" },
+ { 5, "Lack of resources" },
{ 0, NULL }
};
static const value_string v9_biflow_direction[] = {
@@ -4086,7 +4084,7 @@
{ 5, "Property match Filtering"},
{ 6, "Hash based Filtering using BOB"},
{ 7, " Hash based Filtering using IPSX"},
- { 8, "Hash based Filtering using CRC"},
+ { 8, "Hash based Filtering using CRC"},
{ 0, NULL }
};
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-ntlmssp.c
^
|
| @@ -5,7 +5,7 @@
* Devin Heitmueller <dheitmueller@netilla.com>
* Copyright 2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-ntlmssp.c 35660 2011-01-26 17:02:28Z wmeier $
+ * $Id: packet-ntlmssp.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1311,8 +1311,10 @@
data_start = MIN(data_start, item_start);
data_end = MAX(data_end, item_end);
- /* If there are more bytes before the data block dissect a version field */
+ /* If there are more bytes before the data block dissect a version field
+ if NTLMSSP_NEGOTIATE_VERSION is set in the flags (see MS-NLMP) */
if (offset < data_start) {
+ if (negotiate_flags & NTLMSSP_NEGOTIATE_VERSION)
offset = dissect_ntlmssp_version(tvb, offset, ntlmssp_tree);
}
return data_end;
@@ -1570,8 +1572,10 @@
data_end = MAX(data_end, item_end);
}
- /* If there are more bytes before the data block dissect a version field */
+ /* If there are more bytes before the data block dissect a version field
+ if NTLMSSP_NEGOTIATE_VERSION is set in the flags (see MS-NLMP) */
if (offset < data_start) {
+ if (negotiate_flags & NTLMSSP_NEGOTIATE_VERSION)
offset = dissect_ntlmssp_version(tvb, offset, ntlmssp_tree);
}
@@ -1774,10 +1778,13 @@
if ((conv_ntlmssp_info != NULL) && (conv_ntlmssp_info->flags == 0)) {
conv_ntlmssp_info->flags = negotiate_flags;
}
- }
+ } else
+ negotiate_flags = 0;
- /* If there are more bytes before the data block dissect a version field */
+ /* If there are more bytes before the data block dissect a version field
+ if NTLMSSP_NEGOTIATE_VERSION is set in the flags (see MS-NLMP) */
if (offset < data_start) {
+ if (negotiate_flags & NTLMSSP_NEGOTIATE_VERSION)
offset = dissect_ntlmssp_version(tvb, offset, ntlmssp_tree);
}
@@ -2737,7 +2744,7 @@
{ &hf_ntlmssp_version_minor,
{ "Minor Version", "ntlmssp.version.minor", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_ntlmssp_version_build_number,
- { "Major Version", "ntlmssp.version.build_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+ { "Build Number", "ntlmssp.version.build_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_ntlmssp_version_ntlm_current_revision,
{ "NTLM Current Revision", "ntlmssp.version.ntlm_current_revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_ntlmssp_address_list,
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-smb.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c 33755 2010-08-10 07:47:19Z guy $
+ * $Id: packet-smb.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -11586,7 +11586,7 @@
dissect_qfi_SMB_FILE_POSITION_INFO(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
int offset, guint16 *bcp, gboolean *trunc)
{
- /* file id */
+ /* file position */
CHECK_BYTE_COUNT_SUBR(8);
proto_tree_add_item(tree, hf_smb_position, tvb, offset, 8, TRUE);
COUNT_BYTES_SUBR(8);
@@ -11662,7 +11662,7 @@
dissect_qfi_SMB_FILE_ENDOFFILE_INFO(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
int offset, guint16 *bcp, gboolean *trunc)
{
- /* end of file */
+ /* offset of end of file */
CHECK_BYTE_COUNT_SUBR(8);
proto_tree_add_item(tree, hf_smb_end_of_file, tvb, offset, 8, TRUE);
COUNT_BYTES_SUBR(8);
@@ -12029,7 +12029,7 @@
/* unix ACL
*/
static int
-dissect_qpi_unix_acl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_qspi_unix_acl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
int offset, guint16 *bcp, gboolean *trunc)
{
guint16 version, num_file_aces, num_def_aces;
@@ -12137,7 +12137,7 @@
}
static int
-dissect_qpi_unix_xattr(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
+dissect_qspi_unix_xattr(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
int offset _U_, guint16 *bcp _U_, gboolean *trunc _U_)
{
proto_tree_add_text(tree, tvb, offset, 0, "Not Implemented yet");
@@ -12146,7 +12146,7 @@
}
static int
-dissect_qpi_unix_attr_flags(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
+dissect_qspi_unix_attr_flags(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
int offset _U_, guint16 *bcp _U_, gboolean *trunc _U_)
{
proto_tree_add_text(tree, tvb, offset, 0, "Not Implemented yet");
@@ -12164,7 +12164,7 @@
}
static int
-dissect_qpi_unix_lock(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
+dissect_qspi_unix_lock(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
int offset _U_, guint16 *bcp _U_, gboolean *trunc _U_)
{
proto_tree_add_text(tree, tvb, offset, 0, "Not Implemented yet");
@@ -12173,7 +12173,7 @@
}
static int
-dissect_qpi_unix_open(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
+dissect_qspi_unix_open(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
int offset _U_, guint16 *bcp _U_, gboolean *trunc _U_)
{
proto_tree_add_text(tree, tvb, offset, 0, "Not Implemented yet");
@@ -12182,7 +12182,7 @@
}
static int
-dissect_qpi_unix_unlink(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
+dissect_qspi_unix_unlink(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_,
int offset _U_, guint16 *bcp _U_, gboolean *trunc _U_)
{
proto_tree_add_text(tree, tvb, offset, 0, "Not Implemented yet");
@@ -12499,15 +12499,15 @@
/* XXX add this from the SNIA doc */
break;
case 0x0204: /* Query File Unix ACL*/
- offset = dissect_qpi_unix_acl(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_acl(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0205: /* Query File Unix XATTR*/
- offset = dissect_qpi_unix_xattr(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_xattr(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0206: /* Query File Unix Attr Flags*/
- offset = dissect_qpi_unix_attr_flags(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_attr_flags(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0207: /* Query File Unix Permissions*/
@@ -12515,7 +12515,7 @@
&trunc);
break;
case 0x0208: /* Query File Unix Lock*/
- offset = dissect_qpi_unix_lock(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_lock(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
}
@@ -12582,27 +12582,27 @@
&trunc);
break;
case 0x0204: /* Set File Unix ACL*/
- offset = dissect_qpi_unix_acl(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_acl(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0205: /* Set File Unix XATTR*/
- offset = dissect_qpi_unix_xattr(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_xattr(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0206: /* Set File Unix Attr Flags*/
- offset = dissect_qpi_unix_attr_flags(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_attr_flags(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0208: /* Set File Unix Lock*/
- offset = dissect_qpi_unix_lock(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_lock(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x0209: /* Set File Unix Open*/
- offset = dissect_qpi_unix_open(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_open(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 0x020a: /* Set File Unix Unlink*/
- offset = dissect_qpi_unix_unlink(tvb, pinfo, tree, offset, bcp,
+ offset = dissect_qspi_unix_unlink(tvb, pinfo, tree, offset, bcp,
&trunc);
break;
case 1010: /* Set File Rename */
@@ -15381,37 +15381,50 @@
col_append_str(pinfo->cinfo, COL_INFO, "<unknown>");
} else {
proto_tree_add_uint(tree, hf_smb_trans2_subcmd, tvb, 0, 0, t2i->subcmd);
- /* FIND_FIRST2 */
- if(t2i && t2i->subcmd==0x0001){
+ switch (t2i->subcmd) {
+
+ case 0x0001: /* FIND_FIRST2 */
+ if (t2i->info_level == -1)
+ item=proto_tree_add_text(tree, tvb, 0, 0, "Level of Information: <UNKNOWN> since information level wasn't found in request packet");
+ else
item=proto_tree_add_uint(tree, hf_smb_ff2_information_level, tvb, 0, 0, t2i->info_level);
PROTO_ITEM_SET_GENERATED(item);
if(t2i->name){
item=proto_tree_add_string(tree, hf_smb_search_pattern, tvb, 0, 0, t2i->name);
PROTO_ITEM_SET_GENERATED(item);
}
- }
+ break;
- /* QUERY_PATH_INFORMATION */
- if(t2i && t2i->subcmd==0x0005){
+ case 0x0005: /* QUERY_PATH_INFORMATION */
+ if (t2i->info_level == -1)
+ item=proto_tree_add_text(tree, tvb, 0, 0, "Level of Information: <UNKNOWN> since information level wasn't found in request packet");
+ else
item=proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, 0, 0, t2i->info_level);
PROTO_ITEM_SET_GENERATED(item);
if(t2i->name){
item=proto_tree_add_string(tree, hf_smb_file_name, tvb, 0, 0, t2i->name);
PROTO_ITEM_SET_GENERATED(item);
}
- }
- /* QUERY_FILE_INFORMATION */
- if(t2i && t2i->subcmd==0x0007){
+ break;
+
+ case 0x0007: /* QUERY_FILE_INFORMATION */
+ if (t2i->info_level == -1)
+ item=proto_tree_add_text(tree, tvb, 0, 0, "Level of Information: <UNKNOWN> since information level wasn't found in request packet");
+ else
item=proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, 0, 0, t2i->info_level);
PROTO_ITEM_SET_GENERATED(item);
- }
- /* QUERY_FS_INFORMATION */
- if(t2i && t2i->subcmd==0x0003){
+ break;
+
+ case 0x0003: /* QUERY_FS_INFORMATION */
+ if (t2i->info_level == -1)
+ item=proto_tree_add_text(tree, tvb, 0, 0, "Level of Information: <UNKNOWN> since information level wasn't found in request packet");
+ else
item=proto_tree_add_uint(tree, hf_smb_qfsi_information_level, tvb, 0, 0, si->info_level);
PROTO_ITEM_SET_GENERATED(item);
+ break;
}
- if (t2i && check_col(pinfo->cinfo, COL_INFO)) {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str(t2i->subcmd,
trans2_cmd_vals,
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-ssl.c
^
|
| @@ -2,7 +2,7 @@
* Routines for ssl dissection
* Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
*
- * $Id: packet-ssl.c 35416 2011-01-07 01:31:01Z gerald $
+ * $Id: packet-ssl.c 37221 2011-05-17 23:23:15Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -811,18 +811,42 @@
*/
deseg_offset = offset;
- /* find the most previous PDU starting before this sequence number */
+ /* If we've seen this segment before (e.g., it's a retransmission),
+ * there's nothing for us to do. Certainly, don't add it to the list
+ * of multisegment_pdus (that would cause subsequent lookups to find
+ * the retransmission instead of the original transmission, breaking
+ * dissection of the desegmented pdu if we'd already seen the end of
+ * the pdu).
+ */
+ if ((msp = se_tree_lookup32(flow->multisegment_pdus, seq))) {
+ const char* str;
+
+ if (msp->first_frame == PINFO_FD_NUM(pinfo)) {
+ str = "";
+ col_set_str(pinfo->cinfo, COL_INFO, "[SSL segment of a reassembled PDU]");
+ } else {
+ str = "Retransmitted ";
+ }
+
+ nbytes = tvb_reported_length_remaining(tvb, offset);
+ proto_tree_add_text(tree, tvb, offset, nbytes,
+ "%sSSL segment data (%u byte%s)",
+ str, nbytes, plurality(nbytes, "", "s"));
+ return;
+ }
+
+ /* Else, find the most previous PDU starting before this sequence number */
msp=se_tree_lookup32_le(flow->multisegment_pdus, seq-1);
if(msp && msp->seq<=seq && msp->nxtpdu>seq){
int len;
- if(!pinfo->fd->flags.visited){
+ if (!PINFO_FD_VISITED(pinfo)) {
msp->last_frame=pinfo->fd->num;
msp->last_frame_time=pinfo->fd->abs_ts;
}
/* OK, this PDU was found, which means the segment continues
- a higher-level PDU and that we must desegment it.
+ * a higher-level PDU and that we must desegment it.
*/
if(msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT){
/* The dissector asked for the entire segment */
@@ -832,10 +856,8 @@
}
ipfd_head = fragment_add(tvb, offset, pinfo, msp->first_frame,
- ssl_fragment_table,
- seq - msp->seq,
- len,
- (LT_SEQ (nxtseq,msp->nxtpdu)) );
+ ssl_fragment_table, seq - msp->seq,
+ len, (LT_SEQ (nxtseq,msp->nxtpdu)));
if(msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT){
msp->flags&=(~MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT);
@@ -858,20 +880,20 @@
}
} else {
/* This segment was not found in our table, so it doesn't
- contain a continuation of a higher-level PDU.
- Call the normal subdissector.
+ * contain a continuation of a higher-level PDU.
+ * Call the normal subdissector.
*/
process_ssl_payload(tvb, offset, pinfo, tree, association);
called_dissector = TRUE;
/* Did the subdissector ask us to desegment some more data
- before it could handle the packet?
- If so we have to create some structures in our table but
- this is something we only do the first time we see this
- packet.
+ * before it could handle the packet?
+ * If so we have to create some structures in our table but
+ * this is something we only do the first time we see this
+ * packet.
*/
if(pinfo->desegment_len) {
- if (!pinfo->fd->flags.visited)
+ if (!PINFO_FD_VISITED(pinfo))
must_desegment = TRUE;
/*
@@ -883,9 +905,9 @@
}
/* Either no desegmentation is necessary, or this is
- segment contains the beginning but not the end of
- a higher-level PDU and thus isn't completely
- desegmented.
+ * segment contains the beginning but not the end of
+ * a higher-level PDU and thus isn't completely
+ * desegmented.
*/
ipfd_head = NULL;
}
@@ -910,7 +932,8 @@
/* create a new TVB structure for desegmented data */
next_tvb = tvb_new_child_real_data(tvb, ipfd_head->data,
- ipfd_head->datalen, ipfd_head->datalen);
+ ipfd_head->datalen,
+ ipfd_head->datalen);
/* add desegmented data to the data source list */
add_new_data_source(pinfo, next_tvb, "Reassembled SSL");
@@ -925,8 +948,7 @@
* data?
*/
old_len=(int)(tvb_reported_length(next_tvb)-tvb_reported_length_remaining(tvb, offset));
- if(pinfo->desegment_len &&
- pinfo->desegment_offset<=old_len){
+ if(pinfo->desegment_len && pinfo->desegment_offset <= old_len) {
/*
* "desegment_len" isn't 0, so it needs more
* data for something - and "desegment_offset"
@@ -966,8 +988,7 @@
* Show the stuff in this TCP segment as
* just raw TCP segment data.
*/
- nbytes =
- tvb_reported_length_remaining(tvb, offset);
+ nbytes = tvb_reported_length_remaining(tvb, offset);
proto_tree_add_text(tree, tvb, offset, -1,
"SSL segment data (%u byte%s)", nbytes,
plurality(nbytes, "", "s"));
@@ -991,55 +1012,54 @@
}
/* Did the subdissector ask us to desegment
- some more data? This means that the data
- at the beginning of this segment completed
- a higher-level PDU, but the data at the
- end of this segment started a higher-level
- PDU but didn't complete it.
-
- If so, we have to create some structures
- in our table, but this is something we
- only do the first time we see this packet.
+ * some more data? This means that the data
+ * at the beginning of this segment completed
+ * a higher-level PDU, but the data at the
+ * end of this segment started a higher-level
+ * PDU but didn't complete it.
+ *
+ * If so, we have to create some structures
+ * in our table, but this is something we
+ * only do the first time we see this packet.
*/
if(pinfo->desegment_len) {
- if (!pinfo->fd->flags.visited)
+ if (!PINFO_FD_VISITED(pinfo))
must_desegment = TRUE;
/* The stuff we couldn't dissect
- must have come from this segment,
- so it's all in "tvb".
-
- "pinfo->desegment_offset" is
- relative to the beginning of
- "next_tvb"; we want an offset
- relative to the beginning of "tvb".
-
- First, compute the offset relative
- to the *end* of "next_tvb" - i.e.,
- the number of bytes before the end
- of "next_tvb" at which the
- subdissector stopped. That's the
- length of "next_tvb" minus the
- offset, relative to the beginning
- of "next_tvb, at which the
- subdissector stopped.
+ * must have come from this segment,
+ * so it's all in "tvb".
+ *
+ * "pinfo->desegment_offset" is
+ * relative to the beginning of
+ * "next_tvb"; we want an offset
+ * relative to the beginning of "tvb".
+ *
+ * First, compute the offset relative
+ * to the *end* of "next_tvb" - i.e.,
+ * the number of bytes before the end
+ * of "next_tvb" at which the
+ * subdissector stopped. That's the
+ * length of "next_tvb" minus the
+ * offset, relative to the beginning
+ * of "next_tvb, at which the
+ * subdissector stopped.
*/
- deseg_offset =
- ipfd_head->datalen - pinfo->desegment_offset;
+ deseg_offset = ipfd_head->datalen - pinfo->desegment_offset;
/* "tvb" and "next_tvb" end at the
- same byte of data, so the offset
- relative to the end of "next_tvb"
- of the byte at which we stopped
- is also the offset relative to
- the end of "tvb" of the byte at
- which we stopped.
-
- Convert that back into an offset
- relative to the beginninng of
- "tvb", by taking the length of
- "tvb" and subtracting the offset
- relative to the end.
+ * same byte of data, so the offset
+ * relative to the end of "next_tvb"
+ * of the byte at which we stopped
+ * is also the offset relative to
+ * the end of "tvb" of the byte at
+ * which we stopped.
+ *
+ * Convert that back into an offset
+ * relative to the beginninng of
+ * "tvb", by taking the length of
+ * "tvb" and subtracting the offset
+ * relative to the end.
*/
deseg_offset=tvb_reported_length(tvb) - deseg_offset;
}
@@ -1070,7 +1090,7 @@
deseg_seq = seq + (deseg_offset - offset);
if( ((nxtseq - deseg_seq) <= 1024*1024)
- && (!pinfo->fd->flags.visited) ){
+ && (!PINFO_FD_VISITED(pinfo))) {
if(pinfo->desegment_len==DESEGMENT_ONE_MORE_SEGMENT){
/* The subdissector asked to reassemble using the
* entire next segment.
@@ -1088,9 +1108,7 @@
/* add this segment as the first one for this new pdu */
fragment_add(tvb, deseg_offset, pinfo, msp->first_frame,
- ssl_fragment_table,
- 0,
- nxtseq - deseg_seq,
+ ssl_fragment_table, 0, nxtseq - deseg_seq,
LT_SEQ(nxtseq, msp->nxtpdu));
}
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/dissectors/packet-tcp.c
^
|
| @@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c 36694 2011-04-18 01:07:41Z cmaynard $
+ * $Id: packet-tcp.c 37221 2011-05-17 23:23:15Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1546,20 +1546,46 @@
*/
deseg_offset = offset;
- /* find the most previous PDU starting before this sequence number */
if (tcpd) {
+ /* If we've seen this segment before (e.g., it's a retransmission),
+ * there's nothing for us to do. Certainly, don't add it to the list
+ * of multisegment_pdus (that would cause subsequent lookups to find
+ * the retransmission instead of the original transmission, breaking
+ * dissection of the desegmented pdu if we'd already seen the end of
+ * the pdu).
+ */
+ if ((msp = se_tree_lookup32(tcpd->fwd->multisegment_pdus, seq))) {
+ const char* str;
+
+ if (msp->first_frame == PINFO_FD_NUM(pinfo)) {
+ str = "";
+ col_set_str(pinfo->cinfo, COL_INFO, "[TCP segment of a reassembled PDU]");
+ } else {
+ str = "Retransmitted ";
+ /* TCP analysis already flags this (in COL_INFO) as a retransmission--if it's enabled */
+ }
+
+ nbytes = tvb_reported_length_remaining(tvb, offset);
+ proto_tree_add_text(tcp_tree, tvb, offset, nbytes,
+ "%sTCP segment data (%u byte%s)",
+ str, nbytes, plurality(nbytes, "", "s"));
+ return;
+ }
+
+ /* Else, find the most previous PDU starting before this sequence number */
msp = se_tree_lookup32_le(tcpd->fwd->multisegment_pdus, seq-1);
}
+
if(msp && msp->seq<=seq && msp->nxtpdu>seq){
int len;
- if(!pinfo->fd->flags.visited){
+ if (!PINFO_FD_VISITED(pinfo)) {
msp->last_frame=pinfo->fd->num;
msp->last_frame_time=pinfo->fd->abs_ts;
}
/* OK, this PDU was found, which means the segment continues
- a higher-level PDU and that we must desegment it.
+ * a higher-level PDU and that we must desegment it.
*/
if(msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT){
/* The dissector asked for the entire segment */
@@ -1570,9 +1596,7 @@
last_fragment_len = len;
ipfd_head = fragment_add(tvb, offset, pinfo, msp->first_frame,
- tcp_fragment_table,
- seq - msp->seq,
- len,
+ tcp_fragment_table, seq - msp->seq, len,
(LT_SEQ (nxtseq,msp->nxtpdu)) );
if(msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT){
@@ -1596,8 +1620,8 @@
}
} else {
/* This segment was not found in our table, so it doesn't
- contain a continuation of a higher-level PDU.
- Call the normal subdissector.
+ * contain a continuation of a higher-level PDU.
+ * Call the normal subdissector.
*/
/*
@@ -1612,13 +1636,13 @@
called_dissector = TRUE;
/* Did the subdissector ask us to desegment some more data
- before it could handle the packet?
- If so we have to create some structures in our table but
- this is something we only do the first time we see this
- packet.
+ * before it could handle the packet?
+ * If so we have to create some structures in our table but
+ * this is something we only do the first time we see this
+ * packet.
*/
if(pinfo->desegment_len) {
- if (!pinfo->fd->flags.visited)
+ if (!PINFO_FD_VISITED(pinfo))
must_desegment = TRUE;
/*
@@ -1630,9 +1654,9 @@
}
/* Either no desegmentation is necessary, or this is
- segment contains the beginning but not the end of
- a higher-level PDU and thus isn't completely
- desegmented.
+ * segment contains the beginning but not the end of
+ * a higher-level PDU and thus isn't completely
+ * desegmented.
*/
ipfd_head = NULL;
}
@@ -1657,7 +1681,8 @@
/* create a new TVB structure for desegmented data */
next_tvb = tvb_new_child_real_data(tvb, ipfd_head->data,
- ipfd_head->datalen, ipfd_head->datalen);
+ ipfd_head->datalen,
+ ipfd_head->datalen);
/* add desegmented data to the data source list */
@@ -1673,8 +1698,8 @@
tcpinfo->is_reassembled = TRUE;
/* call subdissector */
- process_tcp_payload(next_tvb, 0, pinfo, tree,
- tcp_tree, sport, dport, 0, 0, FALSE, tcpd);
+ process_tcp_payload(next_tvb, 0, pinfo, tree, tcp_tree, sport,
+ dport, 0, 0, FALSE, tcpd);
called_dissector = TRUE;
/*
@@ -1742,55 +1767,54 @@
print_tcp_fragment_tree(ipfd_head, tree, tcp_tree, pinfo, next_tvb);
/* Did the subdissector ask us to desegment
- some more data? This means that the data
- at the beginning of this segment completed
- a higher-level PDU, but the data at the
- end of this segment started a higher-level
- PDU but didn't complete it.
-
- If so, we have to create some structures
- in our table, but this is something we
- only do the first time we see this packet.
+ * some more data? This means that the data
+ * at the beginning of this segment completed
+ * a higher-level PDU, but the data at the
+ * end of this segment started a higher-level
+ * PDU but didn't complete it.
+ *
+ * If so, we have to create some structures
+ * in our table, but this is something we
+ * only do the first time we see this packet.
*/
if(pinfo->desegment_len) {
- if (!pinfo->fd->flags.visited)
+ if (!PINFO_FD_VISITED(pinfo))
must_desegment = TRUE;
/* The stuff we couldn't dissect
- must have come from this segment,
- so it's all in "tvb".
-
- "pinfo->desegment_offset" is
- relative to the beginning of
- "next_tvb"; we want an offset
- relative to the beginning of "tvb".
-
- First, compute the offset relative
- to the *end* of "next_tvb" - i.e.,
- the number of bytes before the end
- of "next_tvb" at which the
- subdissector stopped. That's the
- length of "next_tvb" minus the
- offset, relative to the beginning
- of "next_tvb, at which the
- subdissector stopped.
+ * must have come from this segment,
+ * so it's all in "tvb".
+ *
+ * "pinfo->desegment_offset" is
+ * relative to the beginning of
+ * "next_tvb"; we want an offset
+ * relative to the beginning of "tvb".
+ *
+ * First, compute the offset relative
+ * to the *end* of "next_tvb" - i.e.,
+ * the number of bytes before the end
+ * of "next_tvb" at which the
+ * subdissector stopped. That's the
+ * length of "next_tvb" minus the
+ * offset, relative to the beginning
+ * of "next_tvb, at which the
+ * subdissector stopped.
*/
- deseg_offset =
- ipfd_head->datalen - pinfo->desegment_offset;
+ deseg_offset = ipfd_head->datalen - pinfo->desegment_offset;
/* "tvb" and "next_tvb" end at the
- same byte of data, so the offset
- relative to the end of "next_tvb"
- of the byte at which we stopped
- is also the offset relative to
- the end of "tvb" of the byte at
- which we stopped.
-
- Convert that back into an offset
- relative to the beginninng of
- "tvb", by taking the length of
- "tvb" and subtracting the offset
- relative to the end.
+ * same byte of data, so the offset
+ * relative to the end of "next_tvb"
+ * of the byte at which we stopped
+ * is also the offset relative to
+ * the end of "tvb" of the byte at
+ * which we stopped.
+ *
+ * Convert that back into an offset
+ * relative to the beginninng of
+ * "tvb", by taking the length of
+ * "tvb" and subtracting the offset
+ * relative to the end.
*/
deseg_offset=tvb_reported_length(tvb) - deseg_offset;
}
@@ -1821,7 +1845,7 @@
deseg_seq = seq + (deseg_offset - offset);
if(tcpd && ((nxtseq - deseg_seq) <= 1024*1024)
- && (!pinfo->fd->flags.visited) ){
+ && (!PINFO_FD_VISITED(pinfo)) ) {
if(pinfo->desegment_len==DESEGMENT_ONE_MORE_SEGMENT){
/* The subdissector asked to reassemble using the
* entire next segment.
@@ -1839,9 +1863,7 @@
/* add this segment as the first one for this new pdu */
fragment_add(tvb, deseg_offset, pinfo, msp->first_frame,
- tcp_fragment_table,
- 0,
- nxtseq - deseg_seq,
+ tcp_fragment_table, 0, nxtseq - deseg_seq,
LT_SEQ(nxtseq, msp->nxtpdu));
}
}
@@ -1853,8 +1875,8 @@
* We know what frame this PDU is reassembled in;
* let the user know.
*/
- item=proto_tree_add_uint(tcp_tree, hf_tcp_reassembled_in,
- tvb, 0, 0, ipfd_head->reassembled_in);
+ item = proto_tree_add_uint(tcp_tree, hf_tcp_reassembled_in, tvb, 0,
+ 0, ipfd_head->reassembled_in);
PROTO_ITEM_SET_GENERATED(item);
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/enterprise-numbers
^
|
| @@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2011-04-16)
+(last updated 2011-05-27)
SMI Network Management Private Enterprise Codes:
@@ -14756,7 +14756,7 @@
3688
Sagem Orga GmbH
Michael Zimdars
- oid&sagem-orga.com
+ med.oid&morpho.com
3689
New Technology Development, Inc.
Rich Lyman
@@ -19063,8 +19063,8 @@
nathan.grant&trafficmaster.co.uk
4768
E.ON AG
- Andre Giza
- is-net-ds°ussa.com
+ Bernhard Erdmann
+ bernhard.erdmann&eon.com
4769
IBM Corporation
Victor Sample
@@ -33210,9 +33210,9 @@
Daniel Raedel
dr&jardix.de
8314
- PEUS Systems GmbH
- Myasnykov Dmytro
- dm&peus.de
+ AVL Emission Test Systems GmbH (previous was 'PEUS Systems GmbH')
+ Michael Speck
+ Michael.Speck&avl.com
8315
Minacom Labs Inc.
Patrice Gagnon
@@ -40723,8 +40723,8 @@
ptraskal&DivergeNet.com
10192
E.ON Energie AG
- Christian Müller
- christian.mueller&is-energy.de
+ Markus Teuber
+ markus.teuber&eon.com
10193
erkle
Andrew Veitch
@@ -44223,8 +44223,8 @@
william.ferris&tenaid.com
11067
University of Belgrade
- Djordje Vulovic
- djordjev&rcub.bg.ac.yu
+ Marina Vermezovic
+ marina.vermezovic&rcub.bg.ac.rs
11068
Webscreen Technology Ltd.
Sean Witham
@@ -44943,8 +44943,8 @@
ghzinc&hotmail.com
11247
GlaxoSmithKline
- Josef Marker
- jdm51295&gsk.com
+ Ron Chavez
+ ron.l.chavez&gsk.com
11248
Greenwich Technology Partners, Inc.
Michael Friedhoff
@@ -57831,9 +57831,9 @@
Michael Weiser
michael&weiser.saale-net.de
14569
- Heidelberg
- Tim Snell
- timothy.snell&heidelberg.com
+ Heidelberger Druckmaschinen AG
+ Dieter Meergraf
+ dieter.meergraf&heidelberg.com
14570
Majentis Technologies Inc.
Gerald Brandt
@@ -60567,9 +60567,9 @@
Dan Fossum
dfossum&ceyba.com
15254
- Intellipool AB
+ Kaseya Sweden AB (previous was 'Intellipool AB')
Robert Aronsson
- robert.aronsson&intellipool.com
+ robert.aronsson&kaseya.com
15255
Reliable Controls Corporation
Roland Laird
@@ -61284,8 +61284,8 @@
michael.oberdorf&cybcon-industries.de
15433
Landespolizei Mecklenburg- Vorpommern
- Patzer, Jörg
- joerg.patzer&polmv.de
+ Schwarz, Thomas
+ thomas.schwarz&polmv.de
15434
Chebucto Community Net
Jeff Warnica
@@ -81797,7 +81797,7 @@
20560
Alexander Janssen Consulting
Alexander Janssen
- alexander.janssen&gmx.de
+ alexander.janssen&gmail.com
20561
LiveWave, Inc.
Shad J. Aumann
@@ -97482,9 +97482,9 @@
Yasuyuki Imaizumi
imaizumi&megatrade.co.jp
24479
- E.ON IS Czech Republic s.r.o.
- Josef Jeèmen
- josef.jecmen&eon-is.cz
+ E.ON IT Czech Republic s.r.o.
+ Josef Ječmen
+ josef.jecmen&eon.com
24480
oncampusuk
matthew venn
@@ -105710,9 +105710,9 @@
Carl de Billy
carl.debilly&nurun.com
26534
- AEC/communications GmbH
+ think project! International (previous was 'AEC/communications GmbH')
Claus Koch
- claus.koch&aeccom.com
+ claus.koch&thinkproject.com
26535
OMNEX Control Systems ULC
Doru George Botez
@@ -107220,9 +107220,9 @@
Anette Brix
edbdrift&s-et.aau.dk
26911
- Third Brigade Inc.
- Brett Melbourne
- brett.melbourne&thirdbrigade.com
+ Trend Micro Inc. (previous was 'Third Brigade Inc.')
+ Bob Durie
+ bob_durie&trendmicro.com
26912
Cheiron
Mark Brouwer
@@ -120758,9 +120758,9 @@
Charlemagne Fabrice
flash_math&yahoo.fr
30294
- Innotrans Communications Inc.
- Abhishek Thakur
- chotaythakur&yahoo.com
+ InnoTrans Communications Inc.
+ Betty Juan
+ snmp&inno-trans.com
30295
I2Net Christian Nordmann
Christian Nordmann
@@ -124775,7 +124775,7 @@
stefan.rapp&tu-dortmund.de
31298
Hochschule Anhalt (FH)
- Randolf Engler
+ Thomas Gast
admin.pen&zik.hs-anhalt.de
31299
Elite CRM Software Ltd.
@@ -125175,8 +125175,8 @@
jbosch&armorsafe.com
31398
Suburbia Public Access Network
- Mark Dorset
- mark&suburbia.org.au
+ Trent Anderson
+ domainadmin&suburbia.org.au
31399
SCALABLE NETWORK TECHNOLOGIES
Unghee Lee
@@ -127923,7 +127923,7 @@
hans.schillstrom&deltanode.com
32085
E.ON IT GmbH
- Jennifer Weidle, Sebastian Heil, Christian Mueller
+ Jennifer Weidle, Sebastian Heil
pki&eon.com
32086
Fiberblaze
@@ -136724,8 +136724,8 @@
matti.swan&elisa.fi
34285
S.C. DigiSign S.A.
- Marius Daniel PESTINA
- dan.pestina&digisign.ro
+ Iosif Szavuj
+ admin&digisign.ro
34286
Feusi Bildungszentrum AG
Heinz Dubach
@@ -137887,7 +137887,7 @@
Matt Cervi
matt&kentimaging.com
34576
- FH Emden/Leer
+ HS Emden/Leer
Ingo Herz
herz&technik-emden.de
34577
@@ -144373,8 +144373,8 @@
yilee&kai-media.com
36197
Movius Interactive Corporation
- Florin Malita
- fmalita&moviuscorp.com
+ Jeff Woods
+ jeff.woods&moviuscorp.com
36198
TheSpidersProject
Richard Cuti
@@ -147202,7 +147202,7 @@
36904
Legion Telekommunikation GmbH
Robert Schlabs
- robert.schlabs&legion.de
+ sysadmin&legion.de
36905
MedCentral Health System
Michael Mistretta
@@ -149354,7 +149354,7 @@
37442
ANF Authority of Certification Ecuador, S.A.
Isabel Fàbregas
- isabel.fabregas&anf.es
+ fdiaz&anf.es
37443
Centina Systems
Paul Pantages
@@ -150189,7 +150189,7 @@
vvenugopal&stsgi.com
37651
JoyStem Web Services Private Limited
- Chandra Sekhar Challapilla
+ Mr. Chandra Sekhar & Mr. JayaChandra Prakash
sekhar&joystem.com
37652
I-TECH
@@ -150416,9 +150416,9 @@
Rob Versluis
info&rocrail.net
37708
- Systola Forwardingm GmbH
+ Systola Forwarding GmbH
Roman Kuznetsov
- rk&systola.de
+ support&systola.de
37709
S3 Satcom Ltd
John Kennett
@@ -150619,6 +150619,1054 @@
Actidata Company
Sergey Firsov
admin&telemetr.net
+37759
+ WXXR Network Technology Ltd. BEIJING
+ Neil Lin
+ neillin&wxxr.com.cn
+37760
+ Powertech Automation Solutions Pvt. Ltd
+ Vivek Patwardhan
+ vivek.patwardhan&pasl.in
+37761
+ Altitude Software
+ Joaquim Freitas
+ joaquim.freitas&altitude.com
+37762
+ Neotion R&D
+ Remi Verchere
+ rverchere&neotion.com
+37763
+ Bitxenio, S.L.
+ Miguelanxo Otero Salgueiro
+ miguelanxo&bitxenio.com
+37764
+ Portel Servicios Telemáticos
+ Carlos Martín
+ c.martin&portel.es
+37765
+ LHERITIER
+ Pierre FICHET
+ pfichet&lheritier-alcen.com
+37766
+ Beijing Banggoo Networks Co,Ltd.
+ James Zhang
+ glzhang&banggoo.cn
+37767
+ Gartner Inc.
+ Peter Heilig
+ peter.heilig&gartner.com
+37768
+ Bundesministerium für Arbeit und Soziales
+ Fridolin Smolka
+ fridolin.smolka&bmas.bund.de
+37769
+ Koramis GmbH
+ Michael Fess
+ m.fess&koramis.de
+37770
+ IDmachines LLC
+ Salvatore D'Agostino
+ sal&idmachines.com
+37771
+ Linkwise Technology Private Limited
+ Shirley Koh
+ shirley&linkwisetech.com
+37772
+ AERODEV
+ Martin Chen
+ chenmj&aerodev.com
+37773
+ OAO NESK Novorossiyskenergosbit
+ Kokorin Artem Vladimirovich
+ KokorinAV&nesk.ru
+37774
+ 51.6 Noord B.V.
+ Marcel de Kock
+ marcel.dekock&516noord.nl
+37775
+ BaoBros Studio
+ Winnow Cai
+ winnow.cai&baobros.com
+37776
+ Co. Ltd. "RCS Labs"
+ Artem Marchenko
+ artem.marchenko&rcslabs.ru
+37777
+ Cabinet Pierre Guerin
+ Pierre Guerin
+ pierre.guerin&cab-cpg.net
+37778
+ Northern Design (Electronics) Ltd
+ Paul Connor
+ paul.connor&ndmeter.co.uk
+37779
+ Nuvolas
+ Andre Joswig
+ info&nuvolas.de
+37780
+ MicroRIGHT Corporation
+ Aaron Moreau-Cook
+ opsµright.com
+37781
+ eZuce Inc
+ George Niculae
+ george&ezuce.com
+37782
+ KindleIT
+ Rodolfo Hansen
+ rhansen&kitsd.com
+37783
+ Wolf Pond Creative LLC
+ Thomas Davis
+ tommy&wolfpond.com
+37784
+ IDC Solutions Pty Ltd
+ James Yong
+ jamesy&idcsolutions.com.au
+37785
+ Ingenieurbuero Jan F Westerkamp (IBW)
+ Jan F Westerkamp
+ oid&ib-westerkamp.de
+37786
+ Galtronics Telemetry, Inc.
+ Mike Lafferty
+ mike.lafferty&galtronics.com
+37787
+ Emirates Identity Authority
+ Mohamed Al Redaini
+ Mohamed.AlRedaini&emiratesid.ae
+37788
+ Syslife
+ Antoine Natale
+ a.natale&syslife.com
+37789
+ Novapost SAS
+ Dr. Jorge Tellez
+ jorge.tellez&novapost.fr
+37790
+ Gould International UK Ltd
+ Tim Garvin
+ timg&gouldinternational.co.uk
+37791
+ PortaOne, Inc.
+ Lutay Alexander
+ Alexander.Lutay&portaone.com
+37792
+ Enfuse Inc
+ Hong Wang
+ hwang&inscopeinternational.com
+37793
+ Squirrel Solutions Ltd
+ Matt Jenkins
+ matt&sqsol.co.uk
+37794
+ DVR Support Center
+ Jon Swatzell
+ engineering&pco-inc.com
+37795
+ Centre Hospitalier du Nord
+ Aloyse Gilbert
+ aloyse.gilbert&chdn.lu
+37796
+ PTS Group AG
+ Sören Lifka
+ s.lifka&ptsgroup.de
+37797
+ Graylog2
+ Lennart Koopmann
+ lennart&socketfeed.com
+37798
+ Pcmedic
+ Tiago Lourenço Geada
+ tiago.geada&pcmedic.pt
+37799
+ Coloriuris A.I.E.
+ Pedro J. Canut
+ webmaster&coloriuris.net
+37800
+ Aster Data Systems, Inc
+ Dinkar Gupta
+ dgupta&asterdata.com
+37801
+ Innovactive Engineering s.r.l.
+ Lorenzo Maiorfi
+ maiorfi&innovactive.it
+37802
+ Sypris Solutions, Inc
+ Ed Charbeneau
+ ed.charbeneau&sypris.com
+37803
+ California State University San Marcos
+ Diane Petersen
+ kai&csusm.edu
+37804
+ Spirit Software Solutions
+ Graeme Elliott
+ gelliott&spiritsoftware.biz
+37805
+ Team Simoco Ltd.
+ Richard Stimson
+ Richard.Stimson&TeamSimoco.com
+37806
+ North Power Coporation (EVN NPC)
+ Trung Huu Truong
+ trungdtbk&gmail.com
+37807
+ Instituto Tecnológico de Canarias
+ Fco. Javier Ascanio Suárez
+ jascsua&itccanarias.org
+37808
+ FIBCOM INDIA LIMITED
+ B.Sreenivasappa
+ sreenivasappa.b&fibcom.com
+37809
+ Wnet Wisp S.r.l
+ Scalisi Mihai
+ adranoweb&hotmail.com
+37810
+ PCE SYSTEMS
+ Leo Magee
+ lmagee&pcesystems.com
+37811
+ Glass Echidna
+ Aidan Steele
+ aidan.steele&glassechidna.com.au
+37812
+ Kotkamills Oy
+ Peter Danielsbacka
+ peter.danielsbacka&kotkamills.com
+37813
+ DSM Computer GmbH
+ Wolfram Ansin
+ w.ansin&dsm-computer.de
+37814
+ Infinidat LTD
+ Gregory Shulov
+ gregs&infinidat.com
+37815
+ Friendly Runet Foundation
+ Varnakov Kiril
+ kvarnakov&friendlyrunet.ru
+37816
+ skweez.net
+ Florian Mutter
+ elm&skweez.net
+37817
+ GMG Technologies
+ Gorobchenko Michael G.
+ gmg.inbox&gmail.com
+37818
+ LEGALBOX
+ Pierre Guerin
+ pierre.guerin&legal-box.com
+37819
+ Technical Dabblings
+ Glenn R. Martin
+ iana&technicaldabblings.com
+37820
+ Telecore LTD.
+ Anatoly Danilov
+ ermolaew&bk.ru
+37821
+ untermStrich software gmbh
+ Christian Koller
+ christian.k&untermstrich.com
+37822
+ Wolfplex Hackerspace ASBL
+ Sébastien Santoro
+ sebastien.santoro&wolfplex.org
+37823
+ Vimukti Technologies Private Limited
+ Rajesh Akkineni
+ rajesh&vimukti.com
+37824
+ ECOLE NATIONALE VETERINAIRE D'ALFORT
+ BATTAGLIA Hervé
+ informatique&vet-alfort.fr
+37825
+ Interregional Distribution Grid Company of Volga, JSC
+ Sergey Yu. Bozhko
+ sy.bozhko&mrsk-volgi.ru
+37826
+ ISL Internet Sicherheitsloesungen GmbH
+ Andreas Rieke
+ andreas.rieke&isl.de
+37827
+ WV Network for Educational Telecomputing (WVNet)
+ Samuel Lay
+ sam&mail.wvnet.edu
+37828
+ LIL'SYSTEMS
+ Yves Geunes
+ info&lilsystems.be
+37829
+ Puxlit
+ Xiao Di Guan
+ woot&puxlit.net
+37830
+ InCampus Pte Ltd
+ Liew SC
+ liew&incampus.com.sg
+37831
+ Techroutes Network
+ AnilRaj Thulasidas
+ araj&techroutes.com
+37832
+ Clifford Chance LLP
+ Dermot O'Hagan
+ dermot.ohagan&cliffordchance.com
+37833
+ Southern New Hampshire Medical Center
+ Devora Moriarty
+ Devora.Moriarty&snhmc.org
+37834
+ No23
+ Ivan Bischof
+ ivan.bischof&no23.de
+37835
+ Jerome Baum
+ Jerome Baum
+ jerome&jeromebaum.com
+37836
+ CCM Benchmark Group
+ Adrien Sévère
+ asevere&ccmbenchmark.com
+37837
+ mikroVOX s.r.o.
+ Martin Madlik
+ m.madlik&mikrovox.cz
+37838
+ Futurad S.r.l.
+ Lorenzo Rizzatto
+ l.rizzatto&futurad.it
+37839
+ OneSystem S.A.
+ Daniel Eduardo Alzate Tamayo
+ daniel.alzate&onesystemsa.com
+37840
+ Veda Advantage
+ Jason Pell
+ jason.Pell&vedaadvantage.com
+37841
+ Flughafen Zürich AG
+ Thomas Reichmuth
+ ictzertifikate&zurich-airport.com
+37842
+ Aicox Soluciones S.A.
+ Ithar Alhaidari
+ ithar&aicox.com
+37843
+ Adecco Group
+ Abid Khwaja
+ abid.khwaja&adeccona.com
+37844
+ Eastern Upper Peninsula ISD
+ Jay Schupp
+ jschupp&eup.k12.mi.us
+37845
+ VINCI S.A.
+ Guy Widloecher
+ oid&vinci.com
+37846
+ MEDIAPRINT Zeitungs und Zeitschriften Verlags GesmbH
+ Charly Baldrian
+ ssladmin&mediaprint.at
+37847
+ Business Information Intelligence Services
+ Thierry Brouard
+ thierry.brouard&biis.biz
+37848
+ ORSENNA
+ SENCKEISEN JEAN PHILIPPE
+ jpsenckeisen&orsenna.fr
+37849
+ Aris System
+ Davood Firoozian
+ dfiroozian&arissystem.com
+37850
+ Slavic Gospel Association
+ Steve Palm
+ stevep&sga.org
+37851
+ YTY Enterprises
+ Steve Palm
+ n9yty&n9yty.com
+37852
+ ECCOS inzenjering
+ Aleksandar Dujmović
+ Aleksandar.Dujmovic&eccos.com.hr
+37853
+ OASIS Systems Pty Ltd
+ Jonathan Yeoh
+ jonathan.yeoh&oasissystems.com.au
+37854
+ Crozer-Keystone Health System
+ Marisa Niedbalski
+ marisa.niedbalski&crozer.org
+37855
+ The Reading Hospital and Medical Center
+ Jason Balthaser
+ balthaserj&readinghospital.org
+37856
+ Essential Enterprise Solutions Inc.
+ David Davies
+ ddavies&eesimed.com
+37857
+ Veolia Environmental Services - North America
+ Michael Glaubig
+ michael.glaubig&veoliaes.com
+37858
+ Synegen
+ Martin Phee
+ marty.phee&synegen.com
+37859
+ Synerline sprl
+ André Deblire
+ iana&synerline.com
+37860
+ Source Trading Co., Ltd.
+ Hui Mei Chen
+ ruthchen36&yahoo.com.hk
+37861
+ Austco Communication Systems
+ Stephane Benayoun
+ stephane.benayoun&austco.com
+37862
+ Suntel S.A.
+ Eddy Nelson
+ suntelsa&hotmail.com
+37863
+ ETMC Regional Healthcare System
+ Pete Range
+ prange&etmc.org
+37864
+ Cape Cod Healthcare
+ Peter Read
+ pread&capecodhealth.org
+37865
+ City and County of San Francisco, Department of Technology
+ Aaron Smith
+ aaron.smith&sfgov.org
+37866
+ Bank of New Zealand
+ B.A.Johnston
+ nz_infoman_zcidsm&bnz.co.nz
+37867
+ APG
+ Patric Lichtsteiner
+ patric.lichtsteiner&apg.ch
+37868
+ VirtualSharp Software
+ Alberto Gonzalez Martos
+ agonzalez&virtualsharp.com
+37869
+ BruteCO Certificate Authority
+ Adam Vallee
+ adam.vallee&bruteco.com
+37870
+ Sensometrix SA
+ Grégory Brusick
+ gbrusick&sensometrix.ch
+37871
+ Digital Vision, s.r.o.
+ Michal Vanco
+ mvanco&di-vision.sk
+37872
+ Neko Consulting Ltd.
+ Vasily Zezin
+ vzezin&nya.me
+37873
+ J4care GmbH
+ Michael Knapp
+ michael.knapp&j4care.com
+37874
+ CebaTech Inc.
+ Hank Cohen
+ hcohen&cebatech.com
+37875
+ oogle Networks LLC
+ Josh Kittle
+ josh&ooglenetworks.com
+37876
+ Delta Management AB
+ Mattias Niklasson
+ info&deltamanagement.se
+37877
+ TITNC Alexander Seifarth
+ Alexander Seifarth
+ a.seifarth&yahoo.de
+37878
+ WineSkills
+ Andrew Atkinson
+ andrew.atkinson&plumpton.ac.uk
+37879
+ NetOrg LTD
+ Suthagar Kathirkamathamby
+ suthagarht&gmail.com
+37880
+ Qowisio
+ Jean-Samuel Reynaud
+ js&qowisio.com
+37881
+ ESCA
+ BRAND Arnaud
+ abrand&esca.fr
+37882
+ RedeCamp Ind. Com. e Serviços de Telecomunicações S.A.
+ Alexandre Alves
+ acalves&redecamp.com.br
+37883
+ Vitaly Pashkov
+ Vitaly Pashkov
+ admin&fluda.net
+37884
+ Perfect Home AS
+ Bjørn Håvar Falck-Andersen
+ havar&perfecthome.no
+37885
+ Renewable Funding, LLC
+ Darrell Fuhriman
+ itstaff&renewfund.com
+37886
+ Coraid Inc.
+ Binh Le
+ lpbinh&coraid.com
+37887
+ OraPharma, Inc.
+ Jeff Edonick
+ jedonic2&orapharma.com
+37888
+ PROGIRIS
+ Louis CALENDA
+ louis&progiris.com
+37889
+ Accord Medical Management, LP DBA Nix Health Care System
+ Les Surrock
+ lsurrock&nixhealth.com
+37890
+ Quality Fiber and RF Inc
+ Jeff Oberholtzer
+ jeff&qfrf.com
+37891
+ Big Ant Studios Pty Ltd
+ Scott Pederick
+ sysadmin&bigant.com
+37892
+ GCT Semiconductor, Inc.
+ Jason J. Kim
+ jasonkim&gctsemi.com
+37893
+ BeyondTrust Software, Inc
+ Jordan Bean
+ jbean&beyondtrust.com
+37894
+ aylite
+ tarmo kaljumae
+ tarmo&aylite.com
+37895
+ LucidView
+ Tim Haak
+ tim&haak.co.uk
+37896
+ IFD Kapital
+ Konstantin Sidorenko
+ it&ifdk.com
+37897
+ Maxwell Management Inc. (MMI)
+ Will Maxwell
+ will&shpapa.com
+37898
+ Éric Larivière
+ Éric Larivière
+ ericlariviere&hotmail.com
+37899
+ Hahn Family
+ Stefan-W. Hahn
+ stefan.hahn&s-hahn.de
+37900
+ International Information Programs IR, Deptartment of State
+ Greg Goble
+ GobleGW&state.gov
+37901
+ Aeon Experienced Development
+ Henning Hucke
+ oidmaster&aeon-experienced.eu
+37902
+ Polynet Ltd.
+ Sándor Nagy
+ sandor.nagy&polynet.hu
+37903
+ CURUPIRA S/A
+ Renato Frederick
+ operacao&takenet.com.br
+37904
+ UnixServices
+ Thomas Müller
+ tmueller&unixservices.de
+37905
+ Beijing Jiaxun Feihong Electrical Co.,Ltd
+ Zhang Tao
+ zhangtao&jiaxun.com
+37906
+ Beijing WingMax Technology Co.,Ltd
+ jiangshan
+ sjiang&wingmax.net
+37907
+ Fusion Comm Solution Sdn Bhd
+ Chong Nan Bing
+ nanbing_chong&fusioncomms.com
+37908
+ A puissance 3
+ Thierry Le Naour
+ th.ln&ap3.fr
+37909
+ Arantia 2010 S.L.U.
+ Gonzalo Berdeal
+ gberdeal&arantia.com
+37910
+ Modesat Communications
+ Jüri Põldre
+ juri.poldre&modesat.com
+37911
+ CDP Communications Inc.
+ Ted Dunlop
+ ted.dunlop&cdpcom.com
+37912
+ Locomotive Software & Consulting
+ Pigozzo Michele
+ pigozzo.michele&gmail.com
+37913
+ ZAO PTKB "MERCURIY"
+ Lubsanova Antonina
+ a.lubsanova&bankm.ru
+37914
+ TECNOTEL s.r.l.
+ PAOLO SARTINI
+ paolo.sartini&tecnotel-sistemi.it
+37915
+ Shenzhen Zyeeda Information Technology Co. Ltd.
+ Rui Tang
+ tangrui.cn&gmail.com
+37916
+ Volvo Car Corporation AB
+ Björn Kjellén
+ BKJELLEN&volvocars.com
+37917
+ MarkitServ
+ Matthew Barr
+ matthew.barr&markitserv.com
+37918
+ SAGE Dining Services
+ Marcus Madsen
+ technology&sagedining.com
+37919
+ NETMOON
+ forest.Guo
+ gxb&netmoon.cn
+37920
+ DEXUS Holdings Pty Limited
+ Mark Aidasani
+ mark.aidasani&dexus.com
+37921
+ Southwest Institute of Healing Arts
+ Michael LaBelle
+ mikel&swiha.edu
+37922
+ TeleMedia Systems, Inc.
+ Lance Wang
+ lance&telemediasystems.com
+37923
+ Freysteinn Alfredsson
+ Freysteinn Alfredsson
+ freysteinn&freysteinn.com
+37924
+ NokianTyres LLC
+ Alexandr Sizov
+ Aleksandr.Sizov&nokiantyres.com
+37925
+ mysql-cluster-snmp-monitor
+ Steven Ayre
+ steveayre&gmail.com
+37926
+ Pranveer Singh Institute of Technology
+ Amit K Awasthi
+ awasthi&psit.in
+37927
+ RTLGroup
+ Udo Kertels
+ domreg&rtlgroup.com
+37928
+ Sheffield Teaching Hospitals NHS Foundation Trust
+ Richard Conway
+ richard.conway&sth.nhs.uk
+37929
+ PIPS Technology Ltd
+ David McConnell
+ davidm&pipstechnology.co.uk
+37930
+ Virus Stopper Foundation Registered NGO No 348 -2010
+ GUNTAGANI VIMAL KUMAR
+ virusstopperfoundation&gmail.com
+37931
+ Bob Greene
+ Bob Greene
+ bobg&liquidnetworx.com
+37932
+ Jack Storm
+ Jack Storm
+ blaiddeira&gmail.com
+37933
+ Westchester Medical Center
+ Andrew Minikes
+ pen-iana-org-Request&wcmc.com
+37934
+ Confident Technologies, Inc.
+ John Whitlock
+ ct.admin&confidenttech.com
+37935
+ Danmarks Designskole
+ Henrik Mathorne
+ hma&dkds.dk
+37936
+ Calendar42
+ M. Boerrigter
+ michel&calendar42.com
+37937
+ Schaffhausen Communication GmbH
+ Bjoern Becker
+ bb&schaffhausen.de
+37938
+ Lake Hospital System, Inc.
+ Kimberly Krueger, HIM Director
+ kimberly.krueger&lakehealth.org
+37939
+ Reykjavik University
+ Jens Valur Ólason
+ hostmaster&ru.is
+37940
+ WRD Technology Co., Ltd.
+ Cheng Yang
+ ycflash&gmail.com
+37941
+ comForte 21 GmbH
+ H.Horst
+ h.horst&comforte.com
+37942
+ Futuver S.A. de C.V.
+ Nora Erika Morales Hernández
+ nora.morales&futuver.com.mx
+37943
+ Medium Link System Technology CO., LTD
+ Jacky Wang
+ jacky&ecenter-net.net
+37944
+ megalo & company
+ Nicolas Lehuen
+ nlehuen&megalo-company.com
+37945
+ Inspur(BeiJing) Electronic Information Industry Co.,Ltd
+ ShuangPeng Di
+ dishp&inspur.com
+37946
+ CJSC "Dzetta"
+ Sergey Levin
+ dzetta&dzetta.com
+37947
+ Banco Central del Ecuador
+ Hernan Gonzalez Lopez
+ eci&bce.ec
+37948
+ TOS.BG
+ Stoyan Petkov
+ info&tos.bg
+37949
+ TenneT TSO
+ Elsbeth Boer
+ websupport&tennet.eu
+37950
+ v-solution
+ Zhiyang Lu
+ Zhiy.lu&v-solution.cn
+37951
+ DataONE
+ Dave Vieglais
+ vieglais&ku.edu
+37952
+ MoCA by Design
+ Dan Kolis
+ dan_kolis&yahoo.com
+37953
+ ControlNet International Inc.
+ kenlee
+ kenlee&connet.com.tw
+37954
+ Kentix GmbH
+ Thomas Fritz
+ t.fritz&kentix.de
+37955
+ Nierhaus
+ Andre Nierhaus
+ andre&nierhaus.ch
+37956
+ EMH Healthcare
+ Tammy Smith
+ tsmith&emhrhs.org
+37957
+ Texas Regional Medical Center
+ Robert D. Reeves, Jr.
+ robert.reeves&trmcsunnyvale.com
+37958
+ http://www.sentinel-engine.org
+ Dusten Sobotta
+ dusten&sentinel-engine.org
+37959
+ paratio.com e.K.
+ Carsten Logemann
+ ldap¶tio.com
+37960
+ MINIADMIN
+ Christian Fohmann
+ post&miniadmin.de
+37961
+ COCUS AG
+ Alexander Janssen
+ ajanssen&cocus.com
+37962
+ Mindbender Technologies
+ Brent Irwin
+ brent&getmbt.com
+37963
+ Affirmed Networks, Inc.
+ Ming Yang
+ Ming_Yang&affirmednetworks.com
+37964
+ CTI Digital
+ Matt cockayne
+ m.cockayne&ctidigital.com
+37965
+ Altoona Regional Health System
+ Sean Murphy
+ smurphy&altoonaregional.org
+37966
+ Perth Linux Users Group
+ Timothy White
+ committee&plug.org.au
+37967
+ Webra JSC
+ Dmitry Ishutkin
+ spe&webra.ru
+37968
+ Elma Electronic GmbH
+ Timo Böhr
+ t.boehr&elma.de
+37969
+ OKSEI
+ Ivan Fedulov
+ ivanfedulov&gmail.com
+37970
+ Global Digital Inc.
+ Quest Chen
+ quest&gdnet.com.tw
+37971
+ EKILIA
+ Philippe Rongier
+ contact&ekilia.com
+37972
+ Dyalog Ltd
+ Andy Shiers
+ andys&dyalog.com
+37973
+ Mountain View Systems, LLC.
+ James Carrion
+ james_carrion&hotmail.com
+37974
+ Winthrop University Hospital
+ Dennis Rock
+ drock&winthrop.org
+37975
+ imessage.de
+ H.-Christian Schreiber
+ christian.schreiber&imessage.de
+37976
+ MetaFORM Bilisim Iletisim ve Danismanlik Ltd Sti
+ Zafer Genckaya
+ zafer&metaformltd.com
+37977
+ XTO Energy, Inc
+ Lee Scarborough
+ security_administrator&xtoenergy.com
+37978
+ TEB
+ MATHIEU Stéphane
+ smathieu&teb-online.com
+37979
+ Panaram Ltd
+ Garry Partington
+ garryp&panaram.com
+37980
+ Bayer Business Services GmbH
+ Oliver Wahn
+ ras-info&bayerBBS.com
+37981
+ Solution Concept s.r.o.
+ Ivo Jánský
+ ivo.jansky&solutionconcept.cz
+37982
+ Netstream AG
+ Alexis Caceda
+ alexis.caceda&netstream.ch
+37983
+ Nux Ltd.
+ Michal Charvat
+ michal.charvat&nux.cz
+37984
+ GsurfNET
+ Alessandro Pereira
+ cops&gsurfnet.com
+37985
+ CCDI
+ Qiu.haoqi
+ qiu.haoqi&ccdi.com.cn
+37986
+ mCarbon Tech innovation pvt. ltd.
+ Sushil Naresh
+ sushil&mcarbon.com
+37987
+ The Hong Kong Country Club
+ Robert S. HALL
+ rob.hall&countryclub.hk
+37988
+ Jack in the Box
+ Brent Irwin
+ brent.irwin&jackinthebox.com
+37989
+ FASTEK ITALIA S.R.L.
+ IGINO RUSSO
+ fastek&fastekitalia.it
+37990
+ Intellique
+ Emmanuel Florac
+ eflorac&intellique.com
+37991
+ Letechnic Ltd
+ Paul HEAYS
+ paul.heays&letechnic.com
+37992
+ SYSM Systemmanagement Service & Konzepte GmbH
+ Ralf Affeldt
+ ralf.affeldt&sysm.de
+37993
+ Hokkaido Telecommunication Network Co., Inc.
+ Hayaki Nakamoto
+ server-admins&hotnet.co.jp
+37994
+ i-free
+ Konstantin Egorov
+ egorov_k&i-free.com
+37995
+ Initiative für Netzfreiheit
+ Leonhard Preis
+ leonhard.preis&gmx.net
+37996
+ KTS GmbH
+ Gregor Kotyrba
+ g.kotyrba&kts-systeme.de
+37997
+ 4G Technology
+ GRENIER Gilles
+ gilles.grenier&4g-technology.eu
+37998
+ Greenwood Leflore Hospital
+ Marvin Pate
+ mpate&glh.org
+37999
+ TransPacket AS
+ Morten Rolland
+ mortenro&transpacket.com
+38000
+ DELEC Audio- und Videotechnik GmbH
+ Georg Klug
+ Georg.Klug&delec.de
+38001
+ DIgitata LTD
+ Hugo Mokken
+ snmp&digitata.com
+38002
+ Innovise ESM Software Ltd.
+ Mariano Korman
+ mariano.korman&innovise.com
+38003
+ StorMagic Ltd
+ Chris Farey
+ chris_farey&stormagic.com
+38004
+ Edenred SA
+ xiao hui loo
+ xiaohui.loo&edenred.com
+38005
+ REFLEXE Technologies
+ Christopher Brown
+ brown&reflexe.fr
+38006
+ Dietrich IT-Services
+ Daniel Dietrich
+ d.dietrich&dietrich-it.com
+38007
+ Handy Networks
+ Jon Aykroyd
+ jon&handynetworks.com
+38008
+ ELECOM S.A.S
+ Juan Manuel Franco Jácome
+ juanmfranco&gmail.com
+38009
+ FonSee Technology Inc.
+ Feng Yang, Chang
+ jeff_chang&fonsee.com
+38010
+ CE Labs
+ Srikanth Sherman
+ ssherman&celabs.net
+38011
+ NTTM (Name to Telephone Mapping) Limited
+ Emanuel Peri
+ pen&nttm.co.uk
+38012
+ USL, Inc.
+ Harold Hallikainen
+ harold&uslinc.com
+38013
+ Ampex Data Systems
+ Chris Douty
+ Chris_Douty&ex.com
+38014
+ NORICS GmbH
+ M. Glave
+ m.glave&norics.net
+38015
+ DUHA system s.r.o.
+ Pavel Brychta
+ pavel.brychta&duhasys.eu
+38016
+ Exicom Tele-Systems Limited
+ Ajay Kumar
+ kumar.ajay&exicom.in
+38017
+ SC EXIMTUR SRL
+ Mihai Limbasan
+ support&itsquad.ro
+38018
+ guideye.de
+ Peter Köhler
+ BigBoss19&web.de
+38019
+ Special Systems Engineering Center LLC
+ Maxim Goncharenko
+ max&ssec.ru
+38020
+ Franklin County Public Schools
+ John Vehmeier
+ john.vehmeier&frco.k12.va.us
End of Document
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/proto.c
^
|
| @@ -1,7 +1,7 @@
/* proto.c
* Routines for protocol tree
*
- * $Id: proto.c 34889 2010-11-15 21:38:16Z gerald $
+ * $Id: proto.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3684,7 +3684,12 @@
DISSECTOR_ASSERT(length >= 0);
fi->length = length;
- if (fi->value.ftype->ftype == FT_BYTES)
+ /*
+ * You cannot just make the "len" field of a GByteArray
+ * larger, if there's no data to back that length;
+ * you can only make it smaller.
+ */
+ if (fi->value.ftype->ftype == FT_BYTES && length <= fi->length)
fi->value.value.bytes->len = length;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/sminmpec.c
^
|
| @@ -8307,7 +8307,7 @@
{ 8311, "Police Information Technology Organization" },
{ 8312, "OskolNET JSC" },
{ 8313, "JARDiX AG" },
- { 8314, "PEUS Systems GmbH" },
+ { 8314, "AVL Emission Test Systems GmbH (previous was 'PEUS Systems GmbH')" },
{ 8315, "Minacom Labs Inc." },
{ 8316, "Staffwell" },
{ 8317, "FiberCycle Networks" },
@@ -14460,7 +14460,7 @@
{ 14566, "BMF" },
{ 14567, "Coventry University Enterprises Ltd" },
{ 14568, "Weiser" },
- { 14569, "Heidelberg" },
+ { 14569, "Heidelberger Druckmaschinen AG" },
{ 14570, "Majentis Technologies Inc." },
{ 14571, "Atomz Corporation" },
{ 14572, "EDIWISE" },
@@ -15142,7 +15142,7 @@
{ 15251, "Deutsche Telekom T-Com" },
{ 15252, "SB&C, Ltd." },
{ 15253, "Ceyba" },
- { 15254, "Intellipool AB" },
+ { 15254, "Kaseya Sweden AB (previous was 'Intellipool AB')" },
{ 15255, "Reliable Controls Corporation" },
{ 15256, "United Nations" },
{ 15257, "City Computing Limited" },
@@ -24360,7 +24360,7 @@
{ 24476, "Server-side Systems Ltd" },
{ 24477, "eenterphace" },
{ 24478, "megatrade corp." },
- { 24479, "E.ON IS Czech Republic s.r.o." },
+ { 24479, "E.ON IT Czech Republic s.r.o." },
{ 24480, "oncampusuk" },
{ 24481, "Warsaw Data Center Sp. z o.o." },
{ 24482, "Light Backup Services" },
@@ -26415,7 +26415,7 @@
{ 26531, "Kodak Imaging Network, Inc" },
{ 26532, "eB Technologies (M) Sdn. Bhd." },
{ 26533, "Nurun inc." },
- { 26534, "AEC/communications GmbH" },
+ { 26534, "think project! International (previous was 'AEC/communications GmbH')" },
{ 26535, "OMNEX Control Systems ULC" },
{ 26536, "Ringland Consulting LLC" },
{ 26537, "Riorey Inc." },
@@ -26792,7 +26792,7 @@
{ 26908, "Pictor Solutions, Inc." },
{ 26909, "SUBNET Solutions Inc." },
{ 26910, "Studentersamfundet ved Aalborg Universitet" },
- { 26911, "Third Brigade Inc." },
+ { 26911, "Trend Micro Inc. (previous was 'Third Brigade Inc.')" },
{ 26912, "Cheiron" },
{ 26913, "Group Logic, Inc." },
{ 26914, "TIME Networks Inc,." },
@@ -30175,7 +30175,7 @@
{ 30291, "Sujansky & Associates, LLC" },
{ 30292, "Monit24.pl" },
{ 30293, "Coll\0303\0250ge Dunoyer de Segonzac" },
- { 30294, "Innotrans Communications Inc." },
+ { 30294, "InnoTrans Communications Inc." },
{ 30295, "I2Net Christian Nordmann" },
{ 30296, "Innovation & Support Centre" },
{ 30297, "The Clockwork Lab" },
@@ -34450,7 +34450,7 @@
{ 34573, "Finaf S.p.A" },
{ 34574, "Blackbit Studio" },
{ 34575, "Kent Imaging Inc." },
- { 34576, "FH Emden/Leer" },
+ { 34576, "HS Emden/Leer" },
{ 34577, "Correlation Systems Ltd" },
{ 34578, "OpenNMS Sans Effort (OSE)" },
{ 34579, "SYM Technology, Inc." },
@@ -37579,7 +37579,7 @@
{ 37705, "CommSoft RMS LLC" },
{ 37706, "Netmedia Systems e. K." },
{ 37707, "Rocrail" },
- { 37708, "Systola Forwardingm GmbH" },
+ { 37708, "Systola Forwarding GmbH" },
{ 37709, "S3 Satcom Ltd" },
{ 37710, "Dane E. Jones" },
{ 37711, "FileMaker Inc" },
@@ -37630,6 +37630,268 @@
{ 37756, "The Ministry of Interior of the Republic of Croatia" },
{ 37757, "Newton Graphics, Inc." },
{ 37758, "Actidata Company" },
+ { 37759, "WXXR Network Technology Ltd. BEIJING" },
+ { 37760, "Powertech Automation Solutions Pvt. Ltd" },
+ { 37761, "Altitude Software" },
+ { 37762, "Neotion R&D" },
+ { 37763, "Bitxenio, S.L." },
+ { 37764, "Portel Servicios Telem\0303\0241ticos" },
+ { 37765, "LHERITIER" },
+ { 37766, "Beijing Banggoo Networks Co,Ltd." },
+ { 37767, "Gartner Inc." },
+ { 37768, "Bundesministerium f\0303\0274r Arbeit und Soziales" },
+ { 37769, "Koramis GmbH" },
+ { 37770, "IDmachines LLC" },
+ { 37771, "Linkwise Technology Private Limited" },
+ { 37772, "AERODEV" },
+ { 37773, "OAO NESK Novorossiyskenergosbit" },
+ { 37774, "51.6 Noord B.V." },
+ { 37775, "BaoBros Studio" },
+ { 37776, "Co. Ltd. \"RCS Labs\"" },
+ { 37777, "Cabinet Pierre Guerin" },
+ { 37778, "Northern Design (Electronics) Ltd" },
+ { 37779, "Nuvolas" },
+ { 37780, "MicroRIGHT Corporation" },
+ { 37781, "eZuce Inc" },
+ { 37782, "KindleIT" },
+ { 37783, "Wolf Pond Creative LLC" },
+ { 37784, "IDC Solutions Pty Ltd" },
+ { 37785, "Ingenieurbuero Jan F Westerkamp (IBW)" },
+ { 37786, "Galtronics Telemetry, Inc." },
+ { 37787, "Emirates Identity Authority" },
+ { 37788, "Syslife" },
+ { 37789, "Novapost SAS" },
+ { 37790, "Gould International UK Ltd" },
+ { 37791, "PortaOne, Inc." },
+ { 37792, "Enfuse Inc" },
+ { 37793, "Squirrel Solutions Ltd" },
+ { 37794, "DVR Support Center" },
+ { 37795, "Centre Hospitalier du Nord" },
+ { 37796, "PTS Group AG" },
+ { 37797, "Graylog2" },
+ { 37798, "Pcmedic" },
+ { 37799, "Coloriuris A.I.E." },
+ { 37800, "Aster Data Systems, Inc" },
+ { 37801, "Innovactive Engineering s.r.l." },
+ { 37802, "Sypris Solutions, Inc" },
+ { 37803, "California State University San Marcos" },
+ { 37804, "Spirit Software Solutions" },
+ { 37805, "Team Simoco Ltd." },
+ { 37806, "North Power Coporation (EVN NPC)" },
+ { 37807, "Instituto Tecnol\0303\0263gico de Canarias" },
+ { 37808, "FIBCOM INDIA LIMITED" },
+ { 37809, "Wnet Wisp S.r.l" },
+ { 37810, "PCE SYSTEMS" },
+ { 37811, "Glass Echidna" },
+ { 37812, "Kotkamills Oy" },
+ { 37813, "DSM Computer GmbH" },
+ { 37814, "Infinidat LTD" },
+ { 37815, "Friendly Runet Foundation" },
+ { 37816, "skweez.net" },
+ { 37817, "GMG Technologies" },
+ { 37818, "LEGALBOX" },
+ { 37819, "Technical Dabblings" },
+ { 37820, "Telecore LTD." },
+ { 37821, "untermStrich software gmbh" },
+ { 37822, "Wolfplex Hackerspace ASBL" },
+ { 37823, "Vimukti Technologies Private Limited" },
+ { 37824, "ECOLE NATIONALE VETERINAIRE D'ALFORT" },
+ { 37825, "Interregional Distribution Grid Company of Volga, JSC" },
+ { 37826, "ISL Internet Sicherheitsloesungen GmbH" },
+ { 37827, "WV Network for Educational Telecomputing (WVNet)" },
+ { 37828, "LIL'SYSTEMS" },
+ { 37829, "Puxlit" },
+ { 37830, "InCampus Pte Ltd" },
+ { 37831, "Techroutes Network" },
+ { 37832, "Clifford Chance LLP" },
+ { 37833, "Southern New Hampshire Medical Center" },
+ { 37834, "No23" },
+ { 37835, "Jerome Baum" },
+ { 37836, "CCM Benchmark Group" },
+ { 37837, "mikroVOX s.r.o." },
+ { 37838, "Futurad S.r.l." },
+ { 37839, "OneSystem S.A." },
+ { 37840, "Veda Advantage" },
+ { 37841, "Flughafen Z\0303\0274rich AG" },
+ { 37842, "Aicox Soluciones S.A." },
+ { 37843, "Adecco Group" },
+ { 37844, "Eastern Upper Peninsula ISD" },
+ { 37845, "VINCI S.A." },
+ { 37846, "MEDIAPRINT Zeitungs und Zeitschriften Verlags GesmbH" },
+ { 37847, "Business Information Intelligence Services" },
+ { 37848, "ORSENNA" },
+ { 37849, "Aris System" },
+ { 37850, "Slavic Gospel Association" },
+ { 37851, "YTY Enterprises" },
+ { 37852, "ECCOS inzenjering" },
+ { 37853, "OASIS Systems Pty Ltd" },
+ { 37854, "Crozer-Keystone Health System" },
+ { 37855, "The Reading Hospital and Medical Center" },
+ { 37856, "Essential Enterprise Solutions Inc." },
+ { 37857, "Veolia Environmental Services - North America" },
+ { 37858, "Synegen" },
+ { 37859, "Synerline sprl" },
+ { 37860, "Source Trading Co., Ltd." },
+ { 37861, "Austco Communication Systems" },
+ { 37862, "Suntel S.A." },
+ { 37863, "ETMC Regional Healthcare System" },
+ { 37864, "Cape Cod Healthcare" },
+ { 37865, "City and County of San Francisco, Department of Technology" },
+ { 37866, "Bank of New Zealand" },
+ { 37867, "APG" },
+ { 37868, "VirtualSharp Software" },
+ { 37869, "BruteCO Certificate Authority" },
+ { 37870, "Sensometrix SA" },
+ { 37871, "Digital Vision, s.r.o." },
+ { 37872, "Neko Consulting Ltd." },
+ { 37873, "J4care GmbH" },
+ { 37874, "CebaTech Inc." },
+ { 37875, "oogle Networks LLC" },
+ { 37876, "Delta Management AB" },
+ { 37877, "TITNC Alexander Seifarth" },
+ { 37878, "WineSkills" },
+ { 37879, "NetOrg LTD" },
+ { 37880, "Qowisio" },
+ { 37881, "ESCA" },
+ { 37882, "RedeCamp Ind. Com. e Servi\0303\0247os de Telecomunica\0303\0247\0303\0265es S.A." },
+ { 37883, "Vitaly Pashkov" },
+ { 37884, "Perfect Home AS" },
+ { 37885, "Renewable Funding, LLC" },
+ { 37886, "Coraid Inc." },
+ { 37887, "OraPharma, Inc." },
+ { 37888, "PROGIRIS" },
+ { 37889, "Accord Medical Management, LP DBA Nix Health Care System" },
+ { 37890, "Quality Fiber and RF Inc" },
+ { 37891, "Big Ant Studios Pty Ltd" },
+ { 37892, "GCT Semiconductor, Inc." },
+ { 37893, "BeyondTrust Software, Inc" },
+ { 37894, "aylite" },
+ { 37895, "LucidView" },
+ { 37896, "IFD Kapital" },
+ { 37897, "Maxwell Management Inc. (MMI)" },
+ { 37898, "\0303\0211ric Larivi\0303\0250re" },
+ { 37899, "Hahn Family" },
+ { 37900, "International Information Programs IR, Deptartment of State" },
+ { 37901, "Aeon Experienced Development" },
+ { 37902, "Polynet Ltd." },
+ { 37903, "CURUPIRA S/A" },
+ { 37904, "UnixServices" },
+ { 37905, "Beijing Jiaxun Feihong Electrical Co.,Ltd" },
+ { 37906, "Beijing WingMax Technology Co.,Ltd" },
+ { 37907, "Fusion Comm Solution Sdn Bhd" },
+ { 37908, "A puissance 3" },
+ { 37909, "Arantia 2010 S.L.U." },
+ { 37910, "Modesat Communications" },
+ { 37911, "CDP Communications Inc." },
+ { 37912, "Locomotive Software & Consulting" },
+ { 37913, "ZAO PTKB \"MERCURIY\"" },
+ { 37914, "TECNOTEL s.r.l." },
+ { 37915, "Shenzhen Zyeeda Information Technology Co. Ltd." },
+ { 37916, "Volvo Car Corporation AB" },
+ { 37917, "MarkitServ" },
+ { 37918, "SAGE Dining Services" },
+ { 37919, "NETMOON" },
+ { 37920, "DEXUS Holdings Pty Limited" },
+ { 37921, "Southwest Institute of Healing Arts" },
+ { 37922, "TeleMedia Systems, Inc." },
+ { 37923, "Freysteinn Alfredsson" },
+ { 37924, "NokianTyres LLC " },
+ { 37925, "mysql-cluster-snmp-monitor" },
+ { 37926, "Pranveer Singh Institute of Technology" },
+ { 37927, "RTLGroup" },
+ { 37928, "Sheffield Teaching Hospitals NHS Foundation Trust" },
+ { 37929, "PIPS Technology Ltd" },
+ { 37930, "Virus Stopper Foundation Registered NGO No 348 -2010" },
+ { 37931, "Bob Greene" },
+ { 37932, "Jack Storm" },
+ { 37933, "Westchester Medical Center" },
+ { 37934, "Confident Technologies, Inc." },
+ { 37935, "Danmarks Designskole" },
+ { 37936, "Calendar42" },
+ { 37937, "Schaffhausen Communication GmbH" },
+ { 37938, "Lake Hospital System, Inc." },
+ { 37939, "Reykjavik University" },
+ { 37940, "WRD Technology Co., Ltd." },
+ { 37941, "comForte 21 GmbH" },
+ { 37942, "Futuver S.A. de C.V." },
+ { 37943, "Medium Link System Technology CO., LTD" },
+ { 37944, "megalo & company" },
+ { 37945, "Inspur(BeiJing) Electronic Information Industry Co.,Ltd" },
+ { 37946, "CJSC \"Dzetta\"" },
+ { 37947, "Banco Central del Ecuador" },
+ { 37948, "TOS.BG" },
+ { 37949, "TenneT TSO" },
+ { 37950, "v-solution" },
+ { 37951, "DataONE" },
+ { 37952, "MoCA by Design" },
+ { 37953, "ControlNet International Inc." },
+ { 37954, "Kentix GmbH" },
+ { 37955, "Nierhaus" },
+ { 37956, "EMH Healthcare" },
+ { 37957, "Texas Regional Medical Center" },
+ { 37958, "http://www.sentinel-engine.org" },
+ { 37959, "paratio.com e.K." },
+ { 37960, "MINIADMIN" },
+ { 37961, "COCUS AG" },
+ { 37962, "Mindbender Technologies" },
+ { 37963, "Affirmed Networks, Inc." },
+ { 37964, "CTI Digital" },
+ { 37965, "Altoona Regional Health System" },
+ { 37966, "Perth Linux Users Group" },
+ { 37967, "Webra JSC" },
+ { 37968, "Elma Electronic GmbH" },
+ { 37969, "OKSEI" },
+ { 37970, "Global Digital Inc." },
+ { 37971, "EKILIA" },
+ { 37972, "Dyalog Ltd" },
+ { 37973, "Mountain View Systems, LLC." },
+ { 37974, "Winthrop University Hospital" },
+ { 37975, "imessage.de" },
+ { 37976, "MetaFORM Bilisim Iletisim ve Danismanlik Ltd Sti" },
+ { 37977, "XTO Energy, Inc" },
+ { 37978, "TEB" },
+ { 37979, "Panaram Ltd" },
+ { 37980, "Bayer Business Services GmbH" },
+ { 37981, "Solution Concept s.r.o." },
+ { 37982, "Netstream AG" },
+ { 37983, "Nux Ltd." },
+ { 37984, "GsurfNET" },
+ { 37985, "CCDI" },
+ { 37986, "mCarbon Tech innovation pvt. ltd." },
+ { 37987, "The Hong Kong Country Club" },
+ { 37988, "Jack in the Box" },
+ { 37989, "FASTEK ITALIA S.R.L." },
+ { 37990, "Intellique" },
+ { 37991, "Letechnic Ltd" },
+ { 37992, "SYSM Systemmanagement Service & Konzepte GmbH" },
+ { 37993, "Hokkaido Telecommunication Network Co., Inc." },
+ { 37994, "i-free" },
+ { 37995, "Initiative f\0303\0274r Netzfreiheit" },
+ { 37996, "KTS GmbH" },
+ { 37997, "4G Technology" },
+ { 37998, "Greenwood Leflore Hospital" },
+ { 37999, "TransPacket AS" },
+ { 38000, "DELEC Audio- und Videotechnik GmbH " },
+ { 38001, "DIgitata LTD" },
+ { 38002, "Innovise ESM Software Ltd." },
+ { 38003, "StorMagic Ltd" },
+ { 38004, "Edenred SA" },
+ { 38005, "REFLEXE Technologies" },
+ { 38006, "Dietrich IT-Services" },
+ { 38007, "Handy Networks" },
+ { 38008, "ELECOM S.A.S" },
+ { 38009, "FonSee Technology Inc." },
+ { 38010, "CE Labs" },
+ { 38011, "NTTM (Name to Telephone Mapping) Limited" },
+ { 38012, "USL, Inc." },
+ { 38013, "Ampex Data Systems" },
+ { 38014, "NORICS GmbH" },
+ { 38015, "DUHA system s.r.o." },
+ { 38016, "Exicom Tele-Systems Limited" },
+ { 38017, "SC EXIMTUR SRL" },
+ { 38018, "guideye.de" },
+ { 38019, "Special Systems Engineering Center LLC" },
+ { 38020, "Franklin County Public Schools" },
{ 0, NULL}
};
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/tvbuff.c
^
|
| @@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
- * $Id: tvbuff.c 35415 2011-01-07 00:49:51Z gerald $
+ * $Id: tvbuff.c 37257 2011-05-18 20:01:54Z gerald $
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -3111,9 +3111,9 @@
inflateEnd(strm);
g_free(strm);
g_free(strmbuf);
- g_free(compr);
if (uncompr == NULL) {
+ g_free(compr);
return NULL;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/epan/wslua/wslua_proto.c
^
|
| @@ -6,7 +6,7 @@
* (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org>
* (c) 2007, Tamas Regos <tamas.regos@ericsson.com>
*
- * $Id: wslua_proto.c 32771 2010-05-12 10:31:41Z etxrab $
+ * $Id: wslua_proto.c 37270 2011-05-19 00:29:51Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -655,8 +655,11 @@
int mask = luaL_optint(L, 5, 0x0);
const gchar* blob = luaL_optstring(L,6,NULL);
- if (base < BASE_DEC || base > BASE_HEX_DEC) {
- luaL_argerror(L,2,"Base must be either BASE_DEC, BASE_HEX, BASE_OCT,"
+ if (type == FT_FRAMENUM) {
+ if (base != BASE_NONE)
+ luaL_argerror(L, 3, "FT_FRAMENUMs must use BASE_NONE");
+ } else if (base < BASE_DEC || base > BASE_HEX_DEC) {
+ luaL_argerror(L, 3, "Base must be either BASE_DEC, BASE_HEX, BASE_OCT,"
" BASE_DEC_HEX, BASE_DEC_HEX or BASE_HEX_DEC");
return 0;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/gtk/mtp3_stat.c
^
|
| @@ -5,7 +5,7 @@
*
* Modified from gsm_map_stat.c
*
- * $Id: mtp3_stat.c 29028 2009-07-08 18:36:31Z etxrab $
+ * $Id: mtp3_stat.c 37221 2011-05-17 23:23:15Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -384,6 +384,9 @@
dlg_p->table = create_list();
+ gtk_widget_show(dlg_p->table);
+
+ gtk_container_add(GTK_CONTAINER(dlg_p->scrolled_win), dlg_p->table);
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/manuf
^
|
| @@ -4,7 +4,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf 36678 2011-04-17 16:04:39Z gerald $
+# $Id: manuf 37018 2011-05-08 16:04:42Z gerald $
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -3755,7 +3755,7 @@
00:0E:95 FujiyaDenk # Fujiya Denki Seisakusho Co.,Ltd.
00:0E:96 CubicDefen # Cubic Defense Applications, Inc.
00:0E:97 UltrackerT # Ultracker Technology CO., Inc
-00:0E:98 VitecCc # Vitec CC, INC.
+00:0E:98 HmeClear-C # HME Clear-Com LTD.
00:0E:99 SpectrumDi # Spectrum Digital, Inc
00:0E:9A BoeTechnol # BOE TECHNOLOGY GROUP CO.,LTD
00:0E:9B AmbitMicro # Ambit Microsystems Corporation
@@ -5453,7 +5453,7 @@
00:15:38 Rfid # RFID, Inc.
00:15:39 Technodriv # Technodrive SRL
00:15:3A ShenzhenSy # Shenzhen Syscan Technology Co.,Ltd.
-00:15:3B EmhElektri # EMH Elektrizitätszähler GmbH & CoKG
+00:15:3B EmhMeterin # EMH metering GmbH & Co. KG
00:15:3C Kprotech # Kprotech Co., Ltd.
00:15:3D ElimProduc # ELIM PRODUCT CO.
00:15:3E Q-MaticSwe # Q-Matic Sweden AB
@@ -10477,7 +10477,7 @@
00:40:B0 BytexEngin # BYTEX CORPORATION, ENGINEERING
00:40:B1 Codonics # CODONICS INC.
00:40:B2 Systemfors # SYSTEMFORSCHUNG
-00:40:B3 ParMicrosy # PAR MICROSYSTEMS CORPORATION
+00:40:B3 Partech # ParTech Inc.
00:40:B4 NextcomKK # NEXTCOM K.K.
00:40:B5 VideoTechn # VIDEO TECHNOLOGY COMPUTERS LTD
00:40:B6 Computerm # COMPUTERM CORPORATION
@@ -14303,6 +14303,34 @@
00:50:C2:E0:10:00/36 TycoTraffi # Tyco Traffic & Transportation
00:50:C2:E0:20:00/36 Cleverscop # Cleverscope
00:50:C2:E0:30:00/36 IcuScandin # ICU Scandinavia Schweiz GmbH
+00:50:C2:E0:40:00/36 SecEngPty # Sec.Eng Systems Pty Ltd
+00:50:C2:E0:50:00/36 Nocosium
+00:50:C2:E0:60:00/36 EbnerElect # Ebner Electronic GmbH
+00:50:C2:E0:70:00/36 ProtagonPr # Protagon Process Technologies GmbH
+00:50:C2:E0:80:00/36 KstTechnol # KST Technology
+00:50:C2:E0:90:00/36 Ateme
+00:50:C2:E0:A0:00/36 SiconSrl # Sicon srl
+00:50:C2:E0:B0:00/36 Seartech
+00:50:C2:E0:C0:00/36 YouhoElect # YOUHO ELECTRIC IND.,LTD.
+00:50:C2:E0:D0:00/36 UnixmediaS # Unixmedia Srl
+00:50:C2:E0:E0:00/36 PmacJapan # PMAC JAPAN
+00:50:C2:E0:F0:00/36 Trentino # Trentino Systems
+00:50:C2:E1:00:00/36 Radinetwor # Radinetworks Co., Ltd
+00:50:C2:E1:10:00/36 RfNeulink # RF Neulink
+00:50:C2:E1:20:00/36 Innolex
+00:50:C2:E1:30:00/36 Automation # Automation Assist Japan Company
+00:50:C2:E1:40:00/36 CalixtoPvt # Calixto Systems Pvt Ltd
+00:50:C2:E1:50:00/36 IhiScube # IHI Scube Co.,Ltd
+00:50:C2:E1:60:00/36 Jetstream # Jetstream Ltd.
+00:50:C2:E1:70:00/36 GallTankda # Gall Tankdatensysteme GmbH
+00:50:C2:E1:80:00/36 AbbTransmi # ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+00:50:C2:E1:90:00/36 ZoeMedical # Zoe Medical
+00:50:C2:E1:A0:00/36 RosslareEn # Rosslare Enterprises Limited
+00:50:C2:E1:B0:00/36 EmbeddedLa # Embedded Labs
+00:50:C2:E1:C0:00/36 Saia-Burge # Saia-Burgess Controls AG
+00:50:C2:E1:D0:00/36 HoldlineTe # Holdline Tecnologia e Sistemas Ltda
+00:50:C2:E1:E0:00/36 Lo-Q # Lo-Q plc
+00:50:C2:E1:F0:00/36 Elvees
00:50:C4 Imd
00:50:C5 AdsTechnol # ADS Technologies, Inc
00:50:C6 LoopTeleco # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -14623,6 +14651,7 @@
00:70:B3 DataRecall # DATA RECALL LTD.
00:72:98 KaonMedia # KAON MEDIA Co., Ltd.
00:78:9E Sagemcom
+00:7F:28 ActiontecE # Actiontec Electronics, Inc
00:80:00 Multitech # MULTITECH SYSTEMS, INC.
00:80:01 Periphonic # PERIPHONICS CORPORATION
00:80:02 SatelcomUk # SATELCOM (UK) LTD
@@ -15552,7 +15581,7 @@
00:C0:65 ScopeCommu # SCOPE COMMUNICATIONS, INC.
00:C0:66 Docupoint # DOCUPOINT, INC.
00:C0:67 UnitedBarc # UNITED BARCODE INDUSTRIES
-00:C0:68 PhilipDrak # PHILIP DRAKE ELECTRONICS LTD.
+00:C0:68 HmeClear-C # HME Clear-Com LTD.
00:C0:69 AxxceleraB # Axxcelera Broadband Wireless
00:C0:6A Zahner-Ele # ZAHNER-ELEKTRIK GMBH & CO. KG
00:C0:6B OsiPlus # OSI PLUS CORPORATION
@@ -16480,6 +16509,7 @@
0C:39:56 Observator # Observator instruments
0C:3C:65 DomeImagin # Dome Imaging Inc
0C:46:9D MsSedco # MS Sedco
+0C:51:F7 ChauvinArn # CHAUVIN ARNOUX
0C:60:76 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
0C:6E:4F Primevolt # PrimeVOLT Co., Ltd.
0C:74:C2 Apple # Apple Inc
@@ -16489,6 +16519,7 @@
0C:82:6A WuhanHuago # Wuhan Huagong Genuine Optics Technology Co., Ltd
0C:84:11 AOSmithWat # A.O. Smith Water Products
0C:8D:98 TopEightIn # TOP EIGHT IND CORP
+0C:92:4E RiceLakeWe # Rice Lake Weighing Systems
0C:A4:02 AlcatelLuc # Alcatel Lucent IPD
0C:A4:2A ObTelecomE # OB Telecom Electronic Technology Co., Ltd
0C:C3:A7 Meritec
@@ -16507,6 +16538,7 @@
0C:EF:7C Anacom # AnaCom Inc
0C:F0:B4 GlobalsatI # Globalsat International Technology Ltd
0C:F3:EE EmMicroele # EM Microelectronic
+0C:FC:83 AirohaTech # Airoha Technology Corp.,
10:00:00 Private
10:00:5A Ibm # IBM Corp
10:00:90 HP
@@ -16565,6 +16597,7 @@
14:6E:0A Private
14:73:73 TubitakUek # TUBITAK UEKAE
14:74:11 Rim
+14:7D:B3 JoaTelecom # JOA TELECOM.CO.,LTD
14:A6:2C SMDezacSA # S.M. Dezac S.A.
14:A8:6B ShenzhenTe # ShenZhen Telacom Science&Technology Co., Ltd
14:A9:E3 Mst # MST CORPORATION
@@ -16648,6 +16681,7 @@
20:21:A5 LgElectron # LG Electronics Inc
20:2B:C1 HuaweiDevi # Huawei Device Co., Ltd
20:2C:B7 KongYueEle # Kong Yue Electronics & Information Industry (Xinhui) Ltd.
+20:37:06 Cisco # Cisco Systems
20:40:05 Feno # feno GmbH
20:41:5A SmartehDOO # Smarteh d.o.o.
20:46:F9 AdvancedNe # Advanced Network Devices (dba:AND)
@@ -16721,6 +16755,7 @@
28:C0:DA JuniperNet # Juniper Networks
28:CC:FF Corporacio # Corporacion Empresarial Altra SL
28:CD:4C Individual # Individual Computers GmbH
+28:CF:DA Apple # Apple Inc
28:E2:97 ShanghaiIn # Shanghai InfoTM Microelectronics Co.,Ltd.
28:E7:94 MicrotimeC # Microtime Computer Inc.
28:E7:CF Apple # Apple, Inc.
@@ -16776,6 +16811,7 @@
30:52:5A Nst # NST Co., LTD
30:61:18 Paradom # Paradom Inc.
30:69:4B Rim
+30:71:B2 HangzhouPr # Hangzhou Prevail Optoelectronic Equipment Co.,LTD.
30:7C:30 Rim
30:87:30 HuaweiDevi # Huawei Device Co., Ltd
30:8C:FB Dropcam
@@ -16794,6 +16830,7 @@
34:86:2A HeinzLackm # Heinz Lackmann GmbH & Co KG
34:9A:0D ZbdDisplay # ZBD Displays Ltd
34:A1:83 Aware # AWare, Inc
+34:A5:5D Technosoft # TECHNOSOFT INTERNATIONAL SRL
34:A7:09 TrevilSrl # Trevil srl
34:AA:EE Mikrovisat # Mikrovisatos Servisas UAB
34:B5:71 Plds
@@ -16842,11 +16879,13 @@
3C:04:BF Pravis # PRAVIS SYSTEMS Co.Ltd.,
3C:05:AB ProductCre # Product Creation Studio
3C:07:54 Apple # Apple Inc
+3C:09:6D Powerhouse # Powerhouse Dynamics
3C:10:6F AlbahithTe # ALBAHITH TECHNOLOGIES
3C:19:15 GfiChronoT # GFI Chrono Time
3C:1A:79 HuayuanTec # Huayuan Technology CO.,LTD
3C:1C:BE JadakLlc # JADAK LLC
3C:26:D5 SoteraWire # Sotera Wireless
+3C:27:63 SleQuality # SLE quality engineering GmbH & Co. KG
3C:2D:B7 TexasInstr # Texas Instruments
3C:2F:3A Sforzato # SFORZATO Corp.
3C:39:C3 JwElectron # JW Electronics Co., Ltd.
@@ -16857,6 +16896,7 @@
3C:62:00 SamsungEle # Samsung electronics CO., LTD
3C:62:78 ShenzhenJe # SHENZHEN JETNET TECHNOLOGY CO.,LTD.
3C:67:2C Sciovid # Sciovid Inc.
+3C:6F:45 Fiberpro # Fiberpro Inc.
3C:74:37 Rim
3C:75:4A MotorolaMo # Motorola Mobility, Inc.
3C:8B:FE SamsungEle # Samsung Electronics
@@ -16876,6 +16916,7 @@
3C:F7:2A Nokia # Nokia Corporation
40:00:03 NetWare? # Net Ware (?)
40:01:C6 3comEurope # 3COM EUROPE LTD
+40:04:0C A&T
40:12:E4 Compass-Eo # Compass-EOS
40:13:D9 GlobalEs # Global ES
40:15:97 ProtectAme # Protect America, Inc.
@@ -16885,8 +16926,10 @@
40:22:ED DigitalPro # Digital Projection Ltd
40:25:C2 IntelCorpo # Intel Corporate
40:2B:A1 SonyEricss # Sony Ericsson Mobile Communications AB
+40:2C:F4 UniversalG # Universal Global Scientific Industrial Co., Ltd.
40:30:04 Apple # Apple, Inc.
40:37:AD MacroImage # Macro Image Technology, Inc.
+40:3C:FC Apple # Apple Inc
40:40:22 Ziv
40:40:6B Icomera
40:4A:03 ZyxelCommu # ZyXEL Communications Corporation
@@ -16904,6 +16947,7 @@
40:8B:F6 ShenzhenTc # Shenzhen TCL New Technology Co; Ltd.
40:95:58 Aisino # Aisino Corporation
40:97:D1 BkElectron # BK Electronics cc
+40:98:4E TexasInstr # Texas Instruments
40:98:7B Aisino # Aisino Corporation
40:A6:A4 Passivsyst # PassivSystems Ltd
40:A6:D9 Apple
@@ -16949,6 +16993,7 @@
44:8C:52 Ktis # KTIS CO., Ltd
44:8E:81 Vig
44:91:DB ShanghaiHu # Shanghai Huaqin Telecom Technology Co.,Ltd
+44:9C:B5 Alcomp # Alcomp, Inc
44:A4:2D TctMobile # TCT Mobile Limited
44:A6:89 PromaxElec # PROMAX ELECTRONICA SA
44:A7:CF MurataManu # Murata Manufacturing Co., Ltd.
@@ -16978,12 +17023,14 @@
48:54:E8 Winbond?
48:5B:39 AsustekCom # ASUSTek COMPUTER INC.
48:5D:60 AzurewaveT # Azurewave Technologies, Inc.
+48:60:BC Apple # Apple Inc
48:6B:91 FleetwoodG # Fleetwood Group Inc.
48:6F:D2 Storsimple # StorSimple Inc
48:71:19 SgbGroup # SGB GROUP LTD.
48:8E:42 Digalog # DIGALOG GmbH
48:91:F6 ShenzhenRe # Shenzhen Reach software technology CO.,LTD
48:AA:5D StoreElect # Store Electronic Systems
+48:C8:62 SimoWirele # Simo Wireless,Inc.
48:C8:B6 Systec # SysTec GmbH
48:CB:6E CelloElect # Cello Electronics (UK) Ltd
48:D8:FE ClaridySol # ClarIDy Solutions, Inc.
@@ -17011,6 +17058,7 @@
4C:63:EB Applicatio # Application Solutions (Electronics and Vision) Ltd
4C:73:67 GeniusByte # Genius Bytes Software Solutions GmbH
4C:73:A5 Kove
+4C:77:4F EmbeddedWi # Embedded Wireless Labs
4C:80:93 IntelCorpo # Intel Corporate
4C:8B:55 GrupoDigic # Grupo Digicon
4C:98:EF Zeo
@@ -17037,6 +17085,7 @@
50:79:5B Interexpor # Interexport Telecomunicaciones S.A.
50:7D:02 Biodit
50:87:B8 Nuvyyo # Nuvyyo Inc
+50:8A:CB ShenzhenMa # SHENZHEN MAXMADE TECHNOLOGY CO., LTD.
50:93:4F GradualTec # Gradual Tecnologia Ltda.
50:97:72 Westinghou # Westinghouse Digital
50:A6:E3 DavidClark # David Clark Company
@@ -17056,6 +17105,7 @@
54:04:96 Gigawave # Gigawave LTD
54:05:5F AlcatelLuc # Alcatel Lucent
54:31:31 RasterVisi # Raster Vision Ltd
+54:35:DF Symeo # Symeo GmbH
54:42:49 Sony # Sony Corporation
54:4A:05 WenglorSen # wenglor sensoric gmbh
54:5F:A9 Teracom # Teracom Limited
@@ -17092,6 +17142,7 @@
58:6D:8F Cisco-Link # Cisco-Linksys, LLC
58:6E:D6 Private
58:75:21 CjscRtsoft # CJSC RTSoft
+58:76:75 BeijingEch # Beijing ECHO Technologies Co.,Ltd
58:8D:09 Cisco # Cisco Systems
58:94:6B IntelCorpo # Intel Corporate
58:98:35 Technicolo # Technicolor
@@ -17112,6 +17163,7 @@
5C:0C:BB Celizion # CELIZION Inc.
5C:0E:8B Motorola
5C:14:37 Thyssenkru # Thyssenkrupp Aufzugswerke GmbH
+5C:16:C7 BigSwitchN # Big Switch Networks
5C:17:D3 Lge # LGE
5C:26:0A Dell # Dell Inc.
5C:33:8E AlphaNetwo # Alpha Networkc Inc.
@@ -17221,6 +17273,7 @@
64:F9:70 KenadeElec # Kenade Electronics Technology Co.,LTD.
64:F9:87 Avvasi # Avvasi Inc.
64:FC:8C Zonar # Zonar Systems
+68:05:CA Intel # Intel Corporation
68:12:2D SpecialIns # Special Instrument Development Co., Ltd.
68:1F:D8 AdvancedTe # Advanced Telemetry
68:23:4B NihonDengy # Nihon Dengyo Kousaku
@@ -17313,6 +17366,7 @@
70:8B:78 CitygrowTe # citygrow technology co., ltd
70:A1:91 Trendsette # Trendsetter Medical, LLC
70:A4:1C AdvancedWi # Advanced Wireless Dynamics S.L.
+70:B0:35 ShenzhenZo # Shenzhen Zowee Technology Co., Ltd
70:B0:8C ShenouComm # Shenou Communication Equipment Co.,Ltd
70:B2:65 HiltronSRL # Hiltron s.r.l.
70:B9:21 FiberhomeT # FiberHome Telecommunication Technologies CO.,LTD
@@ -17384,6 +17438,7 @@
78:81:8F ServerRack # Server Racks Australia Pty Ltd
78:84:3C Sony # Sony Corporation
78:84:EE IndraEspac # INDRA ESPACIO S.A.
+78:89:73 Cmc
78:8C:54 EnkomTechn # Enkom Technologies Ltd.
78:92:9C IntelCorpo # Intel Corporate
78:99:8F MedilineIt # MEDILINE ITALIA SRL
@@ -17395,6 +17450,7 @@
78:AC:C0 HewlettPac # Hewlett Packard
78:B6:C1 AoboTeleco # AOBO Telecom Co.,Ltd
78:B8:1A InterSales # INTER SALES A/S
+78:BE:B6 EnhancedVi # Enhanced Vision
78:C4:0E H&DWireles # H&D Wireless
78:C6:BB Innovasic # Innovasic, Inc.
78:CA:04 Nokia # Nokia Corporation
@@ -17408,6 +17464,7 @@
78:E4:00 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
78:E7:D1 HewlettPac # Hewlett Packard
78:EC:22 ShanghaiQi # Shanghai Qihui Telecom Technology Co., LTD
+78:EF:4C Unetconver # Unetconvergence Co., Ltd.
7C:03:4C Sagemcom
7C:05:1E Rafael # RAFAEL LTD.
7C:08:D9 ShanghaiEn # Shanghai Engineering Research Center for Broadband Technologies and Applications
@@ -17448,6 +17505,7 @@
7C:F0:5F Apple # Apple Inc
7C:F0:98 BeeBeansTe # Bee Beans Technologies, Inc.
7C:F0:BA LinkwellTe # Linkwell Telesystems Pvt Ltd
+7C:F4:29 Nuuo # NUUO Inc.
80:00:10 AttBellLab # ATT BELL LABORATORIES
80:14:40 SunlitSyst # Sunlit System Technology Corp
80:17:7D NortelNetw # Nortel Networks
@@ -17459,6 +17517,7 @@
80:38:FD LeapfrogEn # LeapFrog Enterprises, Inc.
80:39:E5 Patlite # PATLITE CORPORATION
80:3B:9A Ghe-CesEle # ghe-ces electronic ag
+80:47:31 PacketDesi # Packet Design, Inc.
80:4F:58 Thinkeco # ThinkEco, Inc.
80:50:1B Nokia # Nokia Corporation
80:58:C5 NovatecKom # NovaTec Kommunikationstechnik GmbH
@@ -17505,6 +17564,7 @@
84:EA:99 Vieworks
84:F6:4C CrossPoint # Cross Point BV
88:18:AE Tamron # Tamron Co., Ltd
+88:21:E3 NebusensSL # Nebusens, S.L.
88:25:2C ArcadyanTe # Arcadyan Technology Corporation
88:41:C1 OrbisatDaA # ORBISAT DA AMAZONIA IND E AEROL SA
88:43:E1 Cisco # Cisco Systems
@@ -17546,7 +17606,7 @@
8C:59:8B CTechnolog # C Technologies AB
8C:5C:A1 D-Broad # d-broad,INC
8C:5F:DF BeijingRai # Beijing Railway Signal Factory
-8C:64:0B BsStoritve # BS Storitve d.o.o.
+8C:64:0B Http://Sta # http://standards.ieee.org/about/bog/sppmt/target=%22_blank%22
8C:64:22 SonyEricss # Sony Ericsson Mobile Communications AB
8C:71:F8 SamsungEle # Samsung Electronics Co.,Ltd
8C:73:6E Fujitsu # Fujitsu Limited
@@ -17561,6 +17621,7 @@
8C:A0:48 BeijingNet # Beijing NeTopChip Technology Co.,LTD
8C:A9:82 IntelCorpo # Intel Corporate
8C:B6:4F Cisco # Cisco Systems
+8C:B8:64 AcsipTechn # AcSiP Technology Corp.
8C:D6:28 IkorMeteri # Ikor Metering
8C:DB:25 EsgSolutio # ESG Solutions
8C:DD:8D Wifly-City # Wifly-City System Inc.
@@ -17568,6 +17629,7 @@
8C:F9:C9 MesadaTech # MESADA Technology Co.,Ltd.
90:00:4E HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
90:09:17 Far-Sighte # Far-sighted mobile
+90:0D:66 DigimoreEl # Digimore Electronics Co., Ltd
90:18:AE ShanghaiMe # Shanghai Meridian Technologies, Co. Ltd.
90:19:00 ScsSa # SCS SA
90:21:55 Htc # HTC Corporation
@@ -17597,11 +17659,13 @@
90:A4:DE WistronNew # Wistron Neweb Corp.
90:A7:C1 PakedgeDev # Pakedge Device and Software Inc.
90:B8:D0 Joyent # Joyent, Inc.
+90:B9:7D JohnsonOut # Johnson Outdoors Marine Electronics d/b/a Minnkota
90:CF:15 Nokia # Nokia Corporation
90:D7:EB TexasInstr # Texas Instruments
90:D8:52 Comtec # Comtec Co., Ltd.
90:D9:2C Hug-Witsch # HUG-WITSCHI AG
90:E0:F0 IeeeP1722 # IEEE P1722
+90:E2:BA Intel # Intel Corporation
90:E6:BA AsustekCom # ASUSTek COMPUTER INC.
90:EA:60 SpiLasers # SPI Lasers Ltd
90:F2:78 RadiusGate # Radius Gateway
@@ -17642,6 +17706,7 @@
94:FE:F4 Sagemcom
98:03:A0 AbbNVPower # ABB n.v. Power Quality Products
98:03:D8 Apple # Apple, Inc.
+98:0C:82 SamsungEle # Samsung Electro Mechanics
98:0E:E4 Private
98:29:3F FujianStar # Fujian Start Computer Equipment Co.,Ltd
98:2C:BE 2wire
@@ -17687,6 +17752,7 @@
9C:6A:BE QeesAps # QEES ApS.
9C:75:14 WildixSrl # Wildix srl
9C:77:AA Nadasnv
+9C:7B:D2 NeolabConv # NEOLAB Convergence
9C:80:7D SyscableKo # SYSCABLE Korea Inc.
9C:8E:99 HewlettPac # Hewlett Packard
9C:93:4E Xerox # Xerox Corporation
@@ -17703,10 +17769,12 @@
9C:FF:BE Otsl # OTSL Inc.
A0:07:98 SamsungEle # Samsung Electronics
A0:0B:BA SamsungEle # SAMSUNG ELECTRO-MECHANICS
+A0:16:5C Tangotec # TangoTec Ltd.
A0:18:59 ShenzhenYi # Shenzhen Yidashi Electronics Co Ltd
A0:21:B7 Netgear
A0:23:1B TelecompR& # TeleComp R&D Corp.
A0:2E:F3 UnitedInte # United Integrated Services Co., Led.
+A0:36:9F Intel # Intel Corporation
A0:36:FA EttusResea # Ettus Research LLC
A0:3A:75 PssBelgium # PSS Belgium N.V.
A0:40:25 Actioncabl # Actioncable, Inc.
@@ -17736,6 +17804,7 @@
A0:DD:E5 Sharp # SHARP CORPORATION
A0:DE:05 Jsc"Irbis- # JSC "Irbis-T"
A0:E2:95 DatSystem # DAT System Co.,Ltd
+A0:E9:DB NingboFree # Ningbo FreeWings Technologies Co.,Ltd
A0:F2:17 GeMedicalS # GE Medical System(China) Co., Ltd.
A4:0C:C3 Cisco # Cisco Systems
A4:13:4E LuxulWirel # Luxul Wireless
@@ -17744,6 +17813,7 @@
A4:24:B3 FlatfrogLa # FlatFrog Laboratories AB
A4:33:D1 FibrlinkCo # Fibrlink Communications Co.,Ltd.
A4:38:FC PlasticLog # Plastic Logic
+A4:4B:15 SunCupidTe # Sun Cupid Technology (HK) LTD
A4:50:55 BuswareDe # busware.de
A4:56:1B Mcot # MCOT Corporation
A4:5A:1C Smart-Elec # smart-electronic GmbH
@@ -17864,17 +17934,20 @@
B0:97:3A E-Fuel # E-Fuel Corporation
B0:99:28 Fujitsu # Fujitsu Limited
B0:9A:E2 StemmerIma # STEMMER IMAGING GmbH
+B0:9B:D4 GnhSoftwar # GNH Software India Private Limited
B0:A1:0A Pivotal # Pivotal Systems Corporation
B0:A7:2A EnsembleDe # Ensemble Designs, Inc.
B0:AA:36 GuangdongO # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
B0:B3:2B SlicanSpZO # Slican Sp. z o.o.
B0:B8:D5 NanjingNen # Nanjing Nengrui Auto Equipment CO.,Ltd
B0:BD:A1 ZakladElek # ZAKLAD ELEKTRONICZNY SIMS
+B0:BF:99 Wizitdongd # WIZITDONGDO
B0:C6:9A JuniperNet # Juniper Networks
B0:C8:AD PeoplePowe # People Power Company
B0:E3:9D CatSystem # CAT SYSTEM CO.,LTD.
B0:E7:54 2wire
B0:E9:7E AdvancedMi # Advanced Micro Peripherals
+B0:F1:BC DhemaxInge # Dhemax Ingenieros Ltda
B4:01:42 GciScience # GCI Science & Technology Co.,LTD
B4:07:F9 SamsungEle # SAMSUNG ELECTRO-MECHANICS
B4:08:32 TcCommunic # TC Communications
@@ -17910,7 +17983,9 @@
B4:ED:54 WohlerTech # Wohler Technologies
B4:EE:D4 TexasInstr # Texas Instruments
B4:F3:23 Petatel # PETATEL INC.
+B4:FC:75 SemaElectr # SEMA Electronics(HK) CO.,LTD
B8:0B:9D RopexIndus # ROPEX Industrie-Elektronik GmbH
+B8:2A:DC EfrEuropï¿ # EFR Europ�ische Funk-Rundsteuerung GmbH
B8:3A:7B WorldplayC # Worldplay (Canada) Inc.
B8:3D:4E ShenzhenCu # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch
B8:41:5F Asp # ASP AG
@@ -17933,6 +18008,7 @@
B8:BE:BF Cisco # Cisco Systems
B8:C7:16 FiberhomeT # Fiberhome Telecommunication Technologies Co.,LTD
B8:C7:5D Apple # Apple Inc
+B8:CD:A7 MaxelerTec # Maxeler Technologies Ltd.
B8:D0:6F GuangzhouH # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
B8:D4:9D MSevenSyst # M Seven System Ltd.
B8:E5:89 PayterBv # Payter BV
@@ -18028,6 +18104,7 @@
C4:7B:2F BeijingJoi # Beijing JoinHope Image Technology Ltd.
C4:7D:4F Cisco # Cisco Systems
C4:82:3F FujianNewl # Fujian Newland Auto-ID Tech. Co,.Ltd.
+C4:85:08 Intel # Intel Corporation
C4:93:13 100fioNetw # 100fio networks technology llc
C4:AA:A1 SummitDeve # SUMMIT DEVELOPMENT, spol.s r.o.
C4:B5:12 GeneralEle # General Electric Digital Energy
@@ -18045,6 +18122,7 @@
C8:2E:94 HalfaEnter # Halfa Enterprise Co., Ltd.
C8:35:B8 EricssonEa # Ericsson, EAB/RWI/K
C8:3A:35 TendaTechn # Tenda Technology Co., Ltd.
+C8:3E:99 TexasInstr # Texas Instruments
C8:3E:A7 Kunbus # KUNBUS GmbH
C8:45:29 ImkNetwork # IMK Networks Co.,Ltd
C8:48:F5 MedisonXra # MEDISON Xray Co., Ltd
@@ -18116,6 +18194,7 @@
CC:F3:A5 ChiMeiComm # Chi Mei Communication Systems, Inc
CC:F6:7A AyeckaComm # Ayecka Communication Systems LTD
CC:F8:41 Lumewave
+CC:F9:54 Avaya # Avaya, Inc
CC:FC:6D RizTransmi # RIZ TRANSMITTERS
CC:FC:B1 WirelessTe # Wireless Technology, Inc.
D0:13:1E SunrexTech # Sunrex Technology Corp
@@ -18128,6 +18207,7 @@
D0:58:75 ActiveCont # Active Control Technology Inc.
D0:5F:CE HitachiDat # Hitachi Data Systems
D0:66:7B SamsungEle # Samsung Electronics Co., LTD
+D0:67:E5 Dell # Dell Inc
D0:75:BE RenoA&Amp; # Reno A&E
D0:7D:E5 ForwardPay # Forward Pay Systems, Inc.
D0:89:99 Apcon # APCON, Inc.
@@ -18138,6 +18218,7 @@
D0:B3:3F ShenzhenTi # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD.
D0:B5:3D SeproRobot # SEPRO ROBOTIQUE
D0:BB:80 ShlTelemed # SHL Telemedicine International Ltd.
+D0:C2:82 Cisco # Cisco Systems
D0:D0:FD Cisco # Cisco Systems
D0:D2:86 BeckmanCou # Beckman Coulter Biomedical K.K.
D0:D3:FC Mios # Mios, Ltd.
@@ -18157,6 +18238,7 @@
D4:4C:24 Vuppalamri # Vuppalamritha Magnetic Components LTD
D4:4C:A7 Informtekh # Informtekhnika & Communication, LLC
D4:4F:80 KemperDigi # Kemper Digital GmbH
+D4:52:51 IbtIngenie # IBT Ingenieurbureau Broennimann Thun
D4:52:97 NstreamsTe # nSTREAMS Technologies, Inc.
D4:5D:42 Nokia # Nokia Corporation
D4:66:A8 RiedoNetwo # Riedo Networks GmbH
@@ -18245,6 +18327,7 @@
DC:A7:D9 Compressor # Compressor Controls Corp
DC:A9:71 IntelCorpo # Intel Corporate
DC:CB:A8 ExploraTec # Explora Technologies Inc
+DC:CE:41 FeGlobalHo # FE GLOBAL HONG KONG LIMITED
DC:CF:94 BeijingRon # Beijing Rongcheng Hutong Technology Co., Ltd.
DC:D0:F7 Bentek # Bentek Systems Ltd.
DC:D3:21 HumaxTld # HUMAX co.,tld
@@ -18418,6 +18501,7 @@
F0:7B:CB HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
F0:7D:68 D-Link # D-Link Corporation
F0:81:AF IrzAutomat # IRZ AUTOMATION TECHNOLOGIES LTD
+F0:8B:FE Costel # COSTEL.,CO.LTD
F0:93:3A Nxtconect
F0:9C:BB Raonthink # RaonThink Inc.
F0:A7:64 Gst # GST Co., Ltd.
@@ -18446,6 +18530,7 @@
F4:0B:93 ResearchIn # Research In Motion
F4:1F:0B Yamabishi # YAMABISHI Corporation
F4:38:14 ShanghaiHo # Shanghai Howell Electronic Co.,Ltd
+F4:3D:80 FagIndustr # FAG Industrial Services GmbH
F4:3E:61 ShenzhenGo # Shenzhen Gongjin Electronics Co., Ltd
F4:3E:9D BenuNetwor # Benu Networks, Inc.
F4:42:27 SSResearch # S & S Research Inc.
@@ -18459,9 +18544,11 @@
F4:63:49 Diffon # Diffon Corporation
F4:6D:04 AsustekCom # ASUSTek COMPUTER INC.
F4:76:26 Viltechmed # Viltechmeda UAB
+F4:94:61 NexgenStor # NexGen Storage
F4:9F:54 SamsungEle # Samsung Electronics
F4:A5:2A HawaTechno # Hawa Technologies Inc
F4:AC:C1 Cisco # Cisco Systems
+F4:B1:64 LightningT # Lightning Telecommunications Technology Co. Ltd
F4:B5:49 YeastarTec # Yeastar Technology Co., Ltd.
F4:C7:14 HuaweiDevi # Huawei Device Co., Ltd
F4:C7:95 WeyElektro # WEY Elektronik AG
@@ -18517,6 +18604,7 @@
FC:5B:24 WeibelScie # Weibel Scientific A/S
FC:61:98 NecPersona # NEC Personal Products, Ltd
FC:68:3E DirectedPe # Directed Perception, Inc
+FC:6C:31 Lxinstrume # LXinstruments GmbH
FC:75:E6 Handreamne # Handreamnet
FC:7C:E7 FciUsaLlc # FCI USA LLC
FC:83:29 TreiTechni # Trei technics
@@ -18539,7 +18627,7 @@
#
# Well-known addresses.
#
-# $Id: manuf 36678 2011-04-17 16:04:39Z gerald $
+# $Id: manuf 37018 2011-05-08 16:04:42Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/packaging/macosx/Info.plist
^
|
| @@ -8,7 +8,7 @@
<key>CFBundleExecutable</key>
<string>Wireshark</string>
<key>CFBundleGetInfoString</key>
- <string>1.4.6, Copyright 1998-2011 Wireshark Development Team</string>
+ <string>1.4.7, Copyright 1998-2011 Wireshark Development Team</string>
<key>CFBundleIconFile</key>
<string>Wireshark.icns</string>
<key>CFBundleIdentifier</key>
@@ -24,7 +24,7 @@
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
- <string>pcap</string>
+ <string>application/vnd.tcpdump.pcap</string>
</array>
<key>CFBundleTypeName</key>
<string>Libpcap Network Capture</string>
@@ -42,11 +42,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.6</string>
+ <string>1.4.7</string>
<key>CFBundleSignature</key>
<string>Wshk</string>
<key>CFBundleVersion</key>
- <string>1.4.6</string>
+ <string>1.4.7</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1998-2011 Wireshark Developers, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/packaging/macosx/Info.plist.in
^
|
| @@ -24,7 +24,7 @@
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
- <string>pcap</string>
+ <string>application/vnd.tcpdump.pcap</string>
</array>
<key>CFBundleTypeName</key>
<string>Libpcap Network Capture</string>
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/services
^
|
| @@ -14,7 +14,7 @@
PORT NUMBERS
-(last updated 2011-04-14)
+(last updated 2011-05-27)
The port numbers are divided into three ranges: the Well Known Ports,
the Registered Ports, and the Dynamic and/or Private Ports.
@@ -6184,7 +6184,8 @@
# Per Sahlqvist <psahlqvi&sw.seisy.abb.se>
kofax-svr 2424/tcp KOFAX-SVR
kofax-svr 2424/udp KOFAX-SVR
-# Terry Reagan <treagan&kofax.com>
+# Previous contact: Terry Reagan <treagan&kofax.com>
+# Current contact: Steven Kilby <steven.kilby&kofax.com> 25 April 2011
fjitsuappmgr 2425/tcp Fujitsu App Manager
fjitsuappmgr 2425/udp Fujitsu App Manager
# Hiroyuki Kawabuchi <buchi&ael.fujitsu.co.jp>
@@ -10196,9 +10197,10 @@
ffserver 3825/tcp Antera FlowFusion Process Simulation
ffserver 3825/udp Antera FlowFusion Process Simulation
# Armin Liebchen <armin&anteradesign.com> June 2007
-wormux 3826/tcp Wormux server
-wormux 3826/udp Wormux server
-# DEFERT-SIMONNEAU <laurent_defert&yahoo.fr> June 2007
+warmux 3826/tcp WarMUX game server (Modified: 2011-05-26)
+warmux 3826/udp WarMUX game server (Modified: 2011-05-26)
+# Previous contact: DEFERT-SIMONNEAU <laurent_defert&yahoo.fr> June 2007
+# Current contact: Christophe Gisquet <christophe.gisquet&gmail.com> 26 May 2011
netmpi 3827/tcp Netadmin Systems MPI service
netmpi 3827/udp Netadmin Systems MPI service
# Göran Runfeldt <goran&netadmin.se> 10 July 2007
@@ -11907,7 +11909,10 @@
sia-ctrl-plane 4787/tcp Service Insertion Architecture (SIA) Control-Plane
# Shree Murthy <shree&cisco.com> 29 October 2009
# 4787/udp Reserved
-# 4788-4799 Unassigned
+xmcp 4788/tcp eXtensible Messaging Client Protocol
+# Glenn Matthews <glenn.matthews&cisco.com> 23 May 2011
+# 4788/udp Reserved
+# 4789-4799 Unassigned
iims 4800/tcp Icona Instant Messenging System
iims 4800/udp Icona Instant Messenging System
iwec 4801/tcp Icona Web Embedded Chat
@@ -12608,10 +12613,14 @@
hacl-poll 5315/tcp HA Cluster UDP Polling
hacl-poll 5315/udp HA Cluster UDP Polling
# Hoa Nguyen <hoan&cup.hp.com>
-hpdevms 5316/tcp HP Device Monitor Service
-hpdevms 5316/udp HP Device Monitor Service
-# Masato Maeda <Masato.Maeda&hp.com> 04 October 2007
-# 5317-5319 Unassigned
+hpbladems 5316/tcp HPBladeSystem Monitor Service (Modified: 2011-05-16)
+# Previous contact: Masato Maeda <Masato.Maeda&hp.com> 04 October 2007
+# Current contact: Alan Minchew <alan.minchew&hp.com> 23 May 2011
+# 5316/udp Unassigned (Removed on 2011-05-16)
+hpdevms 5317/tcp HP Device Monitor Service
+# Alan Minchew <alan.minchew&hp.com> 16 May 2011
+# 5317/udp Reserved
+# 5318-5319 Unassigned
bsfserver-zn 5320/tcp Webservices-based Zn interface of BSF
# Bert Paul <bert.paul&apertio.com> 01 May 2008
# 5320/udp Reserved
@@ -13163,13 +13172,24 @@
# 5901-5909 Unassigned
cm 5910/tcp Context Management
cm 5910/udp Context Management
+# Eivan Cerasi <eivan.cerasi&eurocontrol.int> 10 October 2008
+cm 5910/sctp Context Management
+# Justin Yu <yyu&mitre.org> 19 May 2011
cpdlc 5911/tcp Controller Pilot Data Link Communication
cpdlc 5911/udp Controller Pilot Data Link Communication
+# Eivan Cerasi <eivan.cerasi&eurocontrol.int> 10 October 2008
+cpdlc 5911/sctp Controller Pilot Data Link Communication
+# Justin Yu <yyu&mitre.org> 18 May 2011
fis 5912/tcp Flight Information Services
fis 5912/udp Flight Information Services
+# Eivan Cerasi <eivan.cerasi&eurocontrol.int> 10 October 2008
+fis 5912/sctp Flight Information Services
+# Justin Yu <yyu&mitre.org> 25 May 2011
ads-c 5913/tcp Automatic Dependent Surveillance
ads-c 5913/udp Automatic Dependent Surveillance
# Eivan Cerasi <eivan.cerasi&eurocontrol.int> 10 October 2008
+ads-c 5913/sctp Automatic Dependent Surveillance
+# Justin Yu <yyu&mitre.org> 25 May 2011
# 5914-5962 Unassigned
indy 5963/tcp Indy Application Server
indy 5963/udp Indy Application Server
@@ -13247,7 +13267,10 @@
dpm-acm 6075/tcp Microsoft DPM Access Control Manager
# Prabu Ambravaneswaran <prambravµsoft.com> 29 October 2009
# 6075/udp Reserved
-# 6076-6082 Unassigned
+# 6076-6081 Unassigned
+# 6082/tcp Reserved
+p25cai 6082/udp APCO Project 25 Common Air Interface - UDP encapsulation
+# APCO Project 25 (Steve Glass) <admin&sedition.org.au> 13 May 2011
# 6083/tcp Reserved
miami-bcast 6083/udp telecomsoftware miami broadcast
# Peter Steiner <steiner&telecomsoftware.com> 22 February 2011
@@ -13919,7 +13942,14 @@
talon-webserver 7015/tcp Talon Webserver
talon-webserver 7015/udp Talon Webserver
# Jim Thompson <jim.thompson&powerware.com>
-# 7016-7019 Unassigned
+##### 7011 and 7012 Unauthorized Use by RZG OpenAFS+OSD system #####
+# 7016-7017 Unassigned
+fisa-svc 7018/tcp FISA Service
+# FAUCONNET Ingnierie SA <dev&fisa.fr> 19 May 2011
+# 7018/udp Reserved
+doceri-ctl 7019/tcp doceri drawing service control
+doceri-view 7019/udp doceri drawing service screen view
+# Paul Brown <pbrown&spcontrols.com> 27 April 2011
dpserve 7020/tcp DP Serve
dpserve 7020/udp DP Serve
dpserveadmin 7021/tcp DP Serve Admin
@@ -14152,7 +14182,10 @@
ovbus 7501/tcp HP OpenView Bus Daemon
ovbus 7501/udp HP OpenView Bus Daemon
# David M. Rhodes <davidrho&cnd.hp.com>
-# 7502-7508 Unassigned
+# 7502-7507 Unassigned
+adcp 7508/tcp Automation Device Configuration Protocol
+# Holger Sachs <hlsa&de.festo.com 27 May 2011
+# 7508/udp Reserved
acplt 7509/tcp ACPLT - process automation service
# Henning Mersch <h.mersch&plt.rwth-aachen.de> 07 December 2010
# 7509/udp Reserved
@@ -14502,7 +14535,10 @@
fs-mgmt 8044/tcp FireScope Management Interface
# Matt Rogers <mrogers&firescope.com> 16 October 2008
# 8044/udp Reserved
-# 8045-8051 Unassigned
+# 8045-8050 Unassigned
+rocrail 8051/tcp Rocrail Client Service
+# Rob Versluis <r.j.versluis&rocrail.net> 23 May 2011
+# 8051/udp Reserved
senomix01 8052/tcp Senomix Timesheets Server
senomix01 8052/udp Senomix Timesheets Server
senomix02 8053/tcp Senomix Timesheets Client [1 year assignment]
@@ -14598,13 +14634,19 @@
isdd 8148/tcp i-SDD file transfer
isdd 8148/udp i-SDD file transfer
# Frank Waarsenburg <frank&eye-display.nl> November 2004
-# 8149-8159 Unassigned
+# 8149/tcp Reserved
+eor-game 8149/udp Edge of Reality game data
+# Sky Schulz <sky&edgeofreality.com> 09 May 2011
+# 8150-8159 Unassigned
patrol 8160/tcp Patrol
patrol 8160/udp Patrol
patrol-snmp 8161/tcp Patrol SNMP
patrol-snmp 8161/udp Patrol SNMP
# Portnoy Boxman <portnoy_boxman&bmc.com>
-# 8162-8181 Unassigned
+# 8162-8180 Unassigned
+intermapper 8181/tcp Intermapper network management system
+# William Fisher <william.w.fisher&intermapper.com> 09 May 2011
+# 8181/udp Reserved
vmware-fdm 8182/tcp VMware Fault Domain Manager
vmware-fdm 8182/udp VMware Fault Domain Manager
# Ron Passerini <rpasserini&vmware.com> 27 April 2010
@@ -14761,7 +14803,10 @@
fmtp 8500/tcp Flight Message Transfer Protocol
fmtp 8500/udp Flight Message Transfer Protocol
# Eivan Cerasi <eivan.cerasi&eurocontrol.int> December 2003
-# 8501-8553 Unassigned
+cmtp-mgt 8501/tcp CYTEL Message Transfer Management
+cmtp-av 8501/udp CYTEL Message Transfer Audio and Video
+# Frank Jkel <Frank.Jaekel&cytel.de> 29 April 2011
+# 8502-8553 Unassigned
rtsp-alt 8554/tcp RTSP Alternate (see port 554)
rtsp-alt 8554/udp RTSP Alternate (see port 554)
# Stephen Casner <casner&precept.com>
@@ -14888,7 +14933,10 @@
twds 8937/tcp Transaction Warehouse Data Service
# Lance M. Steenson <lance&transactionwarehouse.net> 18 September 2009
# 8937/udp Reserved
-# 8938-8953 Unassigned
+# 8938-8952 Unassigned
+ub-dns-control 8953/tcp unbound dns nameserver control
+# Wouter Wijngaards <wouter&nlnetlabs.nl> 10 May 2011
+# 8953/udp Reserved
cumulus-admin 8954/tcp Cumulus Admin Port
cumulus-admin 8954/udp Cumulus Admin Port
# Thomas Schleu <tschleu&canto.de>
@@ -16249,9 +16297,12 @@
irtrans 21000/tcp IRTrans Control
irtrans 21000/udp IRTrans Control
# Marcus Mueller <marcus&irtrans.de> November 2004
-# 21001-21553 Unassigned
-dfserver 21554/tcp MineScape Design File Server
-dfserver 21554/udp MineScape Design File Server
+# 21001-21552 Unassigned
+rdm-tfs 21553/tcp Raima RDM TFS
+# Paul Johnson <paul.johnson&raima.com> 02 May 2011
+# 21553/udp Reserved
+dfserver 21554/tcp MineScape Design File Server
+dfserver 21554/udp MineScape Design File Server
# Michael Purser <mrp&mincom.com> June 2006
# 21555-21589 Unassigned
vofr-gateway 21590/tcp VoFR Gateway
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/svnversion.h
^
|
| @@ -1,2 +1,2 @@
-#define SVNVERSION "SVN Rev 36706"
+#define SVNVERSION "SVN Rev 37483"
#define SVNPATH "/trunk-1.4"
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/tshark.c
^
|
| @@ -3,7 +3,7 @@
* Text-mode variant of Wireshark, along the lines of tcpdump and snoop,
* by Gilbert Ramirez <gram@alumni.rice.edu> and Guy Harris <guy@alum.mit.edu>.
*
- * $Id: tshark.c 35792 2011-02-03 22:53:50Z gerald $
+ * $Id: tshark.c 37443 2011-05-27 20:30:56Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2950,6 +2950,9 @@
buf_offset = 0;
*line_bufp = '\0';
for (i = 0; i < cf->cinfo.num_cols; i++) {
+ /* Skip columns not marked as visible. */
+ if (!get_column_visible(i))
+ continue;
switch (cf->cinfo.col_fmt[i]) {
case COL_NUMBER:
#ifdef HAVE_LIBPCAP
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/wireshark.desktop
^
|
| @@ -1,5 +1,5 @@
[Desktop Entry]
-# $Id: wireshark.desktop 23928 2007-12-20 14:16:13Z stig $
+# $Id: wireshark.desktop 37256 2011-05-18 19:32:19Z gerald $
# The format of this file is specified at
# http://freedesktop.org/Standards/desktop-entry-spec
# The entries are in the order they are listed in version 1.0
@@ -72,6 +72,7 @@
TryExec=wireshark
Exec=wireshark
Terminal=false
+MimeType=application/vnd.tcpdump.pcap;
# Categorie entry according to version 1.0 of
# http://www.freedesktop.org/wiki/Specifications/menu-spec
Categories=System;Monitor;GTK;
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/wiretap/netmon.c
^
|
| @@ -1,6 +1,6 @@
/* netmon.c
*
- * $Id: netmon.c 35424 2011-01-08 00:35:26Z gerald $
+ * $Id: netmon.c 37251 2011-05-18 18:21:32Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -151,12 +151,12 @@
WTAP_ENCAP_TOKEN_RING,
WTAP_ENCAP_FDDI_BITSWAPPED,
WTAP_ENCAP_ATM_PDUS, /* NDIS WAN - this is what's used for ATM */
- WTAP_ENCAP_UNKNOWN, /* NDIS LocalTalk */
+ WTAP_ENCAP_UNKNOWN, /* NDIS LocalTalk, but format 2.x uses it for IP-over-IEEE 1394 */
WTAP_ENCAP_IEEE802_11_NETMON_RADIO,
- /* NDIS "DIX" - used for 802.11 */
- WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET raw */
- WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET 878.2 */
- WTAP_ENCAP_UNKNOWN, /* NDIS ATM (no, this is NOT used for ATM) */
+ /* NDIS "DIX", but format 2.x uses it for 802.11 */
+ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET raw, but format 2.x uses it for "Tunneling interfaces" */
+ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET 878.2, but format 2.x uses it for "Wireless WAN" */
+ WTAP_ENCAP_RAW_IP, /* NDIS ATM (no, this is NOT used for ATM); format 2.x uses it for "Raw IP Frames" */
WTAP_ENCAP_UNKNOWN, /* NDIS Wireless WAN */
WTAP_ENCAP_UNKNOWN /* NDIS IrDA */
};
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/wiretap/pcapng.c
^
|
| @@ -1,6 +1,6 @@
/* pcapng.c
*
- * $Id: pcapng.c 35857 2011-02-07 19:39:56Z gerald $
+ * $Id: pcapng.c 37034 2011-05-09 20:49:13Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -56,7 +56,7 @@
#define pcapng_debug3(str,p1,p2,p3)
#endif
-static gboolean
+static gboolean
pcapng_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
static gboolean
@@ -324,7 +324,7 @@
/* sanity check: option length */
if (oh->option_length > len) {
- pcapng_debug2("pcapng_read_option: option_length %u larger than buffer (%u)",
+ pcapng_debug2("pcapng_read_option: option_length %u larger than buffer (%u)",
oh->option_length, len);
return 0;
}
@@ -411,7 +411,7 @@
pn->byte_swapped = TRUE;
pn->version_major = BSWAP16(shb.version_major);
pn->version_minor = BSWAP16(shb.version_minor);
-
+
/* tweak the block length to meet current swapping that we know now */
bh->block_total_length = BSWAP32(bh->block_total_length);
@@ -457,8 +457,8 @@
/* Options */
errno = WTAP_ERR_CANT_READ;
to_read = bh->block_total_length
- - (int)sizeof(pcapng_block_header_t)
- - (int)sizeof (pcapng_section_header_block_t)
+ - (int)sizeof(pcapng_block_header_t)
+ - (int)sizeof (pcapng_section_header_block_t)
- (int)sizeof(bh->block_total_length);
while(to_read > 0) {
/* read option */
@@ -602,9 +602,9 @@
/* Options */
errno = WTAP_ERR_CANT_READ;
- to_read = bh->block_total_length
- - (int)sizeof(pcapng_block_header_t)
- - (int)sizeof (pcapng_interface_description_block_t)
+ to_read = bh->block_total_length
+ - (int)sizeof(pcapng_block_header_t)
+ - (int)sizeof (pcapng_interface_description_block_t)
- (int)sizeof(bh->block_total_length);
while (to_read > 0) {
/* read option */
@@ -655,7 +655,7 @@
* char[] may not be aligned correctly.
*/
memcpy(&wblock->data.if_descr.if_speed, option_content, sizeof(guint64));
- if(pn->byte_swapped)
+ if(pn->byte_swapped)
wblock->data.if_descr.if_speed = BSWAP64(wblock->data.if_descr.if_speed);
pcapng_debug1("pcapng_read_if_descr_block: if_speed %" G_GINT64_MODIFIER "u (bps)", wblock->data.if_descr.if_speed);
} else {
@@ -733,7 +733,7 @@
}
-static int
+static int
pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info _U_, gboolean enhanced)
{
int bytes_read;
@@ -855,7 +855,7 @@
bytes_read = file_read((guchar *) (wblock->frame_buffer), 1, wblock->data.packet.cap_len - pseudo_header_len, fh);
if (bytes_read != (int) (wblock->data.packet.cap_len - pseudo_header_len)) {
*err = file_error(fh);
- pcapng_debug1("pcapng_read_packet_block: couldn't read %u bytes of captured data",
+ pcapng_debug1("pcapng_read_packet_block: couldn't read %u bytes of captured data",
wblock->data.packet.cap_len - pseudo_header_len);
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
@@ -889,8 +889,8 @@
/* Options */
errno = WTAP_ERR_CANT_READ;
- to_read = block_total_length
- - (int)sizeof(pcapng_block_header_t)
+ to_read = block_total_length
+ - (int)sizeof(pcapng_block_header_t)
- block_read /* fixed and variable part, including padding */
- (int)sizeof(bh->block_total_length);
while(to_read > 0) {
@@ -926,7 +926,7 @@
* char[] may not be aligned correctly.
*/
memcpy(&wblock->data.packet.pack_flags, option_content, sizeof(guint32));
- if(pn->byte_swapped)
+ if(pn->byte_swapped)
wblock->data.packet.pack_flags = BSWAP32(wblock->data.packet.pack_flags);
pcapng_debug1("pcapng_read_if_descr_block: pack_flags %u (ignored)", wblock->data.packet.pack_flags);
} else {
@@ -946,7 +946,7 @@
}
-static int
+static int
pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info _U_)
{
int bytes_read;
@@ -973,8 +973,8 @@
wblock->data.simple_packet.packet_len = spb.packet_len;
}
- wblock->data.simple_packet.cap_len = bh->block_total_length
- - (guint32)sizeof(pcapng_simple_packet_block_t)
+ wblock->data.simple_packet.cap_len = bh->block_total_length
+ - (guint32)sizeof(pcapng_simple_packet_block_t)
- (guint32)sizeof(bh->block_total_length);
if (wblock->data.simple_packet.cap_len > WTAP_MAX_PACKET_SIZE) {
@@ -1028,7 +1028,7 @@
bytes_read = file_read((guchar *) (wblock->frame_buffer), 1, wblock->data.simple_packet.cap_len, fh);
if (bytes_read != (int) wblock->data.simple_packet.cap_len) {
*err = file_error(fh);
- pcapng_debug1("pcapng_read_simple_packet_block: couldn't read %u bytes of captured data",
+ pcapng_debug1("pcapng_read_simple_packet_block: couldn't read %u bytes of captured data",
wblock->data.simple_packet.cap_len);
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
@@ -1052,7 +1052,7 @@
return block_read;
}
-static int
+static int
pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock,int *err, gchar **err_info _U_)
{
int bytes_read;
@@ -1091,8 +1091,8 @@
/* Options */
errno = WTAP_ERR_CANT_READ;
- to_read = bh->block_total_length
- - sizeof(pcapng_block_header_t)
+ to_read = bh->block_total_length
+ - sizeof(pcapng_block_header_t)
- block_read /* fixed and variable part, including padding */
- sizeof(bh->block_total_length);
while(to_read > 0) {
@@ -1128,7 +1128,7 @@
* char[] may not be aligned correctly.
*/
memcpy(&wblock->data.if_stats.isb_ifrecv, option_content, sizeof(guint64));
- if(pn->byte_swapped)
+ if(pn->byte_swapped)
wblock->data.if_stats.isb_ifrecv = BSWAP64(wblock->data.if_stats.isb_ifrecv);
pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifrecv %" G_GINT64_MODIFIER "u", wblock->data.if_stats.isb_ifrecv);
} else {
@@ -1141,7 +1141,7 @@
* char[] may not be aligned correctly.
*/
memcpy(&wblock->data.if_stats.isb_ifdrop, option_content, sizeof(guint64));
- if(pn->byte_swapped)
+ if(pn->byte_swapped)
wblock->data.if_stats.isb_ifdrop = BSWAP64(wblock->data.if_stats.isb_ifdrop);
pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifdrop %" G_GINT64_MODIFIER "u", wblock->data.if_stats.isb_ifdrop);
} else {
@@ -1158,7 +1158,7 @@
}
-static int
+static int
pcapng_read_unknown_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn _U_, wtapng_block_t *wblock _U_,int *err, gchar **err_info _U_)
{
int block_read;
@@ -1188,7 +1188,7 @@
}
-static int
+static int
pcapng_read_block(FILE_T fh, gboolean first_block, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info)
{
int block_read;
@@ -1201,8 +1201,8 @@
errno = WTAP_ERR_CANT_READ;
bytes_read = file_read(&bh, 1, sizeof bh, fh);
if (bytes_read != sizeof bh) {
- pcapng_debug0("pcapng_read_block: end of file or error");
*err = file_error(fh);
+ pcapng_debug3("pcapng_read_block: file_read() returned %d instead of %u, err = %d.", bytes_read, (unsigned int)sizeof bh, *err);
if (*err != 0)
return -1;
return 0;
@@ -1278,7 +1278,7 @@
if (!(block_total_length == bh.block_total_length)) {
*err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("pcapng_read_block: total block lengths (first %u and second %u) don't match",
+ *err_info = g_strdup_printf("pcapng_read_block: total block lengths (first %u and second %u) don't match",
bh.block_total_length, block_total_length);
return -1;
}
@@ -1288,7 +1288,7 @@
/* classic wtap: open capture file */
-int
+int
pcapng_open(wtap *wth, int *err, gchar **err_info)
{
int bytes_read;
@@ -1349,7 +1349,7 @@
/* classic wtap: read packet */
-static gboolean
+static gboolean
pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
{
pcapng_t *pcapng = (pcapng_t *)wth->priv;
@@ -1379,6 +1379,8 @@
while (1) {
bytes_read = pcapng_read_block(wth->fh, FALSE, pcapng, &wblock, err, err_info);
if (bytes_read <= 0) {
+ wth->data_offset = *data_offset;
+ pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset);
pcapng_debug0("pcapng_read: couldn't read packet block");
return FALSE;
}
@@ -1403,7 +1405,7 @@
interface_data_t int_data;
guint64 time_units_per_second;
gint id;
-
+
id = (gint)wblock.data.packet.interface_id;
int_data = g_array_index(pcapng->interface_data, interface_data_t, id);
time_units_per_second = int_data.time_units_per_second;
@@ -1415,6 +1417,8 @@
*err = WTAP_ERR_BAD_RECORD;
*err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.",
wblock.data.packet.interface_id, pcapng->number_of_interfaces);
+ wth->data_offset = *data_offset + bytes_read;
+ pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset);
return FALSE;
}
@@ -1581,7 +1585,7 @@
const guint32 zero_pad = 0;
guint32 pad_len;
guint32 phdr_len;
-
+
phdr_len = (guint32)pcap_get_phdr_size(wblock->data.packet.wtap_encap, wblock->pseudo_header);
if ((phdr_len + wblock->data.packet.cap_len) % 4) {
pad_len = 4 - ((phdr_len + wblock->data.packet.cap_len) % 4);
@@ -1701,13 +1705,13 @@
wblock.type = BLOCK_TYPE_IDB;
wblock.data.if_descr.link_type = wtap_wtap_encap_to_pcap_encap(phdr->pkt_encap);
wblock.data.if_descr.snap_len = wdh->snaplen; /* XXX */
-
+
/* XXX - options unused */
wblock.data.if_descr.if_speed = -1;
wblock.data.if_descr.if_tsresol = 6; /* default: usec */
wblock.data.if_descr.if_os = NULL;
wblock.data.if_descr.if_fcslen = -1;
-
+
if (!pcapng_write_block(wdh, &wblock, err)) {
return FALSE;
}
@@ -1738,7 +1742,7 @@
/* Split the 64-bit timestamp into two 32-bit pieces */
wblock.data.packet.ts_high = (guint32)(ts >> 32);
wblock.data.packet.ts_low = (guint32)ts;
-
+
wblock.data.packet.cap_len = phdr->caplen;
wblock.data.packet.packet_len = phdr->len;
wblock.data.packet.interface_id = interface_id;
@@ -1771,7 +1775,7 @@
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
failure */
-gboolean
+gboolean
pcapng_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err)
{
wtapng_block_t wblock;
@@ -1817,7 +1821,7 @@
pcapng_debug2("pcapng_dump_can_write_encap: encap = %d (%s)",
wtap_encap,
wtap_encap_string(wtap_encap));
-
+
/* Per-packet encapsulations is supported. */
if (wtap_encap == WTAP_ENCAP_PER_PACKET)
return 0;
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/wiretap/snoop.c
^
|
| @@ -1,6 +1,6 @@
/* snoop.c
*
- * $Id: snoop.c 33116 2010-06-06 22:19:30Z guy $
+ * $Id: snoop.c 37252 2011-05-18 18:30:02Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -473,6 +473,16 @@
rec_size = g_ntohl(hdr.rec_len);
orig_size = g_ntohl(hdr.orig_len);
packet_size = g_ntohl(hdr.incl_len);
+ if (orig_size > WTAP_MAX_PACKET_SIZE) {
+ /*
+ * Probably a corrupt capture file; don't blow up trying
+ * to allocate space for an immensely-large packet.
+ */
+ *err = WTAP_ERR_BAD_RECORD;
+ *err_info = g_strdup_printf("snoop: File has %u-byte original length, bigger than maximum of %u",
+ orig_size, WTAP_MAX_PACKET_SIZE);
+ return FALSE;
+ }
if (packet_size > WTAP_MAX_PACKET_SIZE) {
/*
* Probably a corrupt capture file; don't blow up trying
|
|
[-]
[+]
|
Changed |
wireshark-1.4.7.tar.bz2/wiretap/visual.c
^
|
| @@ -2,7 +2,7 @@
* File read and write routines for Visual Networks cap files.
* Copyright (c) 2001, Tom Nisbet tnisbet@visualnetworks.com
*
- * $Id: visual.c 33116 2010-06-06 22:19:30Z guy $
+ * $Id: visual.c 37258 2011-05-18 20:03:00Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -420,6 +420,15 @@
break;
}
+ if (wth->phdr.len > WTAP_MAX_PACKET_SIZE) {
+ /* Check if wth->phdr.len is sane, small values of wth.phdr.len before
+ the case loop above can cause integer underflows */
+ *err = WTAP_ERR_BAD_RECORD;
+ *err_info = g_strdup_printf("visual: File has %u-byte original packet, bigger than maximum of %u",
+ wth->phdr.len, WTAP_MAX_PACKET_SIZE);
+ return FALSE;
+ }
+
/* Sanity check */
if (wth->phdr.len < wth->phdr.caplen)
{
|
