|
[-]
[+]
|
Changed |
wireshark.changes
|
|
|
|
[-]
[+]
|
Changed |
wireshark.spec
^
|
|
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/ChangeLog
^
|
| @@ -1,294 +1,642 @@
------------------------------------------------------------------------
-r44531 | gerald | 2012-08-15 13:24:56 -0700 (Wed, 15 Aug 2012) | 2 lines
+r45265 | gerald | 2012-10-02 12:47:19 -0700 (Tue, 02 Oct 2012) | 2 lines
Changed paths:
- M /trunk-1.6/config.nmake
- M /trunk-1.6/configure.in
- M /trunk-1.6/debian/changelog
- M /trunk-1.6/debian/wireshark-common.files
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/Makefile.am
- M /trunk-1.6/make-version.pl
- M /trunk-1.6/version.conf
- M /trunk-1.6/wiretap/Makefile.am
+ M /trunk-1.6/ChangeLog
+
+Prep for 1.6.12.
+
+------------------------------------------------------------------------
+r45322 | gerald | 2012-10-04 12:36:34 -0700 (Thu, 04 Oct 2012) | 3 lines
+Changed paths:
+ M /trunk-1.6/Makefile.am
+
+Add a "patch-bzip2" target which creates a patch from the previous micro
+release.
+
+------------------------------------------------------------------------
+r45326 | gerald | 2012-10-04 15:51:00 -0700 (Thu, 04 Oct 2012) | 2 lines
+Changed paths:
+ M /trunk-1.6/Makefile.am
+
+Remove the previous distribution file.
+
+------------------------------------------------------------------------
+r45349 | jake | 2012-10-06 09:21:53 -0700 (Sat, 06 Oct 2012) | 7 lines
+Changed paths:
+ M /trunk-1.6/epan/emem.c
+ M /trunk-1.6/epan/emem.h
+
+------------------------------------------------------------------------
+r45340 | jake | 2012-10-06 16:35:59 +0200 (Sat, 06 Oct 2012) | 2 lines
+
+Vastly improve the debug presentation( of trees)+.
+
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r45357 | jake | 2012-10-06 14:55:05 -0700 (Sat, 06 Oct 2012) | 4 lines
+Changed paths:
+ M /trunk-1.6/epan/emem.c
-1.6.10 → 1.6.11.
+Fix for bug 7804:
+Have se_tree_lookup32_array_le() work through all of the search vector,
+don't bail out at a less than match.
------------------------------------------------------------------------
-r44584 | gerald | 2012-08-19 08:04:37 -0700 (Sun, 19 Aug 2012) | 1 line
+r45366 | gerald | 2012-10-07 08:04:17 -0700 (Sun, 07 Oct 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-08-19]
+[Automatic manuf, services and enterprise-numbers update for 2012-10-07]
------------------------------------------------------------------------
-r44598 | sake | 2012-08-20 12:42:17 -0700 (Mon, 20 Aug 2012) | 14 lines
+r45461 | guy | 2012-10-10 19:18:36 -0700 (Wed, 10 Oct 2012) | 17 lines
Changed paths:
- M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-http.c
+ M /trunk-1.6/epan/dissectors/packet-icmpv6.c
-Copy over revisions from the trunk:
+Copy over r54549 from trunk:
+
+ r45459 | guy | 2012-10-10 17:02:14 -0700 (Wed, 10 Oct 2012) | 13 lines
+
+ The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
+ not "for (i = 1; i < N+1; i++)".
+
+ Even if it weren't the idiom, it'd be safer, at least for unsigned
+ values, as, if i and N are the same width, and N has the maximum
+ possible value for that width, the first of those runs i from 0 to N-1,
+ all of which fit in a variable of that width, and the second of those
+ runs i from 1 to N, the latter of which doesn't fit into a variable of
+ that width, so modulo arithmetic turns it into 0 and the loop keeps
+ running forever.
+
+ Fixes bug 7844.
+
+------------------------------------------------------------------------
+r45466 | guy | 2012-10-11 01:29:46 -0700 (Thu, 11 Oct 2012) | 18 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-isup.c
+
+Copy over changes from trunk:
------------------------------------------------------------------------
- r44593 | sake | 2012-08-20 01:52:37 +0200 (ma, 20 aug 2012) | 5 lines
- Changed paths:
- M /trunk/epan/dissectors/packet-http.c
+ r45464 | guy | 2012-10-11 01:23:29 -0700 (Thu, 11 Oct 2012) | 4 lines
+
+ hf_isup_cic is now BASE_DEC, so there's no reason to use
+ proto_tree_add_uint_format() to make it display in decimal -
+ proto_tree_add_uint() suffices.
+ ------------------------------------------------------------------------
+ r45463 | etxrab | 2012-10-11 01:12:41 -0700 (Thu, 11 Oct 2012) | 4 lines
+
+ "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal
+ CIC number, not hex.
+
+
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r45488 | wmeier | 2012-10-11 14:09:46 -0700 (Thu, 11 Oct 2012) | 23 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-ndps.c
+
+Copy over from trunk
+
+------------------------------------------------------------------------
+r45486 | wmeier | 2012-10-11 17:01:51 -0400 (Thu, 11 Oct 2012) | 2 lines
+
+Correction to SVN #45476
+
+------------------------------------------------------------------------
+r45476 | wmeier | 2012-10-11 15:14:29 -0400 (Thu, 11 Oct 2012) | 12 lines
+
+Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'.
+
+The changes fix possibly problematical cases
+ (not clear upon quick inspection).
+
+Also: fix several bugs wherein an inner 'for' loop used
+the same index variable name as an outer loop thus
+messing up the outerloop.
+
+##backport
+
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r45493 | wmeier | 2012-10-11 15:16:32 -0700 (Thu, 11 Oct 2012) | 19 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-dmp.c
+ M /trunk-1.6/epan/dissectors/packet-dua.c
+ M /trunk-1.6/epan/dissectors/packet-fmp.c
+ M /trunk-1.6/epan/dissectors/packet-fmp_notify.c
+ M /trunk-1.6/epan/dissectors/packet-icmpv6.c
+ M /trunk-1.6/epan/dissectors/packet-ieee80211.c
+ M /trunk-1.6/epan/dissectors/packet-m3ua.c
+ M /trunk-1.6/epan/dissectors/packet-mongo.c
+ M /trunk-1.6/epan/dissectors/packet-ptp.c
+ M /trunk-1.6/epan/dissectors/packet-vnc.c
+
+Copy over from trunk (with manual intervention)
+
+------------------------------------------------------------------------
+r45477 | wmeier | 2012-10-11 15:20:21 -0400 (Thu, 11 Oct 2012) | 11 lines
+
+Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)
+
+The changes fix definite problems or
+are done "just in case" for cases not esily determined
+to be a problem by quick inspection.
+
+Note: in some cases for loop index variables have been renamed
+ to ensure all required codes changes detected.
+
+##backport
+
+------------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+r45502 | wmeier | 2012-10-12 12:35:07 -0700 (Fri, 12 Oct 2012) | 9 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-fmp_notify.c
+
+Copy over from trunk
+
+------------------------------------------------------------------------
+r45500 | wmeier | 2012-10-12 14:31:31 -0400 (Fri, 12 Oct 2012) | 2 lines
+
+Fix (what appears to be) a minor "off by one" bug in 'for' loop.
+
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r45506 | guy | 2012-10-12 13:52:47 -0700 (Fri, 12 Oct 2012) | 17 lines
+Changed paths:
+ M /trunk-1.6/wiretap/commview.c
- Enhance the http dissector to correctly reassemble http
- headers when the first tcp segment does not contain a
- full line.
+Copy over r45504 from trunk:
------------------------------------------------------------------------
-\nUpdate the release notes.
+ r45504 | guy | 2012-10-12 13:51:04 -0700 (Fri, 12 Oct 2012) | 14 lines
+
+ The "rate" field in the CommView NCF format is 1 byte long, not 2 bytes
+ long; that means we read only one byte into our structure, so make its
+ "rate" element one byte long, so we don't fill in half the "rate"
+ element with the read - and the *wrong* half on big-endian machines -
+ and leave the other half un-set and thus containing some random possibly
+ non-zero data.
+
+ In addition, that's not the full data rate for faster networks; for
+ Wi-Fi, the one-byte "direction" field is actually the upper 8 bits of
+ the data rate, so combine them when we fill in the data rate in the
+ pseudo-header.
+
+------------------------------------------------------------------------
+r45509 | guy | 2012-10-12 14:01:08 -0700 (Fri, 12 Oct 2012) | 9 lines
+Changed paths:
+ M /trunk-1.6/wiretap/commview.c
+
+Copy over r45507 from trunk:
+
+ ------------------------------------------------------------------------
+ r45507 | guy | 2012-10-12 13:59:08 -0700 (Fri, 12 Oct 2012) | 4 lines
+
+ And that also means that we need to split the data rate from the
+ pseudo-header into two bytes and fill in both the rate and direction
+ fields when writing CommView NCF files out.
------------------------------------------------------------------------
-r44678 | gerald | 2012-08-26 08:04:34 -0700 (Sun, 26 Aug 2012) | 1 line
+r45512 | guy | 2012-10-12 14:52:21 -0700 (Fri, 12 Oct 2012) | 3 lines
+Changed paths:
+ M /trunk-1.6/wiretap/commview.c
+
+Oops, the pseudo-header in 1.6.x has an 8-bit data rate field and can't
+handle data rates > 127.5 Mb/s; back out those changes.
+
+------------------------------------------------------------------------
+r45533 | gerald | 2012-10-14 08:04:55 -0700 (Sun, 14 Oct 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-08-26]
+[Automatic manuf, services and enterprise-numbers update for 2012-10-14]
+------------------------------------------------------------------------
+r45547 | guy | 2012-10-14 15:47:49 -0700 (Sun, 14 Oct 2012) | 33 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-ieee80211.c
+
+Copy over r45545 from trunk, with manual intervention:
+
+ ------------------------------------------------------------------------
+ r45545 | guy | 2012-10-14 15:38:58 -0700 (Sun, 14 Oct 2012) | 28 lines
+
+ According to
+
+ http://home.martin.cc/linux/prism
+
+ there's a set of DID type values different from the ones we were using,
+ and there are captures out there that use values from both sets.
+ Support both sets.
+
+ That page also says that a "status" value of 0 means "supplied"; treat
+ zero as meaning "supplied", and, if it's not zero for a field, don't
+ include it.
+
+ The "Mac Time" is, according to that page, the lower 32 bits of the MAC
+ timestamp; report it as such.
+
+ Fix some field names that were copied-and-pasted but not changed.
+
+ The RSSI and signal quality values are numbers, so show them in decimal.
+
+ The "signal" and "noise" values appear to be signed numbers, so make
+ them signed rather than unsigned and show them in decimal.
+
+ Show the data rate in the same style as it's shown in the radiotap
+ dissector.
+
+ Show the frame length in decimal; we probably have relatively few users
+ with 16 fingers.
+
+------------------------------------------------------------------------
+r45550 | guy | 2012-10-14 15:57:49 -0700 (Sun, 14 Oct 2012) | 19 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-iscsi.c
+
+Copy over revisions from trunk:
+
+ ------------------------------------------------------------------------
+ r45548 | guy | 2012-10-14 15:53:25 -0700 (Sun, 14 Oct 2012) | 2 lines
+
+ Clean up the "round up to a multiple of 4" code a bit.
+
+ ------------------------------------------------------------------------
+ r45524 | eapache | 2012-10-13 15:12:52 -0700 (Sat, 13 Oct 2012) | 9 lines
+
+ Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7858
+
+ Use a full 32-bit literal instead of just a 16-bit one. Fixes case where
+ the value we're &-ing with just slips over 2^16, making us get stuck
+ in an infinite loop.
+
+ I'm not sure this matches the iscsi spec anymore, the comment in the code
+ about padding bytes is ambiguous as to whether they're leading or trailing.
+
------------------------------------------------------------------------
-r44691 | pascal | 2012-08-28 07:28:48 -0700 (Tue, 28 Aug 2012) | 3 lines
+r45611 | guy | 2012-10-16 18:31:35 -0700 (Tue, 16 Oct 2012) | 18 lines
Changed paths:
- M /trunk-1.6/epan/dissectors/packet-gsm_a_gm.c
+ M /trunk-1.6/epan/dissectors/packet-ieee80211.c
+
+Copy over r45609 from trunk, with manual intervention:
+
+ ------------------------------------------------------------------------
+ r45609 | guy | 2012-10-16 18:23:13 -0700 (Tue, 16 Oct 2012) | 13 lines
+
+ The first 4 bytes of the Prism header are, apparently, a "message code",
+ and it apparently either has the value 0x00000044 or 0x00000041. If
+ those bytes aren't the magic number for an AVS header and aren't one of
+ those "message code" values, assume there's no Prism header, just an
+ 802.11 frame - that fixes at least one capture where some packets have
+ AVS radio headers and other packets have no radio header.
+
+ Note that this might also let us handle big-endian Prism headers (see
+ which byte order the message code is in, and assume everything else is
+ in the same byte order).
+
+ Display the message code in hex, not decimal.
-Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7670 :
-Use correct filter name and value string for the dissection of Qos attribute "Reliability Class" in GMM/SM message
+------------------------------------------------------------------------
+r45624 | guy | 2012-10-17 14:38:34 -0700 (Wed, 17 Oct 2012) | 7 lines
+Changed paths:
+ M /trunk-1.6/file.c
+
+Copy over r45621 from trunk:
+
+ ------------------------------------------------------------------------
+ r45621 | darkjames | 2012-10-17 14:14:14 -0700 (Wed, 17 Oct 2012) | 2 lines
+
+ Only cap_len (not pkt_len) bytes of buffer are valid.
------------------------------------------------------------------------
-r44740 | gerald | 2012-09-02 08:04:28 -0700 (Sun, 02 Sep 2012) | 1 line
+r45688 | gerald | 2012-10-21 08:04:18 -0700 (Sun, 21 Oct 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-09-02]
+[Automatic manuf, services and enterprise-numbers update for 2012-10-21]
------------------------------------------------------------------------
-r44822 | gerald | 2012-09-09 08:04:46 -0700 (Sun, 09 Sep 2012) | 1 line
+r45817 | gerald | 2012-10-28 08:04:27 -0700 (Sun, 28 Oct 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-09-09]
+[Automatic manuf, services and enterprise-numbers update for 2012-10-28]
------------------------------------------------------------------------
-r44926 | gerald | 2012-09-16 08:04:40 -0700 (Sun, 16 Sep 2012) | 1 line
+r45898 | gerald | 2012-11-04 08:05:20 -0800 (Sun, 04 Nov 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-09-16]
+[Automatic manuf, services and enterprise-numbers update for 2012-11-04]
+------------------------------------------------------------------------
+r45999 | gerald | 2012-11-11 08:04:51 -0800 (Sun, 11 Nov 2012) | 1 line
+Changed paths:
+ M /trunk-1.6/epan/enterprise-numbers
+ M /trunk-1.6/services
+
+[Automatic manuf, services and enterprise-numbers update for 2012-11-11]
------------------------------------------------------------------------
-r45069 | gerald | 2012-09-23 08:04:13 -0700 (Sun, 23 Sep 2012) | 1 line
+r46073 | gerald | 2012-11-18 08:04:32 -0800 (Sun, 18 Nov 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-09-23]
+[Automatic manuf, services and enterprise-numbers update for 2012-11-18]
+------------------------------------------------------------------------
+r46101 | wmeier | 2012-11-20 16:57:37 -0800 (Tue, 20 Nov 2012) | 10 lines
+Changed paths:
+ M /trunk-1.6/epan/dissectors/packet-ipv6.c
+
+Copy over from trunk:
------------------------------------------------------------------------
-r45222 | gerald | 2012-09-30 08:04:11 -0700 (Sun, 30 Sep 2012) | 1 line
+r46098 | wmeier | 2012-11-20 19:41:32 -0500 (Tue, 20 Nov 2012) | 4 lines
+
+From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.
+ipv6.framgent --> ipv6.fragment
+#BACKPORT
+
+------------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r46180 | gerald | 2012-11-25 08:04:34 -0800 (Sun, 25 Nov 2012) | 1 line
Changed paths:
M /trunk-1.6/epan/enterprise-numbers
M /trunk-1.6/manuf
M /trunk-1.6/services
-[Automatic manuf, services and enterprise-numbers update for 2012-09-30]
+[Automatic manuf, services and enterprise-numbers update for 2012-11-25]
------------------------------------------------------------------------
-r45233 | gerald | 2012-10-01 10:28:52 -0700 (Mon, 01 Oct 2012) | 42 lines
+r46225 | gerald | 2012-11-27 09:05:37 -0800 (Tue, 27 Nov 2012) | 21 lines
Changed paths:
- M /trunk-1.6/ChangeLog
- M /trunk-1.6/asn1/pcap/pcap.cnf
- M /trunk-1.6/asn1/ranap/ranap.cnf
- M /trunk-1.6/asn1/rrc/rrc.cnf
- M /trunk-1.6/asn1/rrlp/rrlp.cnf
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-pcap.c
- M /trunk-1.6/epan/dissectors/packet-per.c
- M /trunk-1.6/epan/dissectors/packet-ranap.c
- M /trunk-1.6/epan/dissectors/packet-rrc.c
- M /trunk-1.6/epan/dissectors/packet-rrlp.c
+ M /trunk-1.6/epan/dissectors/packet-usb.c
-Copy over r44500 from the trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r44510 | pascal | 2012-08-14 15:12:31 -0700 (Tue, 14 Aug 2012) | 3 lines
+ r45310 | martink | 2012-10-04 08:37:38 -0700 (Thu, 04 Oct 2012) | 10 lines
Changed paths:
- M /trunk/epan/dissectors/packet-per.c
+ M /trunk/epan/dissectors/packet-usb.c
- From Jan de Jongh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624 :
- dissect_per_constrained_integer_64b fails for 64 bits
+ try to fix usb-related fuzz test crashes
+
+ in dissect_usb_interface_descriptor() and
+ dissect_usb_endpoint_descriptor, the offset should be incremented
+ depending on the number of bytes we dissected, not based on the len
+ field (len field==0 would then cause an endless loop)
+
+ also fixed one occurrence of old_offset-offset, that's probably a typo,
+ the values will always be negative...
------------------------------------------------------------------------
-Copy over with manual intervention:
+Update the release notes.
+
+------------------------------------------------------------------------
+r46226 | gerald | 2012-11-27 09:08:10 -0800 (Tue, 27 Nov 2012) | 2 lines
+Changed paths:
+ M /trunk-1.6/doc/make-authors-format.pl
+ M /trunk-1.6/doc/make-authors-short.pl
+ M /trunk-1.6/doc/perlnoutf.pl
+ M /trunk-1.6/epan/dissectors/packet-agentx.c
+ M /trunk-1.6/epan/dissectors/packet-artnet.c
+ M /trunk-1.6/epan/dissectors/packet-cisco-sm.c
+ M /trunk-1.6/epan/dissectors/packet-classicstun.c
+ M /trunk-1.6/epan/dissectors/packet-enttec.c
+ M /trunk-1.6/epan/dissectors/packet-infiniband.c
+ M /trunk-1.6/epan/dissectors/packet-infiniband.h
+ M /trunk-1.6/epan/dissectors/packet-lwres.c
+ M /trunk-1.6/epan/dissectors/packet-opsi.c
+ M /trunk-1.6/epan/dissectors/packet-pcli.c
+ M /trunk-1.6/epan/dissectors/packet-rlm.c
+ M /trunk-1.6/epan/dissectors/packet-rtnet.c
+ M /trunk-1.6/epan/dissectors/packet-rudp.c
+ M /trunk-1.6/epan/dissectors/packet-sbus.c
+ M /trunk-1.6/epan/dissectors/packet-stun.c
+ M /trunk-1.6/epan/dissectors/packet-v5ua.c
+ M /trunk-1.6/tools/ncp2222.py
+ M /trunk-1.6/tools/process-x11-fields.pl
+ M /trunk-1.6/tools/process-x11-xcb.pl
+ M /trunk-1.6/tools/svnadd
+ M /trunk-1.6/wiretap/ascend.y
+ M /trunk-1.6/wiretap/ascend_scanner.l
+ M /trunk-1.6/wiretap/ascendtext.c
+ M /trunk-1.6/wiretap/ascendtext.h
+
+Remove a bunch of svn:mergeinfo properties.
+
+------------------------------------------------------------------------
+r46227 | gerald | 2012-11-27 09:20:27 -0800 (Tue, 27 Nov 2012) | 32 lines
+Changed paths:
+ M /trunk-1.6
+ M /trunk-1.6/docbook/release-notes.xml
+ M /trunk-1.6/epan/dissectors/packet-usb.c
+
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r44513 | pascal | 2012-08-15 06:42:46 -0700 (Wed, 15 Aug 2012) | 2 lines
+ r45742 | martink | 2012-10-23 14:02:28 -0700 (Tue, 23 Oct 2012) | 6 lines
Changed paths:
- M /trunk/asn1/lpp/lpp.cnf
- M /trunk/asn1/pcap/pcap.cnf
- M /trunk/asn1/ranap/ranap.cnf
- M /trunk/asn1/rrc/rrc.cnf
- M /trunk/asn1/rrlp/rrlp.cnf
- M /trunk/epan/dissectors/packet-lpp.c
- M /trunk/epan/dissectors/packet-pcap.c
- M /trunk/epan/dissectors/packet-ranap.c
- M /trunk/epan/dissectors/packet-rrc.c
- M /trunk/epan/dissectors/packet-rrlp.c
+ M /trunk/epan/dissectors/packet-usb.c
+
+ From Steve Magnani
+
+ fix USB descriptor parsing
+
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7909
+ ------------------------------------------------------------------------
+
+
+Copy over with manual intervention:
- Fix field type for some 64 bits header fields
------------------------------------------------------------------------
- r44533 | pascal | 2012-08-15 13:43:00 -0700 (Wed, 15 Aug 2012) | 2 lines
+ r45339 | eapache | 2012-10-06 07:23:44 -0700 (Sat, 06 Oct 2012) | 5 lines
Changed paths:
- M /trunk/asn1/rrlp/rrlp.cnf
- M /trunk/epan/dissectors/packet-rrlp.c
+ M /trunk
+ M /trunk/epan/dissectors/packet-usb.c
- Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits
+ Fix error caught by valgrind where we were running off the end of a
+ variable because we were passing the address of a single guint8 as a
+ char*. Work around it by making the guint8 an array and filling the last
+ element with 0 as if it were a null-terminated string.
------------------------------------------------------------------------
-Regenerate the ASN.1 dissectors.
Update the release notes.
------------------------------------------------------------------------
-r45234 | gerald | 2012-10-01 10:35:57 -0700 (Mon, 01 Oct 2012) | 14 lines
+r46228 | gerald | 2012-11-27 09:23:20 -0800 (Tue, 27 Nov 2012) | 13 lines
Changed paths:
+ M /trunk-1.6
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-drda.c
+ M /trunk-1.6/epan/dissectors/packet-isakmp.c
-Copy over r44749 from the trunk:
+Copy over revisions from the trunk:
------------------------------------------------------------------------
- r44749 | pascal | 2012-09-03 05:48:57 -0700 (Mon, 03 Sep 2012) | 3 lines
+ r45510 | pascal | 2012-10-12 14:06:27 -0700 (Fri, 12 Oct 2012) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-drda.c
+ M /trunk/epan/dissectors/packet-isakmp.c
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666 :
- Check that DRDA command has a minimum length of 10 bytes to prevent a potential infinite loop
+ Do not use private_data from caller dissector as IKEv2 decryption parameters
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r45235 | gerald | 2012-10-01 10:56:38 -0700 (Mon, 01 Oct 2012) | 70 lines
+r46229 | gerald | 2012-11-27 09:26:42 -0800 (Tue, 27 Nov 2012) | 16 lines
Changed paths:
+ M /trunk-1.6
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-gtpv2.c
- M /trunk-1.6/epan/dissectors/packet-icmp.c
- M /trunk-1.6/epan/dissectors/packet-icmpv6.c
- M /trunk-1.6/epan/dissectors/packet-ieee80211.c
- M /trunk-1.6/epan/emem.c
- M /trunk-1.6/gtk/voip_calls.c
+ M /trunk-1.6/epan/dissectors/packet-wtp.c
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r44790 | alagoutte | 2012-09-06 01:55:16 -0700 (Thu, 06 Sep 2012) | 16 lines
+ r45614 | martink | 2012-10-17 00:44:33 -0700 (Wed, 17 Oct 2012) | 5 lines
Changed paths:
- M /trunk/epan/dissectors/packet-ieee80211.c
+ M /trunk/epan/dissectors/packet-wtp.c
+
+ fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869
- From Masashi Honma via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691
- TKIP dissection : wrong IS_TKIP macro
+ make tpiLen a guint such that it can store 2 + tvb_get_guint8(...)
+ without overflow
+ ------------------------------------------------------------------------
- In [1] "11.4.2.2 TKIP MPDU formats", we could see below sentence.
- "WEPSeed[1] is not used to construct the TSC, but is set to (TSC1 | 0x20) &
- 0x7f."
- But the IS_TKIP macro only checks (WEPSeed[1] & 0x20).
- So sometimes IS_TKIP macro mis-dissects a CCMP frame as a TKIP frame.
+Update the release notes.
- This patch changes IS_TKIP macro to do more better check.
+------------------------------------------------------------------------
+r46230 | gerald | 2012-11-27 09:42:23 -0800 (Tue, 27 Nov 2012) | 14 lines
+Changed paths:
+ M /trunk-1.6/docbook/release-notes.xml
+ M /trunk-1.6/epan/dissectors/packet-rtcp.c
- [1] IEEE Std 802.11.-2012
+Copy over with manual intervention:
- #BACKPORT(1.8, 1.6)
------------------------------------------------------------------------
- r44844 | morriss | 2012-09-10 08:18:17 -0700 (Mon, 10 Sep 2012) | 6 lines
+ r45717 | cmaynard | 2012-10-22 09:22:21 -0700 (Mon, 22 Oct 2012) | 3 lines
Changed paths:
- M /trunk/epan/emem.c
-
- Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699
- and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979 :
+ M /trunk/epan/dissectors/packet-rtcp.c
- Don't cast the buffer address to int on Win32: a 64-bit address won't
- fit in an integer.
+ Avoid potential infinite loops. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7879
+ #BACKPORT (1.8, 1.6)
------------------------------------------------------------------------
- r44880 | morriss | 2012-09-11 06:11:33 -0700 (Tue, 11 Sep 2012) | 4 lines
- Changed paths:
- M /trunk/epan/emem.c
- As suggested by Anatoly in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699 :
- Followup to r44844: use a better cast (intptr_t instead of long long).
- ------------------------------------------------------------------------
+Update the release notes.
+------------------------------------------------------------------------
+r46231 | gerald | 2012-11-27 10:00:37 -0800 (Tue, 27 Nov 2012) | 50 lines
+Changed paths:
+ M /trunk-1.6
+ M /trunk-1.6/docbook/release-notes.xml
+ M /trunk-1.6/epan/radius_dict.l
-Copy over with manual intervention:
+Copy over fixes for bug 7803 from the trunk:
------------------------------------------------------------------------
- r44881 | pascal | 2012-09-12 03:21:00 -0700 (Wed, 12 Sep 2012) | 3 lines
+ r45354 | eapache | 2012-10-06 13:47:35 -0700 (Sat, 06 Oct 2012) | 6 lines
Changed paths:
- M /trunk/epan/dissectors/packet-gtpv2.c
+ M /trunk
+ M /trunk/epan/radius_dict.l
- From Esa Haapamäki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7718 :
- Fix dissection of NAS Uplink and Downlink Count in MM Context IE
+ Work around bug 7803 by not freeing the old name value until after it's been
+ replaced in the key-set of the hash table. This doesn't really provide proper
+ behaviour, it just stops us from accessing freed memory.
+
+ Also, add modelines.
------------------------------------------------------------------------
- r44940 | etxrab | 2012-09-17 07:51:08 -0700 (Mon, 17 Sep 2012) | 1 line
+ r45359 | eapache | 2012-10-06 16:56:56 -0700 (Sat, 06 Oct 2012) | 6 lines
Changed paths:
- M /trunk/ui/gtk/voip_calls.c
+ M /trunk
+ M /trunk/epan/radius_dict.l
+
+ Clean up better if we can't open a radius dictionary included by another
+ radius dictionary. One of many issues with the way we load radius
+ dictionaries.
- callsinfo->stop_fd not set in all branches for UNISTIM.
+ Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803
------------------------------------------------------------------------
- r45007 | cmaynard | 2012-09-19 10:57:54 -0700 (Wed, 19 Sep 2012) | 2 lines
+ r45360 | eapache | 2012-10-06 17:06:21 -0700 (Sat, 06 Oct 2012) | 7 lines
Changed paths:
- M /trunk/epan/dissectors/packet-icmp.c
- M /trunk/epan/dissectors/packet-icmpv6.c
+ M /trunk
+ M /trunk/epan/radius_dict.l
- Fix request/response tracking with checksum corner case.
+ Don't destroy the in-memory radius dictionary if we hit a parse error:
+ - If it's something as simple as a missing $INCLUDE then we probably still want
+ whatever we could parse
+ - We weren't doing it consistently anyways
+ - There were a whole bunch of places where we were using it regardless of
+ whether or not the parse failed, leading to read-after-free errors.
+ ------------------------------------------------------------------------
+ r45361 | eapache | 2012-10-06 18:15:16 -0700 (Sat, 06 Oct 2012) | 4 lines
+ Changed paths:
+ M /trunk
+ M /trunk/epan/radius_dict.l
+
+ Clean up properly when we can't find a radius $INCLUDE regardless of the
+ state of errno. Don't treat it as a fatal parse error because it isn't,
+ so we keep parsing the rest of the dictionaries even if one is missing.
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r45236 | gerald | 2012-10-01 11:13:02 -0700 (Mon, 01 Oct 2012) | 60 lines
+r46232 | gerald | 2012-11-27 10:15:23 -0800 (Tue, 27 Nov 2012) | 51 lines
Changed paths:
- M /trunk-1.6/doc/README.plugins
+ M /trunk-1.6
M /trunk-1.6/docbook/release-notes.xml
- M /trunk-1.6/epan/dissectors/packet-image-jfif.c
- M /trunk-1.6/epan/dissectors/packet-scsi.c
- M /trunk-1.6/epan/dissectors/packet-smb-common.c
- M /trunk-1.6/gtk/hostlist_table.c
- M /trunk-1.6/ipmap.html
- A /trunk-1.6/plugins/Custom.m4.example (from /trunk/plugins/Custom.m4.example:45142)
- A /trunk-1.6/plugins/Custom.make.example (from /trunk/plugins/Custom.make.example:45142)
- M /trunk-1.6/plugins/Custom.nmake.example
- M /trunk-1.6/plugins/Makefile.am
+ M /trunk-1.6/epan/dissectors/packet-ieee80211.c
+ M /trunk-1.6/epan/dissectors/packet-ieee802154.c
+ M /trunk-1.6/epan/dissectors/packet-smb2.c
+ M /trunk-1.6/gtk/color_edit_dlg.c
+ M /trunk-1.6/gtk/gui_utils.c
+ M /trunk-1.6/print.ps
Copy over revisions from the trunk:
------------------------------------------------------------------------
- r45142 | jake | 2012-09-25 14:02:13 -0700 (Tue, 25 Sep 2012) | 1 line
+ r45321 | jake | 2012-10-04 12:30:15 -0700 (Thu, 04 Oct 2012) | 2 lines
Changed paths:
- M /trunk/doc/README.plugins
- A /trunk/plugins/Custom.m4.example
- A /trunk/plugins/Custom.make.example
- M /trunk/plugins/Custom.nmake.example
- M /trunk/plugins/Makefile.am
+ M /trunk/epan/dissectors/packet-ieee80211.c
- Implement and document the Custom plugin system. Create relevant example files and add them to the distribution. Rewrite README.plugins to describe how to use this system.
+ From Sven Eckelmann:
+ Fix dissection of IEEE 802.11 Channel Switch Announcement element.
------------------------------------------------------------------------
- r45150 | cmaynard | 2012-09-26 09:48:20 -0700 (Wed, 26 Sep 2012) | 4 lines
+ r45559 | etxrab | 2012-10-15 08:59:47 -0700 (Mon, 15 Oct 2012) | 5 lines
Changed paths:
- M /trunk/epan/dissectors/packet-smb-common.c
+ M /trunk/epan/dissectors/packet-ieee802154.c
- In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ...
+ From Rakesh Kumar:
+ Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function.
+ Offset should be +8 not +4
+ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7864
+ ------------------------------------------------------------------------
+ r45660 | cmaynard | 2012-10-19 11:05:02 -0700 (Fri, 19 Oct 2012) | 3 lines
+ Changed paths:
+ M /trunk/print.ps
+
+ Add back the "%!" removed in r33773; otherwise, for some unknown reason, only 1 page will be viewable. (Tested w/gsview 5.0 and ghostscript 9.06)
#BACKPORT(1.8, 1.6)
------------------------------------------------------------------------
@@ -296,56 +644,72 @@
Copy over with manual intervention:
------------------------------------------------------------------------
- r45111 | pascal | 2012-09-24 12:42:12 -0700 (Mon, 24 Sep 2012) | 3 lines
+ r45331 | cmaynard | 2012-10-05 07:51:31 -0700 (Fri, 05 Oct 2012) | 2 lines
Changed paths:
- M /trunk/epan/dissectors/packet-scsi.c
+ M /trunk/ui/gtk/gui_utils.c
- From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7753 :
- Fix display of WRITE BUFFER and SEND DIAGNOSTIC fields in SCSI dissector
+ A minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug 553. This change takes into account that viewable_area.[x|y] may not be 0,0. Will this finally fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553 ?Unknown, but I am unable to reproduce it.
------------------------------------------------------------------------
- r45146 | cmaynard | 2012-09-25 20:30:48 -0700 (Tue, 25 Sep 2012) | 3 lines
+ r45820 | martink | 2012-10-28 12:13:54 -0700 (Sun, 28 Oct 2012) | 6 lines
Changed paths:
- M /trunk/ipmap.html
- M /trunk/ui/gtk/hostlist_table.c
+ M /trunk/ui/gtk/color_edit_dlg.c
+
+ fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913
+
+ When we create a new color filter, we prepend the color filter list with
+ a default entry and launch an edit dialogue. If the user cancels, we
+ have to remove this _first_ entry from the list (not the last one).
+ ------------------------------------------------------------------------
+
+Update the release notes.
+
+------------------------------------------------------------------------
+r46233 | gerald | 2012-11-27 10:19:47 -0800 (Tue, 27 Nov 2012) | 26 lines
+Changed paths:
+ M /trunk-1.6
+ M /trunk-1.6/docbook/release-notes.xml
+ M /trunk-1.6/epan/dissectors/packet-tpncp.c
+
+Copy over revisions from the trunk:
- Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5016 - No markers show up when maps are displayed.
- #BACKPORT(1.8, 1.6)
------------------------------------------------------------------------
- r45148 | cmaynard | 2012-09-26 05:54:46 -0700 (Wed, 26 Sep 2012) | 3 lines
+ r46003 | eapache | 2012-11-11 12:29:06 -0800 (Sun, 11 Nov 2012) | 7 lines
Changed paths:
- M /trunk/ui/gtk/hostlist_table.c
+ M /trunk/epan/dissectors/packet-tpncp.c
+
+ Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6665
- Revision 45146 fixed only the first map. This patch fixes all maps.
- #BACKPORT(1.6, 1.8)
+ Make sure the array of names is always null-terminated, even if we have
+ enough names to fill the entire thing. Also use a gboolean instead of a
+ gint for one variable.
------------------------------------------------------------------------
- r45174 | cmaynard | 2012-09-27 07:02:37 -0700 (Thu, 27 Sep 2012) | 4 lines
+ r46004 | eapache | 2012-11-11 12:54:12 -0800 (Sun, 11 Nov 2012) | 5 lines
Changed paths:
- M /trunk/epan/dissectors/packet-image-jfif.c
+ M /trunk/epan/dissectors/packet-tpncp.c
- Allow dissection of partial jpegs by a modification of the heuristics.
- Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230
- #BACKPORT(1.8, 1.6)
+ Fix the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6665
+
+ Catch exceptions thrown while registering the dynamically generated tpncp
+ fields, and take that as a hint that the .dat file is corrupt.
------------------------------------------------------------------------
Update the release notes.
------------------------------------------------------------------------
-r45248 | gerald | 2012-10-01 16:47:22 -0700 (Mon, 01 Oct 2012) | 16 lines
+r46234 | gerald | 2012-11-27 10:37:46 -0800 (Tue, 27 Nov 2012) | 13 lines
Changed paths:
- M /trunk-1.6/doc/wireshark.pod.template
+ M /trunk-1.6/docbook/release-notes.xml
+ M /trunk-1.6/gtk/sctp_stat.c
-Copy over revisions from the trunk:
+Copy over r46153 with manual intervention:
------------------------------------------------------------------------
- r45229 | morriss | 2012-10-01 00:14:03 -0700 (Mon, 01 Oct 2012) | 5 lines
+ r46153 | ruengeler | 2012-11-23 05:16:04 -0800 (Fri, 23 Nov 2012) | 2 lines
Changed paths:
- M /trunk/doc/wireshark.pod.template
-
- The -B option is no longer only available in Win32: remove the Win32
- restriction from the Synopsis.
+ M /trunk/ui/gtk/sctp_stat.c
- This is the man page for Wireshark, not Tshark (fix a cut-n-pasteo).
+ Fix bug reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8011
------------------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/Makefile.am
^
|
| @@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id: Makefile.am 43869 2012-07-20 19:31:41Z gerald $
+# $Id: Makefile.am 45326 2012-10-04 22:51:00Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -910,6 +910,28 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+
+# Used by patch-bzip2
+# Trim off any extra version information and find the previous micro release.
+BASE_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
+PREV_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
+PREV_DIR="wireshark-$(PREV_VERSION)"
+PREV_FILE="$(PREV_DIR).tar.bz2"
+PREV_URL="http://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
+
+patch-bzip2: distdir
+ if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
+ curl -z $(PREV_FILE) -o $(PREV_FILE) $(PREV_URL) && \
+ tar -xjf $(PREV_FILE) && \
+ diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).bz2 && \
+ echo "Created patch-bzip2" ; \
+ rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
+ else \
+ echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
+ fi
+ $(am__remove_distdir)
+
+
# Used by svr4-package and osx-package
# We load top_stagedir with an explicit path so that libtool doesn't freak.
top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/Makefile.in
^
|
| @@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wireshark
#
-# $Id: Makefile.am 43869 2012-07-20 19:31:41Z gerald $
+# $Id: Makefile.am 45326 2012-10-04 22:51:00Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -1650,6 +1650,14 @@
@HAVE_PLUGINS_FALSE@SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ . doc
@HAVE_PLUGINS_TRUE@SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
+# Used by patch-bzip2
+# Trim off any extra version information and find the previous micro release.
+BASE_VERSION = `echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
+PREV_VERSION = `echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
+PREV_DIR = "wireshark-$(PREV_VERSION)"
+PREV_FILE = "$(PREV_DIR).tar.bz2"
+PREV_URL = "http://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
+
# Used by svr4-package and osx-package
# We load top_stagedir with an explicit path so that libtool doesn't freak.
top_stagedir = `cd $(top_srcdir) && pwd`/packaging/staging
@@ -4404,6 +4412,18 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+patch-bzip2: distdir
+ if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
+ curl -z $(PREV_FILE) -o $(PREV_FILE) $(PREV_URL) && \
+ tar -xjf $(PREV_FILE) && \
+ diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).bz2 && \
+ echo "Created patch-bzip2" ; \
+ rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
+ else \
+ echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
+ fi
+ $(am__remove_distdir)
+
svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
@if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
rm -rf $(stagedir) ; \
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/NEWS
^
|
| @@ -1,4 +1,4 @@
-Wireshark 1.6.11 Release Notes
+Wireshark 1.6.12 Release Notes
------------------------------------------------------------------
@@ -14,47 +14,76 @@
The following vulnerability has been fixed.
- o wnpa-sec-2012-28
+ o wnpa-sec-2012-31
- Martin Wilck discovered an infinite loop in the DRDA
- dissector. (Bug 7666)
+ The USB dissector could go into an infinite loop. (Bug 7787)
- Versions affected: 1.6.0 to 1.6.10, 1.8.0 to 1.8.2.
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
- CVE-2012-5239
+ o wnpa-sec-2012-35
+
+ The ISAKMP dissector could crash. (Bug 7855)
+
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
+
+ o wnpa-sec-2012-36
+
+ The iSCSI dissector could go into an infinite loop. (Bug 7858)
+
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
+
+ o wnpa-sec-2012-37
+
+ The WTP dissector could go into an infinite loop. (Bug 7869)
+
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
+
+ o wnpa-sec-2012-38
+
+ The RTCP dissector could go into an infinite loop. (Bug 7879)
+
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
+
+ o wnpa-sec-2012-40
+
+ The ICMPv6 dissector could go into an infinite loop. (Bug
+ 7844)
+
+ Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.
The following bugs have been fixed:
o The HTTP dissector does not reassemble headers when the first
TCP segment does not contain a full header line.
- o No markers show up when maps are displayed. (Bug 5016)
+ o Menu and Title bars inaccessible using GTK2 (non-legacy) with
+ two monitors. (Bug 553)
+
+ o 802.11 Probe Response fails to parse. (Bug 1284)
- o Truncated/partial JPEG files are not dissected. (Bug 6230)
+ o Corrupted tpncp.dat file that crashes Wireshark. (Bug 6665)
- o Assertion when using tshark/wireshark on large captures. (Bug
- 5699)
+ o SMB 2.x Read Request parsing is wrong starting at Channel.
+ (Bug 7790)
- o Volume label field of "SMB/TRANS2-QUERY_FS_INFO/InfoVolume
- level" reply packet is not displayed correctly due alignment
- issue. (Bug 5778)
+ o Dissection of IEEE 802.11 Channel Switch Announcement element
+ fails. (Bug 7797)
- o 64-bit Wireshark appears to hit 2-Gbyte memory limit on 64-bit
- Windows. (Bug 5979)
+ o Invalid memory accesses when loading radius captures. (Bug
+ 7803)
- o epan/dissectors/packet-per.c
- dissect_per_constrained_integer_64b fails for 64 bits. (Bug
- 7624)
+ o ISUP CIC should have format BASE_DEC, not BASE_HEX. (Bug 7848)
- o dissector of Qos attribute "Reliability Class" in GMM/SM
- message. (Bug 7670)
+ o Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in
+ dissect_ieee802154_common function. (Bug 7864)
- o [ieee802.11] TKIP dissection : wrong IS_TKIP macro. (Bug 7691)
+ o When cancelling creation of new coloring rule, old one is
+ deleted. (Bug 7913)
- o This trace causes Wireshark to crash when VoIP Calls selected.
- (Bug 7724)
+ o Misspelling (typo) in IPv6 display filter field name. (Bug
+ 8006)
- o SCSI: WRITE BUFFER fields always display as zero. (Bug 7753)
+ o Core dumped during sctp association analysis. (Bug 8011)
New and Updated Features
@@ -66,12 +95,12 @@
Updated Protocol Support
- ASN.1 PER, GSM Management, IEEE 802.11, JPEG, PCAP, RANAP, RRC,
- RRLP, SCSI, SMB, TETRA
+ FMP/NOTIFY, ICMPv6, IEEE 802.11, IEEE 802.15.4, ISAKMP, iSCSI,
+ ISUP, NDPS, Prism, RADIUS, RTCP, SMB2, TPNCP, USB, WTP
New and Updated Capture File Support
- There are no file format updates in this release.
+ CommView NCF
Getting Wireshark
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/config.nmake
^
|
| @@ -1,4 +1,4 @@
-# $Id: config.nmake 44531 2012-08-15 20:24:56Z gerald $
+# $Id: config.nmake 45264 2012-10-02 19:46:57Z gerald $
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
@@ -13,13 +13,13 @@
##### Versions #####
# The SVN revision of our build. Updated by make-version.pl
-SVN_REVISION=45257
+SVN_REVISION=46251
# The current Wireshark version. Recommended: Leave unchanged.
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=6
-VERSION_MICRO=11
+VERSION_MICRO=12
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for wireshark 1.6.11.
+# Generated by GNU Autoconf 2.68 for wireshark 1.6.12.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
# Identity of this package.
PACKAGE_NAME='wireshark'
PACKAGE_TARNAME='wireshark'
-PACKAGE_VERSION='1.6.11'
-PACKAGE_STRING='wireshark 1.6.11'
+PACKAGE_VERSION='1.6.12'
+PACKAGE_STRING='wireshark 1.6.12'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1505,7 +1505,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wireshark 1.6.11 to adapt to many kinds of systems.
+\`configure' configures wireshark 1.6.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1576,7 +1576,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wireshark 1.6.11:";;
+ short | recursive ) echo "Configuration of wireshark 1.6.12:";;
esac
cat <<\_ACEOF
@@ -1769,7 +1769,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wireshark configure 1.6.11
+wireshark configure 1.6.12
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2309,7 +2309,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wireshark $as_me 1.6.11, which was
+It was created by wireshark $as_me 1.6.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3088,7 +3088,7 @@
# Define the identity of the package.
PACKAGE='wireshark'
- VERSION='1.6.11'
+ VERSION='1.6.12'
cat >>confdefs.h <<_ACEOF
@@ -26087,7 +26087,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wireshark $as_me 1.6.11, which was
+This file was extended by wireshark $as_me 1.6.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26153,7 +26153,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wireshark config.status 1.6.11
+wireshark config.status 1.6.12
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/configure.in
^
|
| @@ -1,8 +1,8 @@
-# $Id: configure.in 44531 2012-08-15 20:24:56Z gerald $
+# $Id: configure.in 45264 2012-10-02 19:46:57Z gerald $
#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.6.11)
+AC_INIT(wireshark, 1.6.12)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/debian/changelog
^
|
| @@ -1,4 +1,4 @@
-wireshark (1.6.11) unstable; urgency=low
+wireshark (1.6.12) unstable; urgency=low
* Self-made package
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/debian/wireshark-common.files
^
|
| @@ -5,9 +5,9 @@
/usr/bin/text2pcap
/usr/bin/rawshark
/usr/lib/wireshark/libwireshark.so.1
-/usr/lib/wireshark/libwireshark.so.1.1.11
+/usr/lib/wireshark/libwireshark.so.1.1.12
/usr/lib/wireshark/libwiretap.so.1
-/usr/lib/wireshark/libwiretap.so.1.0.11
+/usr/lib/wireshark/libwiretap.so.1.0.12
/usr/lib/wireshark/libwsutil.so.1
/usr/lib/wireshark/libwsutil.so.1.0.0
/usr/lib/wireshark/plugins/*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/doc/make-authors-format.pl
^
|
| @@ -1,4 +1,4 @@
-# $Id: make-authors-format.pl 28784 2009-06-21 12:47:48Z morriss $
+# $Id: make-authors-format.pl 46226 2012-11-27 17:08:10Z gerald $
# Convert AUTHORS-SHORT file for use in man page and HTML documentation
# after processing through pod2man and pod2html.
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/doc/make-authors-short.pl
^
|
| @@ -1,4 +1,4 @@
-# $Id: make-authors-short.pl 28784 2009-06-21 12:47:48Z morriss $
+# $Id: make-authors-short.pl 46226 2012-11-27 17:08:10Z gerald $
# Remove tasks from individual author entries from AUTHORS file
# for use in the about dialog.
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/doc/perlnoutf.pl
^
|
| @@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# $Id: perlnoutf.pl 28784 2009-06-21 12:47:48Z morriss $
+# $Id: perlnoutf.pl 46226 2012-11-27 17:08:10Z gerald $
# Call another Perl script, passing our caller's arguments, with
# environment variables unset so perl doesn't interpret bytes as UTF-8
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.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 45257 2012-10-02 15:53:18Z gerald $ -->
+<!-- $Id: release-notes.xml 46251 2012-11-28 18:46:38Z gerald $ -->
<!--
DOCUMENT SECTION
@@ -12,7 +12,7 @@
<!--
Wireshark Info
-->
-<!ENTITY WiresharkCurrentVersion "1.6.11">
+<!ENTITY WiresharkCurrentVersion "1.6.12">
]>
@@ -36,21 +36,124 @@
<listitem>
<para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-28.html">wnpa-sec-2012-28</ulink>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-31.html">wnpa-sec-2012-31</ulink>
</para>
<para>
- Martin Wilck discovered an infinite loop in the DRDA dissector.
- <!-- Fixed in trunk: r44749 -->
- <!-- Fixed in trunk-1.8: r45129 -->
- <!-- Fixed in trunk-1.6: r45234 -->
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666">Bug
- 7666</ulink>)
+ The USB dissector could go into an infinite loop.
+ <!-- Fixed in trunk: r45310, r45339, r45742 -->
+ <!-- Fixed in trunk-1.8: r45837 -->
+ <!-- Fixed in trunk-1.6: r46225, r46227 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7787">Bug
+ 7787</ulink>)
</para>
- <para>Versions affected: 1.6.0 to 1.6.10, 1.8.0 to 1.8.2.</para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-35.html">wnpa-sec-2012-35</ulink>
+ </para>
+ <para>
+ The ISAKMP dissector could crash.
+ <!-- Fixed in trunk: r45510 -->
+ <!-- Fixed in trunk-1.8: r45580 -->
+ <!-- Fixed in trunk-1.6: r46228 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7855">Bug
+ 7855</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
<para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5239">CVE-2012-5239</ulink>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
</para>
+-->
</listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-36.html">wnpa-sec-2012-36</ulink>
+ </para>
+ <para>
+ The iSCSI dissector could go into an infinite loop.
+ <!-- Fixed in trunk: r45524, r45548 -->
+ <!-- Fixed in trunk-1.8: r45549 -->
+ <!-- Fixed in trunk-1.6: r45550 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7858">Bug
+ 7858</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-37.html">wnpa-sec-2012-37</ulink>
+ </para>
+ <para>
+ The WTP dissector could go into an infinite loop.
+ <!-- Fixed in trunk: r45614 -->
+ <!-- Fixed in trunk-1.8: r45837 -->
+ <!-- Fixed in trunk-1.6: r46229 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869">Bug
+ 7869</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-38.html">wnpa-sec-2012-38</ulink>
+ </para>
+ <para>
+ The RTCP dissector could go into an infinite loop.
+ <!-- Fixed in trunk: r45717 -->
+ <!-- Fixed in trunk-1.8: r45837 -->
+ <!-- Fixed in trunk-1.6: r46230 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7879">Bug
+ 7879</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
+ </para>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-40.html">wnpa-sec-2012-40</ulink>
+ </para>
+ <para>
+ The ICMPv6 dissector could go into an infinite loop.
+ <!-- Fixed in trunk: r45459 -->
+ <!-- Fixed in trunk-1.8: r45460 -->
+ <!-- Fixed in trunk-1.6: r45493 -->
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7844">Bug
+ 7844</ulink>)
+ </para>
+ <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
+<!--
+ <para>
+ <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-UNASSIGNED">CVE-2012-UNASSIGNED</ulink>
+ </para>
+-->
+ </listitem>
+
</itemizedlist>
</para>
@@ -76,63 +179,69 @@
-->
<listitem><para>
- No markers show up when maps are displayed.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5016">Bug
- 5016</ulink>)
+ Menu and Title bars inaccessible using GTK2 (non-legacy) with two monitors.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553">Bug
+ 553</ulink>)
+ </para></listitem>
+
+ <listitem><para>
+ 802.11 Probe Response fails to parse.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1284">Bug
+ 1284</ulink>)
</para></listitem>
<listitem><para>
- Truncated/partial JPEG files are not dissected.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230">Bug
- 6230</ulink>)
+ Corrupted tpncp.dat file that crashes Wireshark.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6665">Bug
+ 6665</ulink>)
</para></listitem>
<listitem><para>
- Assertion when using tshark/wireshark on large captures.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699">Bug
- 5699</ulink>)
+ SMB 2.x Read Request parsing is wrong starting at Channel.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7790">Bug
+ 7790</ulink>)
</para></listitem>
<listitem><para>
- Volume label field of "SMB/TRANS2-QUERY_FS_INFO/InfoVolume level" reply packet is not displayed correctly due alignment issue.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778">Bug
- 5778</ulink>)
+ Dissection of IEEE 802.11 Channel Switch Announcement element fails.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7797">Bug
+ 7797</ulink>)
</para></listitem>
<listitem><para>
- 64-bit Wireshark appears to hit 2-Gbyte memory limit on 64-bit Windows.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979">Bug
- 5979</ulink>)
+ Invalid memory accesses when loading radius captures.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803">Bug
+ 7803</ulink>)
</para></listitem>
<listitem><para>
- epan/dissectors/packet-per.c dissect_per_constrained_integer_64b fails for 64 bits.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624">Bug
- 7624</ulink>)
+ ISUP CIC should have format BASE_DEC, not BASE_HEX.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848">Bug
+ 7848</ulink>)
</para></listitem>
<listitem><para>
- dissector of Qos attribute "Reliability Class" in GMM/SM message.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7670">Bug
- 7670</ulink>)
+ Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7864">Bug
+ 7864</ulink>)
</para></listitem>
<listitem><para>
- [ieee802.11] TKIP dissection : wrong IS_TKIP macro.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691">Bug
- 7691</ulink>)
+ When cancelling creation of new coloring rule, old one is deleted.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913">Bug
+ 7913</ulink>)
</para></listitem>
<listitem><para>
- This trace causes Wireshark to crash when VoIP Calls selected.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7724">Bug
- 7724</ulink>)
+ Misspelling (typo) in IPv6 display filter field name.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8006">Bug
+ 8006</ulink>)
</para></listitem>
<listitem><para>
- SCSI: WRITE BUFFER fields always display as zero.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7753">Bug
- 7753</ulink>)
+ Core dumped during sctp association analysis.
+ (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8011">Bug
+ 8011</ulink>)
</para></listitem>
</itemizedlist>
@@ -161,17 +270,21 @@
<!-- Sort alphabetically -->
-ASN.1 PER,
-GSM Management,
+FMP/NOTIFY,
+ICMPv6,
IEEE 802.11,
-JPEG,
-PCAP,
-RANAP,
-RRC,
-RRLP,
-SCSI,
-SMB,
-TETRA
+IEEE 802.15.4,
+ISAKMP,
+iSCSI,
+ISUP,
+NDPS,
+Prism,
+RADIUS,
+RTCP,
+SMB2,
+TPNCP,
+USB,
+WTP
</para>
</section>
@@ -179,7 +292,7 @@
<section id="NewCapture"><title>New and Updated Capture File Support</title>
<para>
-There are no file format updates in this release.
+CommView NCF
</para>
</section>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/Makefile.am
^
|
| @@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am 44531 2012-08-15 20:24:56Z gerald $
+# $Id: Makefile.am 45264 2012-10-02 19:46:57Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -54,7 +54,7 @@
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
-libwireshark_la_LDFLAGS = -version-info 2:11:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:12:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
include Makefile.common
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/Makefile.in
^
|
| @@ -18,7 +18,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am 44531 2012-08-15 20:24:56Z gerald $
+# $Id: Makefile.am 45264 2012-10-02 19:46:57Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -520,7 +520,7 @@
ACLOCAL_AMFLAGS = `../aclocal-flags`
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
-libwireshark_la_LDFLAGS = -version-info 2:11:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:12:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
LIBWIRESHARK_SRC = \
addr_and_mask.c \
addr_resolv.c \
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-agentx.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Agent Extensibility (AgentX) Protocol disassembly
* RFC 2257
*
- * $Id: packet-agentx.c 36769 2011-04-21 15:56:43Z alagoutte $
+ * $Id: packet-agentx.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2005 by Oleg Terletsky <oleg.terletsky@comverse.com>
*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-artnet.c
^
|
| @@ -1,7 +1,7 @@
/* packet-artnet.c
* Routines for Art-Net packet disassembly
*
- * $Id: packet-artnet.c 36713 2011-04-19 08:22:58Z stig $
+ * $Id: packet-artnet.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-cisco-sm.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Cisco Session Management Protocol dissection
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-cisco-sm.c 34477 2010-10-11 19:00:55Z wmeier $
+ * $Id: packet-cisco-sm.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-classicstun.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Simple Traversal of UDP Through NAT dissection
* Copyright 2003, Shiang-Ming Huang <smhuang@pcs.csie.nctu.edu.tw>
*
- * $Id: packet-classicstun.c 35224 2010-12-20 05:35:29Z guy $
+ * $Id: packet-classicstun.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-dmp.c
^
|
| @@ -7,7 +7,7 @@
*
* Copyright 2006, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS
*
- * $Id: packet-dmp.c 40414 2012-01-09 18:16:04Z wmeier $
+ * $Id: packet-dmp.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2586,7 +2586,7 @@
offset = dissect_dmp_originator (tvb, pinfo, envelope_tree, offset);
}
- for (i = 1; i <= no_rec; i++) {
+ for (i = 0; i < no_rec; i++) {
/* Recipient(s) */
offset = dissect_dmp_address (tvb, pinfo, envelope_tree, offset,
&prev_rec_no, FALSE);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-dua.c
^
|
| @@ -9,7 +9,7 @@
*
* Copyright 2005, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-dua.c 35377 2011-01-05 15:23:53Z morriss $
+ * $Id: packet-dua.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -175,7 +175,7 @@
number_of_ranges = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INTERVAL_LENGTH;
offset = PARAMETER_VALUE_OFFSET;
- for(range_number = 1; range_number <= number_of_ranges; range_number++) {
+ for(range_number = 0; range_number < number_of_ranges; range_number++) {
proto_tree_add_item(parameter_tree, hf_interface_range_start, parameter_tvb, offset + START_OFFSET, START_LENGTH, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_interface_range_end, parameter_tvb, offset + END_OFFSET, END_LENGTH, ENC_BIG_ENDIAN);
offset += INTERVAL_LENGTH;
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-enttec.c
^
|
| @@ -1,7 +1,7 @@
/* packet-enttec.c
* Routines for ENTTEC packet disassembly
*
- * $Id: packet-enttec.c 36006 2011-02-18 22:43:48Z gerald $
+ * $Id: packet-enttec.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2003,2004 by Erwin Rol <erwin@erwinrol.com>
*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-fmp.c
^
|
| @@ -1,7 +1,7 @@
/* packet-fmp.c
* Routines for fmp dissection
*
- * $Id: packet-fmp.c 35547 2011-01-16 03:46:16Z morriss $
+ * $Id: packet-fmp.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -378,8 +378,8 @@
offset = dissect_rpc_uint32(tvb, extListTree,
hf_fmp_extentList_len, offset);
- for (i = 1; i <= numExtents; i++) {
- offset = dissect_fmp_extent(tvb, offset, pinfo, extListTree, i);
+ for (i = 0; i < numExtents; i++) {
+ offset = dissect_fmp_extent(tvb, offset, pinfo, extListTree, i+1);
}
return offset;
@@ -404,7 +404,7 @@
offset += 4;
- for (i = 1; i <= numExtents; i++) {
+ for (i = 0; i < numExtents; i++) {
extListItem = proto_tree_add_text(tree, tvb, offset, 28,
"Extent List");
extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-fmp_notify.c
^
|
| @@ -1,7 +1,7 @@
/* packet-fmp_notify.c
* Routines for fmp dissection
*
- * $Id: packet-fmp_notify.c 35919 2011-02-11 21:13:38Z morriss $
+ * $Id: packet-fmp_notify.c 45502 2012-10-12 19:35:07Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -239,7 +239,7 @@
offset = dissect_rpc_uint32(tvb, handleListTree,
hf_fmp_handleListLen, offset);
- for (i = 0; i <= numHandles; i++) {
+ for (i = 0; i < numHandles; i++) {
offset = dissect_rpc_data(tvb, handleListTree,
hf_fmp_fmpFHandle, offset);/* changed */
}
@@ -653,8 +653,8 @@
offset = dissect_rpc_uint32(tvb, extListTree,
hf_fmp_extentList_len, offset);
- for (i = 1; i <= numExtents; i++) {
- offset = dissect_fmp_notify_extent(tvb, offset, pinfo, extListTree, i);
+ for (i = 0; i < numExtents; i++) {
+ offset = dissect_fmp_notify_extent(tvb, offset, pinfo, extListTree, i+1);
}
return offset;
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-icmpv6.c
^
|
| @@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c 45235 2012-10-01 17:56:38Z gerald $
+ * $Id: packet-icmpv6.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3027,7 +3027,7 @@
mldr_offset += 16;
/* Source Address */
- for (i=1; i <= nb_sources; i++){
+ for (i=0; i < nb_sources; i++){
proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_source_address, tvb, mldr_offset, 16, FALSE);
mldr_offset += 16;
}
@@ -3297,7 +3297,7 @@
offset += 2;
/* Source Address */
- for (i=1; i <= nb_sources; i++){
+ for (i=0; i < nb_sources; i++){
proto_tree_add_item(icmp6_tree, hf_icmpv6_mld_source_address, tvb, offset, 16, FALSE);
offset += 16;
}
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-ieee80211.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c 45235 2012-10-01 17:56:38Z gerald $
+ * $Id: packet-ieee80211.c 46232 2012-11-27 18:15:23Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3018,39 +3018,94 @@
*
* XXX - what about other drivers that supply Prism headers, such as
* old versions of the MadWifi driver?
+ *
+ * I'm not sure where these DID values come from, but they work with
+ * at least one capture file. However, in
+ *
+ * http://ask.wireshark.org/questions/14963/how-to-get-the-field-did-unknown-4041-into-the-column
+ *
+ * somebody reports a capture where *different* DID values, corresponding
+ * to
+ *
+ * http://home.martin.cc/linux/prism
+ *
+ * are used (and that's not a byte-order issue, as those values are *not*
+ * just byte-swapped versions of the other values).
*/
#define PRISM_HEADER_LENGTH 144 /* Default Prism Header Length */
-#define PRISM_DID_HOSTTIME 0x00010044 /* Host time element */
-#define PRISM_DID_MACTIME 0x00020044 /* Mac time element */
-#define PRISM_DID_CHANNEL 0x00030044 /* Channel element */
-#define PRISM_DID_RSSI 0x00040044 /* RSSI element */
-#define PRISM_DID_SQ 0x00050044 /* SQ element */
-#define PRISM_DID_SIGNAL 0x00060044 /* Signal element */
-#define PRISM_DID_NOISE 0x00070044 /* Noise element */
-#define PRISM_DID_RATE 0x00080044 /* Rate element */
-#define PRISM_DID_ISTX 0x00090044 /* Is Tx frame */
-#define PRISM_DID_FRMLEN 0x000A0044 /* Frame length */
+
+/*
+ * Message code values.
+ *
+ * Some Prism captures have headers that begin with 0x00000044; those
+ * captures have the non-home.martin.cc values for the DID types,
+ * while a capture with 0x00000041 as the message code have the
+ * home.martin.cc values for the DID types, and the home.martin.cc
+ * page has 0x00000041 as the message code.
+ */
+#define PRISM_TYPE1_MSGCODE 0x00000044 /* Monitor Frame */
+#define PRISM_TYPE2_MSGCODE 0x00000041
+
+/*
+ * DID codes - PRISM_TYPE1_xxx are the non-home.martin.cc values, and
+ * PRISM_TYPE2_xxx are the home.martin.cc values.
+ */
+#define PRISM_TYPE1_HOSTTIME 0x00010044 /* Host time element */
+#define PRISM_TYPE2_HOSTTIME 0x00001041
+#define PRISM_TYPE1_MACTIME 0x00020044 /* Mac time element */
+#define PRISM_TYPE2_MACTIME 0x00002041
+#define PRISM_TYPE1_CHANNEL 0x00030044 /* Channel element */
+#define PRISM_TYPE2_CHANNEL 0x00003041
+#define PRISM_TYPE1_RSSI 0x00040044 /* RSSI element */
+#define PRISM_TYPE2_RSSI 0x00004041
+#define PRISM_TYPE1_SQ 0x00050044 /* SQ element */
+#define PRISM_TYPE2_SQ 0x00005041
+#define PRISM_TYPE1_SIGNAL 0x00060044 /* Signal element */
+#define PRISM_TYPE2_SIGNAL 0x00006041
+#define PRISM_TYPE1_NOISE 0x00070044 /* Noise element */
+#define PRISM_TYPE2_NOISE 0x00007041
+#define PRISM_TYPE1_RATE 0x00080044 /* Rate element */
+#define PRISM_TYPE2_RATE 0x00008041
+#define PRISM_TYPE1_ISTX 0x00090044 /* Is Tx frame */
+#define PRISM_TYPE2_ISTX 0x00009041
+#define PRISM_TYPE1_FRMLEN 0x000A0044 /* Frame length */
+#define PRISM_TYPE2_FRMLEN 0x0000A041
static const value_string prism_did_vals[] =
{
- { PRISM_DID_HOSTTIME, "Host Time" },
- { PRISM_DID_MACTIME, "Mac Time" },
- { PRISM_DID_CHANNEL, "Channel" },
- { PRISM_DID_RSSI, "RSSI" },
- { PRISM_DID_SQ, "SQ" },
- { PRISM_DID_SIGNAL, "Signal" },
- { PRISM_DID_NOISE, "Noise" },
- { PRISM_DID_RATE, "Rate" },
- { PRISM_DID_ISTX, "Is Tx" },
- { PRISM_DID_FRMLEN, "Frame Length" },
+ { PRISM_TYPE1_HOSTTIME, "Host Time" },
+ { PRISM_TYPE2_HOSTTIME, "Host Time" },
+ { PRISM_TYPE1_MACTIME, "Mac Time" },
+ { PRISM_TYPE2_MACTIME, "Mac Time" },
+ { PRISM_TYPE1_CHANNEL, "Channel" },
+ { PRISM_TYPE2_CHANNEL, "Channel" },
+ { PRISM_TYPE1_RSSI, "RSSI" },
+ { PRISM_TYPE2_RSSI, "RSSI" },
+ { PRISM_TYPE1_SQ, "SQ" },
+ { PRISM_TYPE2_SQ, "SQ" },
+ { PRISM_TYPE1_SIGNAL, "Signal" },
+ { PRISM_TYPE2_SIGNAL, "Signal" },
+ { PRISM_TYPE1_NOISE, "Noise" },
+ { PRISM_TYPE2_NOISE, "Noise" },
+ { PRISM_TYPE1_RATE, "Rate" },
+ { PRISM_TYPE2_RATE, "Rate" },
+ { PRISM_TYPE1_ISTX, "Is Tx" },
+ { PRISM_TYPE2_ISTX, "Is Tx" },
+ { PRISM_TYPE1_FRMLEN, "Frame Length" },
+ { PRISM_TYPE2_FRMLEN, "Frame Length" },
{ 0, NULL}
};
+/*
+ * The header file mentioned above says 0 means "supplied" and 1 means
+ * "not supplied". I haven't seen a capture file with anything other
+ * than 0 there.
+ */
static const value_string prism_status_vals[] =
{
- { 0, "Not Supplied" },
- { 1, "Supplied" },
+ { 0, "Supplied" },
+ { 1, "Not Supplied" },
{ 0, NULL}
};
@@ -4971,7 +5026,7 @@
proto_tree *wpa_mcs_tree, *wpa_ucs_tree, *wpa_akms_tree;
proto_tree *wpa_sub_ucs_tree, *wpa_sub_akms_tree;
guint16 ucs_count, akms_count;
- guint i;
+ guint ii;
proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
@@ -4997,7 +5052,7 @@
wpa_ucs_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_ucs_list, tvb, offset, ucs_count * 4, FALSE);
wpa_ucs_tree = proto_item_add_subtree(wpa_ucs_item, ett_wpa_ucs_tree);
- for(i=1; i <= ucs_count; i++)
+ for(ii=0; ii < ucs_count; ii++)
{
wpa_sub_ucs_item = proto_tree_add_item(wpa_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs, tvb, offset, 4, FALSE);
wpa_sub_ucs_tree = proto_item_add_subtree(wpa_sub_ucs_item, ett_wpa_sub_ucs_tree);
@@ -5021,7 +5076,7 @@
wpa_akms_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_akms_list, tvb, offset, akms_count * 4, FALSE);
wpa_akms_tree = proto_item_add_subtree(wpa_akms_item, ett_wpa_akms_tree);
- for(i=1; i <= akms_count; i++)
+ for(ii=0; ii < akms_count; ii++)
{
wpa_sub_akms_item = proto_tree_add_item(wpa_akms_tree, hf_ieee80211_wfa_ie_wpa_akms, tvb, offset, 4, FALSE);
wpa_sub_akms_tree = proto_item_add_subtree(wpa_sub_akms_item, ett_wpa_sub_akms_tree);
@@ -5489,7 +5544,7 @@
proto_tree *rsn_gcs_tree, *rsn_pcs_tree, *rsn_akms_tree, *rsn_cap_tree, *rsn_pmkid_tree, *rsn_gmcs_tree;
proto_tree *rsn_sub_pcs_tree, *rsn_sub_akms_tree;
guint16 pcs_count, akms_count, pmkid_count;
- guint i;
+ guint ii;
int tag_end = offset + tag_len;
proto_tree_add_item(tree, hf_ieee80211_rsn_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@@ -5522,7 +5577,7 @@
rsn_pcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_list, tvb, offset, pcs_count * 4, FALSE);
rsn_pcs_tree = proto_item_add_subtree(rsn_pcs_item, ett_rsn_pcs_tree);
- for(i=1; i <= pcs_count; i++)
+ for(ii=0; ii < pcs_count; ii++)
{
rsn_sub_pcs_item = proto_tree_add_item(rsn_pcs_tree, hf_ieee80211_rsn_pcs, tvb, offset, 4, FALSE);
rsn_sub_pcs_tree = proto_item_add_subtree(rsn_sub_pcs_item, ett_rsn_sub_pcs_tree);
@@ -5557,7 +5612,7 @@
rsn_akms_item = proto_tree_add_item(tree, hf_ieee80211_rsn_akms_list, tvb, offset, akms_count * 4, ENC_NA);
rsn_akms_tree = proto_item_add_subtree(rsn_akms_item, ett_rsn_akms_tree);
- for(i=1; i <= akms_count; i++)
+ for(ii=0; ii < akms_count; ii++)
{
rsn_sub_akms_item = proto_tree_add_item(rsn_akms_tree, hf_ieee80211_rsn_akms, tvb, offset, 4, ENC_BIG_ENDIAN);
rsn_sub_akms_tree = proto_item_add_subtree(rsn_sub_akms_item, ett_rsn_sub_akms_tree);
@@ -5604,7 +5659,7 @@
rsn_pmkid_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_list, tvb, offset, pmkid_count * 16, FALSE);
rsn_pmkid_tree = proto_item_add_subtree(rsn_pmkid_item, ett_rsn_pmkid_tree);
- for(i=1; i <= pmkid_count; i++)
+ for(ii=0; ii < pmkid_count; ii++)
{
proto_tree_add_item(rsn_pmkid_tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, FALSE);
offset +=16;
@@ -7255,6 +7310,8 @@
proto_tree_add_item(tree, hf_ieee80211_csa_channel_switch_count, tvb, offset, 1, TRUE);
proto_item_append_text(ti, ", Count: %d ", tvb_get_guint8(tvb, offset));
offset += 1;
+
+ break;
}
case TAG_MEASURE_REQ: /* 7.3.2.21 Measurement Request element (38) with update from 802.11k-2008 */
@@ -8999,7 +9056,8 @@
}
case 3: /* Multi-TID BlockAckReq */
{
- guint8 tid_count, i;
+ guint8 tid_count;
+ guint iii;
proto_tree *bar_mtid_tree, *bar_mtid_sub_tree;
tid_count = ((bar_control & 0xF000) >> 12) + 1;
@@ -9009,8 +9067,8 @@
bar_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
bar_mtid_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
- for (i = 1; i <= tid_count; i++) {
- bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
+ for (iii = 0; iii < tid_count; iii++) {
+ bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, iii);
bar_mtid_sub_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
bar_control = tvb_get_letohs(tvb, offset);
@@ -9085,7 +9143,8 @@
}
case 3: /* Multi-TID BlockAck */
{
- guint8 tid_count, i;
+ guint8 tid_count;
+ guint iii;
proto_tree *ba_mtid_tree, *ba_mtid_sub_tree;
tid_count = ((ba_control & 0xF000) >> 12) + 1;
@@ -9097,8 +9156,8 @@
ba_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
ba_mtid_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
- for (i=1; i<=tid_count; i++) {
- ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
+ for (iii=0; iii<tid_count; iii++) {
+ ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, iii);
ba_mtid_sub_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
ba_control = tvb_get_letohs(tvb, offset);
@@ -10355,12 +10414,13 @@
tvbuff_t *next_tvb;
int offset;
guint32 msgcode, msglen, did;
+ guint16 status;
guint8 *devname;
offset = 0;
did = 0;
- /* handle the new capture type. */
+ /* handle the AVS header */
msgcode = tvb_get_ntohl(tvb, offset);
if ((msgcode == WLANCAP_MAGIC_COOKIE_V1) ||
(msgcode == WLANCAP_MAGIC_COOKIE_V2)) {
@@ -10368,6 +10428,22 @@
return;
}
+ /*
+ * If we don't see a valid message type, assume the Prism or AVS
+ * header was omitted and just hand off to the 802.11 dissector;
+ * at least one capture has AVS headers on some packets and no
+ * radio headers on others (incoming vs. outgoing?).
+ *
+ * XXX - check for both byte orders and use that to determine
+ * the byte order of the fields in the Prism header?
+ */
+ msgcode = tvb_get_letohl(tvb, offset);
+ if ((msgcode != PRISM_TYPE1_MSGCODE) &&
+ (msgcode != PRISM_TYPE2_MSGCODE)) {
+ call_dissector(ieee80211_handle, tvb, pinfo, tree);
+ return;
+ }
+
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
col_clear(pinfo->cinfo, COL_INFO);
@@ -10415,6 +10491,7 @@
/* Status */
+ status = tvb_get_letohs(tvb, offset);
if(tree) {
proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, TRUE);
}
@@ -10426,77 +10503,98 @@
}
offset += 2;
- /* Data... */
- switch(did){
- case PRISM_DID_HOSTTIME:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_MACTIME:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_CHANNEL:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
- }
- col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_letohl(tvb, offset));
- break;
- case PRISM_DID_RSSI:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
- }
- col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_letohl(tvb, offset));
- break;
- case PRISM_DID_SQ:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_SIGNAL:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_NOISE:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_RATE:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
- }
- col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
+ /* Data, if present... */
+ if (status == 0) {
+ switch(did){
+ case PRISM_TYPE1_HOSTTIME:
+ case PRISM_TYPE2_HOSTTIME:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
- break;
- case PRISM_DID_ISTX:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
- }
- break;
- case PRISM_DID_FRMLEN:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, TRUE);
- proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
- }
- break;
- default:
- if(tree){
- proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, TRUE);
+ case PRISM_TYPE1_MACTIME:
+ case PRISM_TYPE2_MACTIME:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ case PRISM_TYPE1_CHANNEL:
+ case PRISM_TYPE2_CHANNEL:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_letohl(tvb, offset));
+ break;
+
+ case PRISM_TYPE1_RSSI:
+ case PRISM_TYPE2_RSSI:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_letohl(tvb, offset));
+ break;
+
+ case PRISM_TYPE1_SQ:
+ case PRISM_TYPE2_SQ:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ case PRISM_TYPE1_SIGNAL:
+ case PRISM_TYPE2_SIGNAL:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ case PRISM_TYPE1_NOISE:
+ case PRISM_TYPE2_NOISE:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ case PRISM_TYPE1_RATE:
+ case PRISM_TYPE2_RATE:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
+ }
+ col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_letohl(tvb, offset)) );
+ break;
+
+ case PRISM_TYPE1_ISTX:
+ case PRISM_TYPE2_ISTX:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ case PRISM_TYPE1_FRMLEN:
+ case PRISM_TYPE2_FRMLEN:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, TRUE);
+ proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) );
+ }
+ break;
+
+ default:
+ if(tree){
+ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, TRUE);
+ }
+ break;
}
- break;
}
offset += 4;
}
@@ -12058,7 +12156,7 @@
/* Prism-specific header fields
XXX - make as many of these generic as possible. */
{ &hf_ieee80211_prism_msgcode,
- {"Message Code", "prism.msgcode", FT_UINT32, BASE_DEC, NULL, 0x0,
+ {"Message Code", "prism.msgcode", FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_msglen,
@@ -12090,39 +12188,39 @@
"In jiffies - for our system this is in 10ms units", HFILL }},
{ &hf_ieee80211_prism_did_mactime,
- {"Mac Time", "prism.did.hosttime", FT_UINT32, BASE_DEC, NULL, 0x0,
- "In micro-seconds", HFILL }},
+ {"MAC timestamp (lower 32 bits)", "prism.did.mactime", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "Lower 32 bits of value in microseconds of the MAC's Time Synchronization Function timer when the first bit of the MPDU arrived at the MAC.", HFILL }},
{ &hf_ieee80211_prism_did_channel,
- {"Channel", "prism.did.hosttime", FT_UINT32, BASE_DEC, NULL, 0x0,
+ {"Channel", "prism.did.channel", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_rssi,
- {"RSSI", "prism.did.rssi", FT_UINT32, BASE_HEX, NULL, 0x0,
+ {"RSSI", "prism.did.rssi", FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_sq,
- {"SQ", "prism.did.sq", FT_UINT32, BASE_HEX, NULL, 0x0,
+ {"Signal Quality", "prism.did.sq", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_signal,
- {"Signal", "prism.did.signal", FT_UINT32, BASE_HEX, NULL, 0x0,
+ {"Signal", "prism.did.signal", FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_noise,
- {"Noise", "prism.did.noise", FT_UINT32, BASE_HEX, NULL, 0x0,
+ {"Noise", "prism.did.noise", FT_INT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_rate,
- {"Rate (In Mb/s)", "prism.did.rate", FT_UINT32, BASE_CUSTOM, prism_rate_base_custom, 0x0,
- "In Mb/s", HFILL }},
+ {"Data rate (Mb/s)", "prism.did.rate", FT_UINT32, BASE_CUSTOM, prism_rate_base_custom, 0x0,
+ "Speed this frame was sent/received at", HFILL }},
{ &hf_ieee80211_prism_did_istx,
{"IsTX", "prism.did.istx", FT_UINT32, BASE_HEX, VALS(prism_istx_vals), 0x0,
- "Type of packet (RX or TX ?)", HFILL }},
+ "Type of packet (RX or TX?)", HFILL }},
{ &hf_ieee80211_prism_did_frmlen,
- {"Frame Length", "prism.did.frmlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+ {"Frame Length", "prism.did.frmlen", FT_UINT32, BASE_DEC, NULL, 0x0,
"Length of the following frame in bytes", HFILL }},
{ &hf_ieee80211_prism_did_unknown,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-ieee802154.c
^
|
| @@ -1,6 +1,6 @@
/* packet-ieee802154.c
*
- * $Id: packet-ieee802154.c 40414 2012-01-09 18:16:04Z wmeier $
+ * $Id: packet-ieee802154.c 46232 2012-11-27 18:15:23Z gerald $
*
* Auxiliary Security Header support and
* option to force TI CC24xx FCS format
@@ -927,7 +927,7 @@
packet->key_source.addr64 = tvb_get_ntoh64(tvb, offset);
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 8, packet->key_source.addr64);
proto_item_set_len(ti, 1 + 8);
- offset += 4;
+ offset += 8;
}
/* Add key identifier. */
packet->key_index = tvb_get_guint8(tvb, offset);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-infiniband.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Infiniband/ERF Dissection
* Copyright 2008 Endace Technology Limited
*
- * $Id: packet-infiniband.c 39584 2011-10-25 22:58:14Z gerald $
+ * $Id: packet-infiniband.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-infiniband.h
^
|
| @@ -2,7 +2,7 @@
* Routines for Infiniband/ERF Dissection
* Copyright 2008 Endace Technology Limited
*
- * $Id: packet-infiniband.h 34918 2010-11-17 02:57:22Z morriss $
+ * $Id: packet-infiniband.h 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-ipv6.c
^
|
| @@ -1,7 +1,7 @@
/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c 40393 2012-01-05 23:44:06Z gerald $
+ * $Id: packet-ipv6.c 46101 2012-11-21 00:57:37Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1975,7 +1975,7 @@
FT_BOOLEAN, 16, TFS(&tfs_yes_no), IP6F_MORE_FRAG,
"More Fragments", HFILL }},
{ &hf_ipv6_frag_id,
- { "Identification", "ipv6.framgent.id",
+ { "Identification", "ipv6.fragment.id",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Fragment Identification", HFILL }},
{ &hf_ipv6_fragment_overlap,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-isakmp.c
^
|
| @@ -14,7 +14,7 @@
* 04/2009 Added routines for decryption of IKEv2 Encrypted Payload
* Naoyoshi Ueda <piyomaru3141@gmail.com>
*
- * $Id: packet-isakmp.c 41777 2012-03-26 20:27:20Z gerald $
+ * $Id: packet-isakmp.c 46228 2012-11-27 17:23:20Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2794,6 +2794,10 @@
pd_save = pinfo->private_data;
pinfo->private_data = ikev2_dec_data;
pd_changed = TRUE;
+ } else if (pinfo->private_data) {
+ pd_save = pinfo->private_data;
+ pinfo->private_data = NULL;
+ pd_changed = TRUE;
}
}
#endif /* HAVE_LIBGCRYPT */
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-iscsi.c
^
|
| @@ -11,7 +11,7 @@
* Copyright 2001, Eurologic and Mark Burton <markb@ordern.com>
* 2004 Request/Response matching and Service Response Time: ronnie sahlberg
*
- * $Id: packet-iscsi.c 36333 2011-03-25 20:04:54Z morriss $
+ * $Id: packet-iscsi.c 45550 2012-10-14 22:57:49Z guy $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1002,8 +1002,8 @@
}
/* strip off padding bytes */
- if(ahs_offset&0x0003){
- ahs_offset=(ahs_offset+3)&0xfffc;
+ if(ahs_offset & 3){
+ ahs_offset=(ahs_offset+3) & ~3;
}
}
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-isup.c
^
|
| @@ -10,7 +10,7 @@
* Modified 2004-01-10 by Anders Broman to add abillity to dissect
* Content type application/ISUP RFC 3204 used in SIP-T
*
- * $Id: packet-isup.c 39586 2011-10-25 23:39:05Z gerald $
+ * $Id: packet-isup.c 45466 2012-10-11 08:29:46Z guy $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -7516,7 +7516,7 @@
isup_tree = proto_item_add_subtree(ti, ett_isup);
- proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic);
+ proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic);
}
message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH);
@@ -7647,7 +7647,7 @@
static hf_register_info hf[] = {
{ &hf_isup_cic,
{ "CIC", "isup.cic",
- FT_UINT16, BASE_HEX, NULL, 0x0,
+ FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_isup_message_type,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-lwres.c
^
|
| @@ -1,7 +1,7 @@
/* packet-lwres.c
* Routines for light weight reslover (lwres, part of BIND9) packet disassembly
*
- * $Id: packet-lwres.c 35548 2011-01-16 03:57:12Z morriss $
+ * $Id: packet-lwres.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2003 by Oleg Terletsky <oleg.terletsky@comverse.com>
*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-m3ua.c
^
|
| @@ -9,7 +9,7 @@
*
* Copyright 2000, 2001, 2002, 2003, 2004 Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-m3ua.c 36691 2011-04-17 19:37:46Z tuexen $
+ * $Id: packet-m3ua.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -431,7 +431,7 @@
number_of_destinations = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) >> 2;
destination_offset = PARAMETER_VALUE_OFFSET;
- for(destination_number=1; destination_number <= number_of_destinations; destination_number++) {
+ for(destination_number=0; destination_number < number_of_destinations; destination_number++) {
proto_tree_add_item(parameter_tree, hf_affected_point_code_mask, parameter_tvb, destination_offset + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, ENC_BIG_ENDIAN);
item = proto_tree_add_item(parameter_tree, hf_affected_point_code_pc, parameter_tvb, destination_offset + AFFECTED_DPC_OFFSET, AFFECTED_DPC_LENGTH, ENC_BIG_ENDIAN);
if (mtp3_pc_structured())
@@ -451,7 +451,7 @@
number_of_contexts = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) >> 2;
context_offset = PARAMETER_VALUE_OFFSET;
- for(context_number=1; context_number <= number_of_contexts; context_number++) {
+ for(context_number=0; context_number < number_of_contexts; context_number++) {
proto_tree_add_item(parameter_tree, hf_routing_context, parameter_tvb, context_offset, ROUTING_CONTEXT_LENGTH, ENC_BIG_ENDIAN);
context_offset += ROUTING_CONTEXT_LENGTH;
};
@@ -1002,7 +1002,7 @@
number_of_sis = length - PARAMETER_HEADER_LENGTH;
si_offset = PARAMETER_VALUE_OFFSET;
- for(si_number=1; si_number <= number_of_sis; si_number++) {
+ for(si_number=0; si_number < number_of_sis; si_number++) {
proto_tree_add_item(parameter_tree, hf_si, parameter_tvb, si_offset, SI_LENGTH, ENC_BIG_ENDIAN);
si_offset += SI_LENGTH;
};
@@ -1021,7 +1021,7 @@
number_of_ssns = length - PARAMETER_HEADER_LENGTH;
ssn_offset = PARAMETER_VALUE_OFFSET;
- for(ssn_number=1; ssn_number <= number_of_ssns; ssn_number++) {
+ for(ssn_number=0; ssn_number < number_of_ssns; ssn_number++) {
proto_tree_add_item(parameter_tree, hf_ssn, parameter_tvb, ssn_offset, SSN_LENGTH, ENC_BIG_ENDIAN);
ssn_offset += SSN_LENGTH;
};
@@ -1046,7 +1046,7 @@
number_of_point_codes = (length - PARAMETER_HEADER_LENGTH) / 4;
point_code_offset = PARAMETER_VALUE_OFFSET;
- for(point_code_number=1; point_code_number <= number_of_point_codes; point_code_number++) {
+ for(point_code_number=0; point_code_number < number_of_point_codes; point_code_number++) {
proto_tree_add_item(parameter_tree, hf_opc_list_mask, parameter_tvb, point_code_offset + OPC_MASK_OFFSET, OPC_MASK_LENGTH, ENC_BIG_ENDIAN);
item = proto_tree_add_item(parameter_tree, hf_opc_list_pc, parameter_tvb, point_code_offset + OPC_PC_OFFSET, OPC_PC_LENGTH, ENC_BIG_ENDIAN);
if (mtp3_pc_structured())
@@ -1080,7 +1080,7 @@
number_of_point_codes = (length - PARAMETER_HEADER_LENGTH) / CIC_RANGE_LENGTH;
point_code_offset = PARAMETER_VALUE_OFFSET;
- for(point_code_number = 1; point_code_number <= number_of_point_codes; point_code_number++) {
+ for(point_code_number = 0; point_code_number < number_of_point_codes; point_code_number++) {
cic_range_item = proto_tree_add_text(parameter_tree, parameter_tvb, point_code_offset + CIC_RANGE_MASK_OFFSET, CIC_RANGE_LENGTH, "CIC range");
cic_range_tree = proto_item_add_subtree(cic_range_item, ett_parameter);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-mongo.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Mongo Wire Protocol dissection
* Copyright 2010, Alexis La Goutte <alexis.lagoutte at gmail dot com>
*
- * $Id: packet-mongo.c 36419 2011-03-31 15:17:49Z cmaynard $
+ * $Id: packet-mongo.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -185,7 +185,7 @@
number_returned = tvb_get_letohl(tvb, offset);
offset += 4;
- for (i=1; i <= number_returned; i++)
+ for (i=0; i < number_returned; i++)
{
offset += dissect_bson_document(tvb, offset, tree, hf_mongo_documents);
}
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-ndps.c
^
|
| @@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ndps.c 36704 2011-04-18 17:55:35Z alagoutte $
+ * $Id: packet-ndps.c 45488 2012-10-11 21:09:46Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2414,7 +2414,7 @@
guint32 cred_type=0;
guint32 length=0;
guint32 number_of_items;
- guint32 i;
+ guint32 ii;
proto_tree *atree;
proto_item *aitem;
@@ -2428,13 +2428,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_passwords, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Password %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Password %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -2506,8 +2506,8 @@
{
guint32 number_of_items;
guint32 number_of_items2;
- guint32 i;
- guint32 j;
+ guint32 ii;
+ guint32 jj;
guint32 object_identifier;
proto_tree *atree;
proto_item *aitem;
@@ -2521,13 +2521,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_events, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", i);
+ bitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -2551,13 +2551,13 @@
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_item_count, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Item %u", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Item %u", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = objectidentifier(tvb, ctree, foffset);
foffset += align_4(tvb, foffset);
@@ -2577,20 +2577,20 @@
{
guint32 number_of_items;
guint32 length;
- guint32 i;
+ guint32 ii;
proto_tree *atree;
proto_item *aitem;
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Cardinal %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Cardinal %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -2614,7 +2614,7 @@
{
char *server_name;
guint32 number_of_items;
- guint32 i;
+ guint32 ii;
guint32 data_type;
proto_tree *atree;
proto_item *aitem;
@@ -2631,13 +2631,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_servers, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Info %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Info %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
data_type = tvb_get_ntohl(tvb, foffset);
proto_tree_add_item(btree, hf_ndps_data_item_type, tvb, foffset, 4, FALSE);
@@ -2677,8 +2677,8 @@
static int
attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
{
- guint32 i;
- guint32 j;
+ guint32 ii;
+ guint32 jj;
guint32 number_of_items;
guint32 number_of_items2;
guint32 attribute_type;
@@ -2744,13 +2744,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = name_or_id(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -2765,13 +2765,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL);
foffset = name_or_id(tvb, atree, foffset);
@@ -2833,13 +2833,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, FALSE);
foffset += 8;
@@ -2874,13 +2874,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = objectidentifier(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -2890,13 +2890,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_names, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL);
proto_item_set_end(aitem, tvb, foffset);
@@ -2956,13 +2956,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_locations, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Location %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Location %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, FALSE);
foffset += 8;
@@ -2992,13 +2992,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_areas, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Area %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Area %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_xmin_n64, tvb, foffset, 8, FALSE);
foffset += 8;
@@ -3079,13 +3079,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_address_items, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Address Item %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Address Item %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = address_item(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -3093,13 +3093,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_events, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -3118,9 +3118,9 @@
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -3137,13 +3137,13 @@
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %u", jj+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -3215,13 +3215,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_job_categories, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -3243,13 +3243,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_ignored_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Ignored Attribute %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Ignored Attribute %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
ignored_type = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_ignored_type, tvb, foffset, 4, ignored_type);
@@ -3290,13 +3290,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_resources, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Resource %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Resource %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
resource_type = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_resource_type, tvb, foffset, 4, resource_type);
@@ -3316,13 +3316,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_page_selects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Select %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Select %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -3377,13 +3377,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -3520,13 +3520,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_page_informations, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Information %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Information %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_page_order, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -3551,13 +3551,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_categories, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Category %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Category %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -3573,13 +3573,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_values, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Value %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Value %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -3702,13 +3702,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_names, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Name %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = qualifiedname(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -3729,13 +3729,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_colorants, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Colorant %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Colorant %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = name_or_id(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -3746,13 +3746,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_printer_def_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Printer %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Printer %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_printer_type, atree, foffset, NULL);
foffset = ndps_string(tvb, hf_ndps_printer_manuf, atree, foffset, NULL);
@@ -3798,13 +3798,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL);
proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE);
@@ -3905,13 +3905,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_events, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL);
foffset = objectidentifier(tvb, atree, foffset);
@@ -3924,13 +3924,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = objectidentifier(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -3954,7 +3954,7 @@
commonarguments(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
{
guint32 number_of_items;
- guint32 i;
+ guint32 ii;
proto_tree *atree;
proto_item *aitem;
proto_tree *btree;
@@ -3965,13 +3965,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_args, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Argument %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Argument %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -4505,8 +4505,8 @@
{
ndps_req_hash_value *request_value = NULL;
conversation_t *conversation;
- guint32 i;
- guint32 j;
+ guint32 ii;
+ guint32 jj;
guint32 field_len;
guint32 cred_type;
guint32 resource_type;
@@ -4578,13 +4578,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
if (length==4)
@@ -4617,25 +4617,25 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Value %u", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Value %u", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = attribute_value(tvb, ctree, foffset);
proto_item_set_end(citem, tvb, foffset);
@@ -4650,13 +4650,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Type %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Type %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -4668,13 +4668,13 @@
doc_content = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_doc_content, tvb, foffset, 4, doc_content);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Value %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Value %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
if (doc_content==0)
{
@@ -4713,25 +4713,25 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Value %u", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Value %u", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = attribute_value(tvb, ctree, foffset);
proto_item_set_end(citem, tvb, foffset);
@@ -4746,13 +4746,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Document Attributes */
proto_item_set_end(bitem, tvb, foffset);
@@ -4769,13 +4769,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_transfer_methods, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Method %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Method %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset); /* Transfer Method */
proto_item_set_end(bitem, tvb, foffset);
@@ -4788,13 +4788,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_doc_types, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Type %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Type %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset); /* Document Type */
proto_item_set_end(bitem, tvb, foffset);
@@ -4806,13 +4806,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Document Attributes */
proto_item_set_end(bitem, tvb, foffset);
@@ -4841,13 +4841,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Job Modifications */
proto_item_set_end(bitem, tvb, foffset);
@@ -4858,13 +4858,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Document Modifications */
proto_item_set_end(bitem, tvb, foffset);
@@ -4920,13 +4920,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = attribute_value(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -4950,13 +4950,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset); /* Start of NWDPSelector */
proto_tree_add_uint(atree, hf_ndps_num_options, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Option %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Option %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentification(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -4966,7 +4966,8 @@
filter_type = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_filter, tvb, foffset, 4, filter_type);
foffset += 4;
- /*if (filter_type == 0 || filter_type == 3 )
+#if 0
+ if (filter_type == 0 || filter_type == 3 )
{
foffset = filteritem(tvb, ndps_tree, foffset);
}
@@ -4977,16 +4978,17 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
foffset = filteritem(tvb, ndps_tree, foffset);
}
proto_item_set_end(aitem, tvb, foffset);
- }*/
+ }
+#endif
proto_tree_add_item(ndps_tree, hf_ndps_time_limit, tvb, foffset, 4, FALSE);
foffset += 4;
proto_tree_add_item(ndps_tree, hf_ndps_count_limit, tvb, foffset, 4, FALSE);
@@ -4998,13 +5000,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset); /* Start of NWDPObjectIdentifierSet */
proto_tree_add_uint(atree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5157,13 +5159,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -5219,9 +5221,9 @@
number_of_items = tvb_get_ntohl(tvb, foffset); /* Start of ResubmitJob Set */
proto_tree_add_uint(atree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -5241,13 +5243,13 @@
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %u", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %u", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = attribute_value(tvb, ctree, foffset); /* Object Attribute Set */
proto_item_set_end(citem, tvb, foffset);
@@ -5260,13 +5262,13 @@
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %u", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %u", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = attribute_value(tvb, ctree, foffset); /* Object Attribute Set */
proto_item_set_end(citem, tvb, foffset);
@@ -5299,13 +5301,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Modification %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -5425,13 +5427,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5630,13 +5632,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5653,13 +5655,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = objectidentifier(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5752,13 +5754,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -5783,9 +5785,9 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -5821,13 +5823,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -5859,13 +5861,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Entry %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Entry %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = server_entry(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5876,13 +5878,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Entry %u", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Entry %u", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = server_entry(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -5937,13 +5939,13 @@
foffset += 4;
number_of_items=tvb_get_ntohl(tvb, foffset);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -5966,13 +5968,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Supplier Alias %u", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Supplier Alias %u", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = qualifiedname(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -6019,13 +6021,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Delivery Addresses");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -6163,13 +6165,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event Items");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
/* Start of ReportEventItem */
proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, FALSE);
@@ -6203,13 +6205,13 @@
foffset += 4;
citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute Modifications");
ctree = proto_item_add_subtree(citem, ett_ndps);
- for (j = 1 ; j <= number_of_items; j++ )
+ for (jj = 0; jj < number_of_items; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ctree, tvb, foffset, -1, "[Truncated]");
break;
}
- ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Modification %d", j);
+ ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Modification %d", jj+1);
dtree = proto_item_add_subtree(ditem, ett_ndps);
foffset = attribute_value(tvb, dtree, foffset); /* Object Attribute Set */
proto_item_set_end(ditem, tvb, foffset);
@@ -6230,13 +6232,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_destinations, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Destination %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Destination %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
/* Start of Destination */
/* Start of NameorID */
@@ -6287,13 +6289,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attributes");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -6381,13 +6383,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Security %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -6414,13 +6416,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
length_remaining = tvb_length_remaining(tvb, foffset);
@@ -6573,13 +6575,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -6634,13 +6636,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -6686,9 +6688,9 @@
foffset += 4;
bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute");
btree = proto_item_add_subtree(bitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -6722,7 +6724,7 @@
guint32 number_of_items;
guint32 ndps_problem_type;
guint32 problem_type;
- guint32 i;
+ guint32 ii;
proto_tree *atree;
proto_item *aitem;
proto_tree *btree;
@@ -6871,13 +6873,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_problem_type, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -6960,9 +6962,9 @@
proto_item *citem;
proto_tree *dtree;
proto_item *ditem;
- guint32 i;
- guint32 j;
- guint32 k;
+ guint32 ii;
+ guint32 jj;
+ guint32 kk;
guint32 number_of_items=0;
guint32 number_of_items2=0;
guint32 number_of_items3=0;
@@ -7097,13 +7099,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object Attribute Set");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -7124,13 +7126,13 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_options, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Option %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Option %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
length_remaining = tvb_length_remaining(tvb, foffset);
@@ -7157,41 +7159,41 @@
number_of_items=tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_results, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated Result]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Results: (%d)", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Results: (%d)", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
- if (i>1) {
+ if (ii>0) {
foffset += 2;
}
foffset = objectidentification(tvb, btree, foffset);
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_objects, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated Object]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Object: (%d)", j);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Object: (%d)", jj+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = objectidentifier(tvb, ctree, foffset);
foffset += align_4(tvb, foffset);
number_of_items3 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ctree, hf_ndps_num_values, tvb, foffset, 4, number_of_items3);
foffset += 4;
- for (k = 1 ; k <= number_of_items3; k++ )
+ for (kk = 0; kk < number_of_items3; kk++ )
{
- if (k > NDPS_MAX_ITEMS) {
+ if (kk >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ctree, tvb, foffset, -1, "[Truncated Value]");
break;
}
- ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Value: (%d)", k);
+ ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Value: (%d)", kk+1);
dtree = proto_item_add_subtree(ditem, ett_ndps);
foffset = attribute_value(tvb, dtree, foffset);
proto_item_set_end(ditem, tvb, foffset);
@@ -7229,13 +7231,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object Attribute Set");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Attribute %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -7273,13 +7275,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Resubmit Job");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Job %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Job %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
/* Start of NWDPPrtContainedObjectId */
citem = proto_tree_add_text(btree, tvb, foffset, -1, "Old Job");
@@ -7303,13 +7305,13 @@
foffset += 4;
citem = proto_tree_add_text(btree, tvb, foffset, -1, "Job Status");
ctree = proto_item_add_subtree(citem, ett_ndps);
- for (j = 1 ; j <= number_of_items2; j++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (j > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ctree, tvb, foffset, -1, "[Truncated]");
break;
}
- ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Object %d", j);
+ ditem = proto_tree_add_text(ctree, tvb, foffset, -1, "Object %d", jj+1);
dtree = proto_item_add_subtree(ditem, ett_ndps);
foffset = attribute_value(tvb, dtree, foffset); /* Object Attribute Set */
proto_item_set_end(ditem, tvb, foffset);
@@ -7332,13 +7334,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -7358,13 +7360,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Object %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = attribute_value(tvb, btree, foffset); /* Object Attribute Set */
proto_item_set_end(bitem, tvb, foffset);
@@ -7421,13 +7423,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -7472,13 +7474,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_events, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
/* Start of Eventhandling2 */
proto_tree_add_item(atree, hf_ndps_profile_id, tvb, foffset, 4, FALSE);
@@ -7504,13 +7506,13 @@
foffset += 4;
bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Delivery Addresses");
btree = proto_item_add_subtree(bitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Address %d", i);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Address %d", ii+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = address_item(tvb, ctree, foffset);
proto_item_set_end(citem, tvb, foffset);
@@ -7527,13 +7529,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
- citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %d", i);
+ citem = proto_tree_add_text(btree, tvb, foffset, -1, "Attribute %d", ii+1);
ctree = proto_item_add_subtree(citem, ett_ndps);
foffset = objectidentifier(tvb, ctree, foffset);
proto_item_set_end(citem, tvb, foffset);
@@ -7581,13 +7583,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_services, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Service %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Service %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_service_type, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -7617,13 +7619,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -7650,13 +7652,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = server_entry(tvb, atree, foffset);
proto_item_set_end(aitem, tvb, foffset);
@@ -7675,9 +7677,9 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, FALSE);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -7722,13 +7724,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Attribute %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
length = tvb_get_ntohl(tvb, foffset);
foffset += 4;
@@ -7799,13 +7801,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -7850,14 +7852,14 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_delivery_method_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
/* Start of DeliveryMethod */
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
/* Start of NameorID */
bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Method ID");
@@ -7896,13 +7898,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Delivery Addresses");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Address %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = address_item(tvb, btree, foffset);
proto_item_set_end(bitem, tvb, foffset);
@@ -7970,13 +7972,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_printer_def_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Definition %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Definition %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
if (tvb_get_ntohl(tvb, foffset)==0) { /* Offset for old type support */
foffset += 2;
@@ -8000,13 +8002,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Banner %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Banner %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_banner_name, atree, foffset, NULL);
proto_item_set_end(aitem, tvb, foffset);
@@ -8016,13 +8018,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_font_type_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Font %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Font %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_font_type_name, atree, foffset, NULL);
proto_item_set_end(aitem, tvb, foffset);
@@ -8032,13 +8034,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_font_file_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Font File %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Font File %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_font_file_name, atree, foffset, NULL);
proto_item_set_end(aitem, tvb, foffset);
@@ -8050,13 +8052,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_printer_def_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "File %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "File %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_prn_file_name, atree, foffset, NULL);
foffset = ndps_string(tvb, hf_ndps_prn_dir_name, atree, foffset, NULL);
@@ -8068,13 +8070,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_printer_def_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Definition %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Definition %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_prn_file_name, atree, foffset, NULL);
foffset = ndps_string(tvb, hf_ndps_prn_dir_name, atree, foffset, NULL);
@@ -8084,13 +8086,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_def_file_name, atree, foffset, NULL);
number_of_items2 = tvb_get_ntohl(tvb, foffset);
@@ -8098,9 +8100,9 @@
bitem = proto_tree_add_text(atree, tvb, foffset, 4, "Windows 3.1 Keys");
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset += 4;
- for (i = 1 ; i <= number_of_items2; i++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -8112,9 +8114,9 @@
bitem = proto_tree_add_text(atree, tvb, foffset, 4, "Windows 95 Keys");
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset += 4;
- for (i = 1 ; i <= number_of_items2; i++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(btree, tvb, foffset, -1, "[Truncated]");
break;
}
@@ -8129,26 +8131,26 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_os_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "OS %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "OS %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_os_type, tvb, foffset, 4, FALSE);
foffset += 4;
number_of_items2 = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(atree, hf_ndps_num_windows_keys, tvb, foffset, 4, number_of_items2);
foffset += 4;
- for (i = 1 ; i <= number_of_items2; i++ )
+ for (jj = 0; jj < number_of_items2; jj++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (jj >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Key %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Key %d", jj+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_windows_key, btree, foffset, NULL);
proto_item_set_end(bitem, tvb, foffset);
@@ -8162,13 +8164,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_printer_type_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Type %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Type %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
foffset = ndps_string(tvb, hf_ndps_printer_manuf, atree, foffset, NULL);
foffset = ndps_string(tvb, hf_ndps_printer_type, atree, foffset, NULL);
@@ -8185,13 +8187,13 @@
number_of_items = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(ndps_tree, hf_ndps_language_count, tvb, foffset, 4, number_of_items);
foffset += 4;
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]");
break;
}
- aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Language %d", i);
+ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Language %d", ii+1);
atree = proto_item_add_subtree(aitem, ett_ndps);
proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, FALSE);
foffset += 4;
@@ -8284,13 +8286,13 @@
foffset += 4;
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Failed Items");
atree = proto_item_add_subtree(aitem, ett_ndps);
- for (i = 1 ; i <= number_of_items; i++ )
+ for (ii = 0; ii < number_of_items; ii++ )
{
- if (i > NDPS_MAX_ITEMS) {
+ if (ii >= NDPS_MAX_ITEMS) {
proto_tree_add_text(atree, tvb, foffset, -1, "[Truncated]");
break;
}
- bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", i);
+ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", ii+1);
btree = proto_item_add_subtree(bitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
length_remaining = tvb_length_remaining(tvb, foffset);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-opsi.c
^
|
| @@ -2,7 +2,7 @@
* Routines for OPSI protocol dissection
* Copyright 2004, Laurent Rabret (France Telecom R&D) <laurent.rabret@i.hate.spams.org>
*
- * $Id: packet-opsi.c 35224 2010-12-20 05:35:29Z guy $
+ * $Id: packet-opsi.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-pcli.c
^
|
| @@ -4,7 +4,7 @@
* http://www.packetcable.com/downloads/specs/pkt-sp-esp-I01-991229.pdf
* Chapter 4 ( Call Content Connection Interface )
*
- * $Id: packet-pcli.c 35224 2010-12-20 05:35:29Z guy $
+ * $Id: packet-pcli.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-ptp.c
^
|
| @@ -20,7 +20,7 @@
* - Torrey Atcitty & Dave Olsen 05.14.2010
* - Added support for 802.1AS D7.0
*
- * $Id: packet-ptp.c 41677 2012-03-19 18:06:01Z gerald $
+ * $Id: packet-ptp.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -3063,7 +3063,7 @@
}
case PTP_V2_MM_ID_FAULT_LOG:
{
- guint16 i, num = 0;
+ guint16 ii, num = 0;
proto_item *ptpError_ti;
proto_tree *ptpError_subtree;
@@ -3073,7 +3073,7 @@
Offset, 2, FALSE);
Offset +=2;
- for (i = 1; i <= num; i++)
+ for (ii = 0; ii < num; ii++)
{
ptpError_ti = proto_tree_add_text(ptp_managementData_tree, tvb, Offset, tvb_get_ntohs (tvb, Offset), "Fault record");
@@ -3449,7 +3449,7 @@
{
guint16 i = 0;
/* one or more ClockIdentity */
- for (i = 1; i <= (tlv_length / 8); i++)
+ for (i = 0; i < (tlv_length / 8); i++)
{
proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb,
Offset, 8, FALSE);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-rlm.c
^
|
| @@ -2,7 +2,7 @@
* Routines for RLM dissection
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-rlm.c 36649 2011-04-15 12:53:20Z martinm $
+ * $Id: packet-rlm.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-rtcp.c
^
|
| @@ -1,6 +1,6 @@
/* packet-rtcp.c
*
- * $Id: packet-rtcp.c 37052 2011-05-10 18:52:37Z cmaynard $
+ * $Id: packet-rtcp.c 46230 2012-11-27 17:42:23Z gerald $
*
* Routines for RTCP dissection
* RTCP = Real-time Transport Control Protocol
@@ -1474,6 +1474,7 @@
default:
break;
}
+ if ((int)(offset + packet_len) >= offset)
offset += packet_len;
return offset;
}
@@ -1505,10 +1506,10 @@
else
{
/* fall back to just showing the data if it's the wrong length */
- proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, FALSE );
+ proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, ENC_NA );
}
+ if ((int)(offset + packet_len) >= offset)
offset += packet_len;
-
return offset;
}
else
@@ -1529,6 +1530,7 @@
*/
packet_len -= tvb_get_guint8( tvb, offset + packet_len - 1 );
}
+ if ((int)(offset + packet_len) >= offset)
offset += packet_len;
return offset;
}
@@ -1545,9 +1547,9 @@
*/
packet_len -= tvb_get_guint8( tvb, offset + packet_len - 1 );
}
- proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, FALSE );
+ proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, ENC_NA );
+ if ((int)(offset + packet_len) >= offset)
offset += packet_len;
-
return offset;
}
}
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-rtnet.c
^
|
| @@ -1,7 +1,7 @@
/* packet-rtnet.c
* Routines for RTnet packet disassembly
*
- * $Id: packet-rtnet.c 35224 2010-12-20 05:35:29Z guy $
+ * $Id: packet-rtnet.c 46226 2012-11-27 17:08:10Z gerald $
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
* Copyright (c) 2004 by Jan Kiszka <jan.kiszka@web.de>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-rudp.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Reliable UDP Protocol.
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-rudp.c 35224 2010-12-20 05:35:29Z guy $
+ * $Id: packet-rudp.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-sbus.c
^
|
| @@ -2,7 +2,7 @@
* Routines for Ether-S-Bus dissection
* Copyright 2010, Christian Durrer <christian.durrer@sensemail.ch>
*
- * $Id: packet-sbus.c 36826 2011-04-22 18:04:26Z sfisher $
+ * $Id: packet-sbus.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-smb2.c
^
|
| @@ -9,7 +9,7 @@
*
* If you edit this file, keep the wiki updated as well.
*
- * $Id: packet-smb2.c 37069 2011-05-12 03:18:34Z morriss $
+ * $Id: packet-smb2.c 46232 2012-11-27 18:15:23Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -4101,6 +4101,7 @@
/* minimum count */
proto_tree_add_item(tree, hf_smb2_min_count, tvb, offset, 4, TRUE);
+ offset += 4;
/* channel */
proto_tree_add_item(tree, hf_smb2_channel, tvb, offset, 4, TRUE);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-stun.c
^
|
| @@ -5,7 +5,7 @@
* Copyright 2007-2008, 8x8 Inc. <petithug@8x8.com>
* Copyright 2008, Gael Breard <gael@breard.org>
*
- * $Id: packet-stun.c 44368 2012-08-09 00:30:22Z gerald $
+ * $Id: packet-stun.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-tpncp.c
^
|
| @@ -3,7 +3,7 @@
*
* Copyright (c) 2007 by Valery Sigalov <valery.sigalov@audiocodes.com>
*
- * $Id: packet-tpncp.c 36432 2011-04-01 18:16:47Z cmaynard $
+ * $Id: packet-tpncp.c 46233 2012-11-27 18:19:47Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.com>
@@ -38,6 +38,7 @@
#include <wsutil/file_util.h>
+#include <epan/exceptions.h>
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/emem.h>
@@ -375,7 +376,8 @@
/*-------------------------------------------------------------------------------------------------------------------------------------------*/
static gint fill_enums_id_vals(FILE *file) {
- gint i = 0, enum_id = 0, enum_val = 0, first_entry = 1;
+ gint i = 0, enum_id = 0, enum_val = 0;
+ gboolean first_entry = TRUE;
gchar *line_in_file = NULL, *enum_name = NULL,
*enum_type = NULL, *enum_str = NULL;
@@ -405,7 +407,7 @@
}
}
else
- first_entry = 0;
+ first_entry = FALSE;
tpncp_enums_name_vals[enum_val] = g_strdup(enum_name);
g_strlcpy(enum_type, enum_name, MAX_TPNCP_DB_ENTRY_LEN);
}
@@ -419,6 +421,16 @@
}
}
}
+ /* make sure the last entry in the array is null but
+ * don't overflow if we've filled the entire thing (in which case
+ * we have to drop an entry) */
+ if (enum_val + 1 >= MAX_ENUMS_NUM) {
+ g_free(tpncp_enums_name_vals[enum_val]);
+ tpncp_enums_name_vals[enum_val] = NULL;
+ }
+ else {
+ tpncp_enums_name_vals[enum_val+1] = NULL;
+ }
return 0;
}
@@ -759,14 +771,27 @@
proto_tpncp = proto_register_protocol("AudioCodes TPNCP (TrunkPack Network Control Protocol)",
"TPNCP", "tpncp");
- /*
- * The function proto_register_field_array can not work with dynamic arrays,
- * so passing dynamic array elements one-by-one in the loop.
+ /* Rather than duplicating large quantities of code from
+ * proto_register_field_array() and friends to sanitize the tpncp.dat file
+ * when we read it, just catch any exceptions we get while registering and
+ * take them as a hint that the file is corrupt. Then move on, so that at
+ * least the rest of the protocol dissectors will still work.
*/
- for(idx = 0; idx < hf_size; idx++) {
- proto_register_field_array(proto_tpncp, &hf[idx], 1);
+ TRY {
+ /* The function proto_register_field_array does not work with dynamic
+ * arrays, so pass dynamic array elements one-by-one in the loop.
+ */
+ for(idx = 0; idx < hf_size; idx++) {
+ proto_register_field_array(proto_tpncp, &hf[idx], 1);
+ }
}
+ CATCH_ALL {
+ g_warning("Corrupt tpncp.dat file, tpncp dissector will not work.");
+ }
+
+ ENDTRY;
+
proto_register_subtree_array(ett, array_length(ett));
register_dissector("tpncp", dissect_tpncp, proto_tpncp);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-usb.c
^
|
| @@ -1,6 +1,6 @@
/* packet-usb.c
*
- * $Id: packet-usb.c 41677 2012-03-19 18:06:01Z gerald $
+ * $Id: packet-usb.c 46227 2012-11-27 17:20:27Z gerald $
*
* USB basic dissector
* By Paolo Abeni <paolo.abeni@email.it>
@@ -1077,10 +1077,10 @@
if(item){
proto_item_set_len(item, len);
}
- if (offset != old_offset + len) {
- /* unknown records */
+ if (offset < old_offset+len) {
+ /* skip unknown records */
+ offset = old_offset + len;
}
- offset = old_offset + len;
return offset;
}
@@ -1190,10 +1190,10 @@
if(item){
proto_item_set_len(item, len);
}
- if (offset != old_offset + len) {
- /* unknown records */
+ if (offset < old_offset+len) {
+ /* skip unknown records */
+ offset = old_offset + len;
}
- offset = old_offset + len;
return offset;
}
@@ -1320,7 +1320,7 @@
usb_trans_info->interface_info=NULL;
/* decode any additional interface and endpoint descriptors */
- while(len>(old_offset-offset)){
+ while(len>(offset-old_offset)){
guint8 next_type;
if(tvb_length_remaining(tvb, offset)<2){
@@ -1775,7 +1775,8 @@
guint8 transfer_type;
guint8 endpoint_number;
guint8 transfer_type_and_direction;
- guint8 type, flag;
+ guint8 type;
+ guint8 flag[2];
guint16 val16;
guint32 val32;
guint64 val64;
@@ -1808,20 +1809,22 @@
* sizeof(struct usb_device_setup_hdr) bytes. The content of these
* bytes only have meaning in case setup_flag == 0.
*/
- flag = tvb_get_guint8(tvb, 14);
- if (flag == 0) {
+ flag[0] = tvb_get_guint8(tvb, 14);
+ flag[1] = '\0';
+ if (flag[0] == 0) {
proto_tree_add_string(tree, hf_usb_setup_flag, tvb, 14, 1, "relevant (0)");
} else {
proto_tree_add_string_format_value(tree, hf_usb_setup_flag, tvb,
- 14, 1, &flag, "not relevant ('%c')", isprint(flag) ? flag: '.');
+ 14, 1, flag, "not relevant ('%c')", isprint(flag[0]) ? flag[0]: '.');
}
- flag = tvb_get_guint8(tvb, 15);
- if (flag == 0) {
+ flag[0] = tvb_get_guint8(tvb, 15);
+ flag[1] = '\0';
+ if (flag[0] == 0) {
proto_tree_add_string(tree, hf_usb_data_flag, tvb, 15, 1, "present (0)");
} else {
proto_tree_add_string_format_value(tree, hf_usb_data_flag, tvb,
- 15, 1, &flag, "not present ('%c')", isprint(flag) ? flag : '.');
+ 15, 1, flag, "not present ('%c')", isprint(flag[0]) ? flag[0] : '.');
}
tvb_memcpy(tvb, (guint8 *)&val64, 16, 8);
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-v5ua.c
^
|
| @@ -15,7 +15,7 @@
*
* Routines for V5.2-User Adaptation Layer dissection
*
- * $Id: packet-v5ua.c 35377 2011-01-05 15:23:53Z morriss $
+ * $Id: packet-v5ua.c 46226 2012-11-27 17:08:10Z gerald $
*
* Extension of ISDN Q.921-User Adaptation Layer dissection
* Copyright 2002, Michael Tuexen <Michael.Tuexen[AT]siemens.com>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-vnc.c
^
|
| @@ -3,7 +3,7 @@
* Copyright 2005, Ulf Lamping <ulf.lamping@web.de>
* Copyright 2006-2007, Stephen Fisher (see AUTHORS file)
*
- * $Id: packet-vnc.c 36808 2011-04-22 14:32:35Z morriss $
+ * $Id: packet-vnc.c 45493 2012-10-11 22:16:32Z wmeier $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1456,7 +1456,7 @@
per_packet_info->preferred_encoding = -1;
- for(counter = 1; counter <= number_of_encodings; counter++) {
+ for(counter = 0; counter < number_of_encodings; counter++) {
proto_tree_add_item(tree,
hf_vnc_client_set_encodings_encoding_type,
tvb, *offset, 4, FALSE);
@@ -1586,7 +1586,7 @@
vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
proto_tree *tree)
{
- gint i;
+ gint ii;
guint16 num_rects, width, height;
guint bytes_needed = 0;
guint32 encoding_type;
@@ -1615,10 +1615,10 @@
*/
VNC_BYTES_NEEDED((guint)12*num_rects);
- for(i = 1; i <= num_rects; i++) {
+ for(ii = 0; ii < num_rects; ii++) {
ti = proto_tree_add_text(tree, tvb, *offset, 12,
- "Rectangle #%d", i);
+ "Rectangle #%d", ii+1);
vnc_rect_tree =
proto_item_add_subtree(ti, ett_vnc_rect);
@@ -1755,8 +1755,8 @@
proto_tree_add_text(tree, tvb, *offset, 3, "Padding");
VNC_BYTES_NEEDED((guint32)(3 + (num_of_screens * 16)));
*offset += 3;
- for(i = 1; i <= num_of_screens; i++) {
- ti = proto_tree_add_text(tree, tvb, *offset, 16, "Screen #%u", i);
+ for(i = 0; i < num_of_screens; i++) {
+ ti = proto_tree_add_text(tree, tvb, *offset, 16, "Screen #%u", i+1);
screen_tree = proto_item_add_subtree(ti, ett_vnc_desktop_screen);
proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_id, tvb, *offset, 4, FALSE);
@@ -1843,10 +1843,10 @@
*/
bytes_needed = bytes_per_pixel + 8;
VNC_BYTES_NEEDED(bytes_needed * num_subrects);
- for(i = 1; i <= num_subrects; i++) {
+ for(i = 0; i < num_subrects; i++) {
ti = proto_tree_add_text(tree, tvb, *offset, bytes_per_pixel +
- 8, "Subrectangle #%d", i);
+ 8, "Subrectangle #%d", i+1);
subrect_tree =
proto_item_add_subtree(ti, ett_vnc_rre_subrect);
@@ -1972,10 +1972,10 @@
num_subrects_tree =
proto_item_add_subtree(ti, ett_vnc_hextile_num_subrects);
- for(i = 1; i <= num_subrects; i++) {
+ for(i = 0; i < num_subrects; i++) {
ti = proto_tree_add_text(num_subrects_tree, tvb,
*offset, subrect_len,
- "Subrectangle #%d", i);
+ "Subrectangle #%d", i+1);
subrect_tree =
proto_item_add_subtree(ti, ett_vnc_hextile_subrect);
@@ -2424,10 +2424,10 @@
vnc_colormap_num_groups =
proto_item_add_subtree(ti, ett_vnc_colormap_num_groups);
- for(counter = 1; counter <= number_of_colors; counter++) {
+ for(counter = 0; counter < number_of_colors; counter++) {
ti = proto_tree_add_text(vnc_colormap_num_groups, tvb,
*offset, 6,
- "Color group #%d", counter);
+ "Color group #%d", counter+1);
vnc_colormap_color_group =
proto_item_add_subtree(ti,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/dissectors/packet-wtp.c
^
|
| @@ -2,7 +2,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
- * $Id: packet-wtp.c 36809 2011-04-22 14:33:58Z morriss $
+ * $Id: packet-wtp.c 46229 2012-11-27 17:26:42Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -618,7 +618,7 @@
if (fCon) { /* Now, analyze variable part */
unsigned char tCon;
unsigned char tByte;
- unsigned char tpiLen;
+ guint tpiLen;
tvbuff_t *tmp_tvb;
vHeader = 0; /* Start scan all over */
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/emem.c
^
|
| @@ -2,7 +2,7 @@
* Wireshark memory management and garbage collection functions
* Ronnie Sahlberg 2005
*
- * $Id: emem.c 45235 2012-10-01 17:56:38Z gerald $
+ * $Id: emem.c 45357 2012-10-06 21:55:05Z jake $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1903,11 +1903,11 @@
if((key[0].length==1)&&(key[1].length==0)){ /* last key in key array */
return emem_tree_lookup32_le(se_tree, *key[0].key);
}
- next_tree=emem_tree_lookup32(se_tree, *key[0].key);
- /* key[0].key not found so find le and return */
- if(!next_tree)
- return emem_tree_lookup32_le(se_tree, *key[0].key);
-
+ next_tree=emem_tree_lookup32_le(se_tree, *key[0].key);
+ /* key[0].key not found so return NULL */
+ if(!next_tree){
+ return NULL;
+ }
/* key[0].key found so inc key pointer and try again */
if(key[0].length==1){
key++;
@@ -2079,11 +2079,12 @@
return emem_tree_foreach_nodes(emem_tree->tree, callback, user_data);
}
+static void emem_print_subtree(emem_tree_t* emem_tree, guint32 level);
static void
-emem_tree_print_nodes(emem_tree_node_t* node, int level)
+emem_tree_print_nodes(const char *prefix, emem_tree_node_t* node, guint32 level)
{
- int i;
+ guint32 i;
if (!node)
return;
@@ -2092,23 +2093,39 @@
printf(" ");
}
- printf("NODE:%p parent:%p left:0x%p right:%px key:%d data:%p\n",
+ printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%u %s:%p\n", prefix,
(void *)node,(void *)(node->parent),(void *)(node->left),(void *)(node->right),
- (node->key32),node->data);
+ (node->u.rb_color)?"Black":"Red",(node->key32),(node->u.is_subtree)?"tree":"data",node->data);
if(node->left)
- emem_tree_print_nodes(node->left, level+1);
+ emem_tree_print_nodes("L-", node->left, level+1);
if(node->right)
- emem_tree_print_nodes(node->right, level+1);
+ emem_tree_print_nodes("R-", node->right, level+1);
+
+ if (node->u.is_subtree)
+ emem_print_subtree(node->data, level+1);
}
-void
-emem_print_tree(emem_tree_t* emem_tree)
+
+static void
+emem_print_subtree(emem_tree_t* emem_tree, guint32 level)
{
+ guint32 i;
+
if (!emem_tree)
return;
- printf("EMEM tree type:%d name:%s tree:%p\n",emem_tree->type,emem_tree->name,(void *)(emem_tree->tree));
+ for(i=0;i<level;i++){
+ printf(" ");
+ }
+
+ printf("EMEM tree:%p type:%s name:%s root:%p\n",emem_tree,(emem_tree->type==1)?"RedBlack":"unknown",emem_tree->name,(void *)(emem_tree->tree));
if(emem_tree->tree)
- emem_tree_print_nodes(emem_tree->tree, 0);
+ emem_tree_print_nodes("Root-", emem_tree->tree, level);
+}
+
+void
+emem_print_tree(emem_tree_t* emem_tree)
+{
+ emem_print_subtree(emem_tree, 0);
}
/*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/emem.h
^
|
| @@ -2,7 +2,7 @@
* Definitions for Wireshark memory management and garbage collection
* Ronnie Sahlberg 2005
*
- * $Id: emem.h 42669 2012-05-16 22:42:28Z gerald $
+ * $Id: emem.h 45349 2012-10-06 16:21:53Z jake $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -515,6 +515,13 @@
*/
emem_strbuf_t *ep_strbuf_truncate(emem_strbuf_t *strbuf, gsize len);
+/**
+ * Dump the whole tree (of trees) to stdout.
+ *
+ * @param emem_tree The tree to dump to standard output.
+ *
+ * @return void
+ */
void emem_print_tree(emem_tree_t* emem_tree);
/* #define DEBUG_INTENSE_CANARY_CHECKS */
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/enterprise-numbers
^
|
| @@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2012-09-30)
+(last updated 2012-11-22)
SMI Network Management Private Enterprise Codes:
@@ -299,8 +299,8 @@
lcc.arthur&SEAS.UCLA.EDU
71
NASA
- Elizabeth Sudderth
- Elizabeth.C.Sudderth&nasa.gov
+ Philip Posey
+ Philip.E.Posey&nasa.gov
72
Retix
Alex Martin
@@ -11418,9 +11418,9 @@
Berry Kercheval
berry&join.com
2853
- IDEXX Software Division
- David Kincaid
- dkincaid&advancedvet.com
+ IDEXX Laboratories, Inc.
+ George Rusak
+ winsystems&idexx.com
2854
Network Computing Technologies, Inc.
Martin Cooley
@@ -17862,9 +17862,9 @@
Kevin Conley
KevinC&dfw.viewcast.com
4466
- Tadiran Scopus
- Sharon Caspi
- yossia&magicom.co.il
+ Harmonic Video Network (previous was 'Tadiran Scopus')
+ Merav Ben-Elia
+ merav.ben-elia&harmonicinc.com
4467
FibroLan
Israel Stein
@@ -18931,8 +18931,8 @@
khesky&zarak.com
4735
SOMA Networks, Inc.
- Govindan Ravindran
- gravin&somanetworks.com
+ Chris Davis
+ cdavis&somanetworks.com
4736
Appliant, Inc.
Brian Marsh
@@ -35026,9 +35026,9 @@
Turbo Fredriksson
turbo&bayour.com
8768
- Network Electronics
- Geir Thomassen
- gthomassen&networkgroup.no
+ Nevion (previous was 'Network Electronics')
+ Jan Helgesen
+ jihelgesen&nevion.com
8769
TeraOptic Networks, Inc.
Ashok Ranganath
@@ -61815,9 +61815,9 @@
Theodore Reph
ted&reph.org
15566
- A-Care Systems, Inc.
+ Experian Japan Co., Ltd (previous was 'A-Care Systems, Inc.')
Hideki Yamashita
- h.yamashita&a-care.co.jp
+ Hideki.Yamashita&jp.experian.com
15567
Neople Ltd.
Jeongyun Lee
@@ -65011,9 +65011,9 @@
Frédéric Gobry
frederic.gobry&smartdata.ch
16365
- Swissrisk Financial Systems GmbH (previous was 'Swissrisk AG')
+ Dion Global Solutions GmbH (previous was 'Swissrisk Financial Systems GmbH')
Holger Kuest
- holger.kuest&swissrisk.com
+ holger.kuest&dionglobal.com
16366
INFORMA DEL PERU, INFORMACION ECONOMICA SA
Javier Terrón
@@ -65848,8 +65848,8 @@
dwinter&icpeurope.net
16574
Ontario Systems
- Adam Yoder
- adam&ontario.com
+ Michael Wolfe
+ michael.wolfe&ontariosystems.com
16575
Oops Org
Alex Hooper
@@ -80088,7 +80088,7 @@
20133
izac.org
Benoit Izac
- benoit.izac&free.fr
+ benoit&izac.org
20134
Surf and Sip Inc.
Mack Nagashima
@@ -82075,8 +82075,8 @@
LUCA ZANETTI
luca&streamtel.com
20630
- ODIBOSS NETWORK
- REGINALD.ODINAKACHI.NNADIRINWA
+ ODIBOSS NETWORKS
+ REGINALD ODINAKACHI NNADIRINWA
odiboss&yahoo.com
20631
MC110-GRUPO1
@@ -84089,8 +84089,8 @@
ferdinand.de.bakker&novum-it.com
21133
University of Iowa Hospitals and Clinics
- Larry Strickland
- stricklandl&uihc.uiowa.edu
+ Robert Heitman
+ robert-heitman&uiowa.edu
21134
University of Minnesota
David Carlson
@@ -99167,9 +99167,9 @@
Rolf Wilteus
support&agama.tv
24900
- GoBackTV, Inc.
+ Aurora Networks (GoBackTV)
Dave Baran
- dbaran&gobacktv.com
+ dbaran&aurora.com
24901
Future Infonet
Hyun-Su Choi
@@ -99235,9 +99235,9 @@
Stephen Luisser
support&essent.com
24917
- Collaborative Fusion, Inc.
+ Intermedix (previous was 'Collaborative Fusion, Inc.')
Sean McAfee
- smcafee&collaborativefusion.com
+ sean.mcafee&intermedix.com
24918
Radmer
Randy Radmer
@@ -120978,8 +120978,8 @@
matthias.wieser&hiasl.net
30349
Kvant-Efir
- Volkoff Roman
- volkoff_roman&ukr.net
+ Sergey Pylypchuk
+ digital&kvantefir.com
30350
Caucho Technology, Inc.
Nam Nguyen
@@ -131126,9 +131126,9 @@
Marcel Kleiber
marcel.kleiber&h-net.ch
32886
- TADASoft Ltd
+ Restorepoint (previous was 'TADASoft Ltd')
Riccardo Valente
- engineering&tadasoft.com
+ riccardo&restorepoint.com
32887
Joseph King ICT Consultants
Yusuf Rajah
@@ -133606,9 +133606,9 @@
Bill Sella
bill.sella&twtelecom.com
33506
- Enginuity PLM LLC
+ Dassault Systemes (previous was 'Enginuity PLM LLC')
Carl P. Miller
- cmiller&enginuityplm.com
+ carl.miller&3ds.com
33507
Elster Electricity, LLC
Edward J. Beroset
@@ -145447,9 +145447,9 @@
Hari Ramachandran
hari.ramachandran&intel.com
36466
- IdaTech, LLC
+ Ballard Fuel Cell Systems (previous was 'IdaTech, LLC')
Darin Luse
- dluse&idatech.com
+ darin.luse&ballard.com
36467
adesso AG
Christoph Stoppe
@@ -147988,8 +147988,8 @@
lochoda&endai.com
37101
Quelltext AG
- Hans Peter Wiedau
- pen&quelltext.com
+ Arndt Schönewald
+ pen&iana881x7712.mc.schoenewald.de
37102
Wind mobile
Henry Zheng
@@ -149792,8 +149792,8 @@
giampaolo.sica&ifminfomaster.com
37552
RAYCORE TAIWAN CO., LTD.
- Andrew Chang
- ac&raycore.com.tw
+ Jimmy Chiang
+ contact&raycore.com.tw
37553
FRDLWEB
Till Wehowski
@@ -162086,6 +162086,1094 @@
SBO "Centre of Information Technology of the Orenburg region"
Karaseva Natalya
ngka&mail.orb.ru
+40626
+ Web de Confianza Andaluza S.Coop.And.
+ María de los Ángeles Ojeda Rojas
+ info&webconefe.com
+40627
+ Jefferson Regional Medical Center
+ Toni Fox
+ toni.fox&jeffersonregional.com
+40628
+ FormPipe Software A/S
+ Thomas Larsen
+ thomas.larsen&formpipe.com
+40629
+ Lexington, S.L.
+ Daniel Paniagua
+ soporte&lexington.es
+40630
+ Crexendo, Inc.
+ Larry Low
+ llow&crexendo.com
+40631
+ AVA Communications
+ Payam Shabanian
+ shabanip&gmail.com
+40632
+ Trüb AG
+ Gergely Karoly
+ help&trueb.ch
+40633
+ "Scan Engineering Telecom" CJSC
+ Eugene Litvinov
+ pro&setdsp.ru
+40634
+ Willway, S.A.
+ Rui Monteiro
+ rmonteiro&willway.pt
+40635
+ opvizor GmbH
+ Dennis Zimmer
+ info&opvizor.com
+40636
+ Use System Engineering B.V.
+ Marco ten Thije
+ marco.tenthije&usetechnology.nl
+40637
+ Deliservice Punnitse & Säästä Oy
+ Teemu Haapoja
+ teemu.haapoja&punnitse.fi
+40638
+ BSC Nutrition LTD
+ Kestutis Rasimavicius
+ info&bulksupplementscompany.co.uk
+40639
+ PROFI-UC Ltd.
+ Andrew Matyazh
+ support&profi-uc.ru
+40640
+ Polisnab JSC
+ Maxim Y. Evdolyuk
+ evdolyuk&polisnab.ru
+40641
+ Dierichsweiler Unternehmens- und Prozessberatung GmbH
+ Oliver Magnus
+ o.magnus&dup.de
+40642
+ Gardado s.r.o.
+ Petr Votava
+ developement&gardado.com
+40643
+ Broadpeak
+ Jacques Le Mancq
+ credential.manager&broadpeak.tv
+40644
+ Formanek
+ Robert Formanek
+ robert&formanek.org
+40645
+ UFAL - Universidade Federal de Alagoas
+ Diogo Cabral de Almeida
+ diogo&nti.ufal.br
+40646
+ iNet Telecoms Ltd (Voipfone)
+ Lee Rose
+ lee&voipfone.co.uk
+40647
+ HELVETAS Swiss Intercooperation
+ Manfred Berger
+ Manfred.Berger&helvetas.org
+40648
+ AREAL
+ Arnaud Prevot
+ Arnaud.Prevot&areal.fr
+40649
+ Acumentrics Corporation
+ Donald Charlantini
+ dcharlantini&acumentrics.com
+40650
+ InterMedia Enterprises
+ Paul Kosinski
+ noc&iment.com
+40651
+ Beijing Huasun Unicreate Technology LTD.
+ Bo Yang
+ yangbo&bhuwireless.com
+40652
+ Illinois Wesleyan University
+ Michael Zehr
+ root&iwu.edu
+40653
+ Bittoo
+ Henrik Dige Semark
+ hds&bittoo.net
+40654
+ Consórcio de Informática na Gestão Pública Municipal
+ Rodrigo Valceli Raimundo
+ rodrigo&ciga.sc.gov.br
+40655
+ Nanjing Wlanease Co., Ltd.
+ Forrest Zhang (https://wlanease.com)
+ forrest&wlanease.com
+40656
+ State independent уestablishment Tula region center of information technologies
+ Andrea Gorbut
+ andrea.gorbut&tularegion.ru
+40657
+ experience4you GmbH
+ Thomas Loch
+ thomas.loch&experience4you.de
+40658
+ Delta Meccanica S.r.l.
+ Gianluca Magistrato
+ g.magistrato&deltameccanica.com
+40659
+ Oregano Systems – Design & Consulting GesmbH
+ Günther Genser
+ genser&oregano.at
+40660
+ Southern Record Distributors Ltd.
+ Szabolcs Rumi
+ szabolcs&srd.co.uk
+40661
+ Airwave Solutions
+ Dipesh Mistry
+ dipesh.mistry&airwavesolutions.co.uk
+40662
+ NISZ Co.
+ Károly Juhász
+ juhasz.karoly&nisz.hu
+40663
+ Kupson spol. s r.o.
+ Martin Kupec
+ martin.kupec&kupson.cz
+40664
+ Noblis, Inc.
+ Kyle Villano
+ Kyle.Villano&noblis.org
+40665
+ Akron Group
+ Lukin Alexandr
+ it&akronplus.ru
+40666
+ Zito Media
+ Brian Empson
+ brian.empson&zitomedia.com
+40667
+ BRToken Ind. e Com. de Produtos Eletrônicos Ltda.
+ Alexandre Cagnoni
+ alex&brtoken.com.br
+40668
+ NEC New Zealand Ltd
+ Dave Clarke
+ cs&nec.co.nz
+40669
+ Microlab RF Ltd
+ Mike Bush
+ m2c2ab&btinternet.com
+40670
+ Lanka Government Information Infrastucture
+ Nimal Ratnayake
+ nimalr&noc.gov.lk
+40671
+ Radinet Communications Inc.
+ Ray Chen
+ ray.chen&radinetcomm.com
+40672
+ Fiber SenSys, Inc.
+ David E Hollingsworth
+ david.hollingsworth&fibersensys.com
+40673
+ Unigine Inc.
+ Sergey S. Kovalev
+ sysadmin&unigine.com
+40674
+ SAIT Zenitel
+ Koen Verdijck
+ koen.verdijck&saitzenitel.com
+40675
+ geiger BDT GmbH
+ Maximilian Barth
+ barth&geiger-bdt.de
+40676
+ Microsemi Corporation
+ Ming-Hoe Kiu
+ ming-hoe.kiuµsemi.com
+40677
+ RKF Engineering Solutions, LLC
+ Brian Sipos
+ BSipos&rkf-eng.com
+40678
+ Nexura Internacional S.A
+ Melissa Vela
+ melissa.vela.coral&gmail.com
+40679
+ Centre Hospitalier de Fougeres
+ Yannick HERVE
+ yannick.herve&ch-fougeres.fr
+40680
+ La Trobe University
+ Benji Wakely
+ unixsup&latrobe.edu.au
+40681
+ ELNO
+ Guillaume Baron
+ g.baron&elno.fr
+40682
+ Thanis.org
+ Bill Thanis
+ differential.karma&gmail.com
+40683
+ Open Grid Europe GmbH
+ Norbert Holtkamp
+ pen-admin&open-grid-europe.com
+40684
+ Appdynamics
+ Boris Livshutz
+ it&appdynamics.com
+40685
+ Kafinated Kode, Inc
+ Rishi Pidva
+ rishi&kafinatedkode.com
+40686
+ Issac Systems Inc.
+ Harry Lee
+ harry&issacnet.com
+40687
+ ezamber
+ Pawel Tomulik
+ ptomulik&ezamber.pl
+40688
+ Kum and Go
+ Chris Sweeney
+ CJS&KumandGo.com
+40689
+ Digital Processing Systems
+ Muhammad Ramzan
+ ramzan.farooq&dpskw.com
+40690
+ MBTechnology Ltd
+ Emilian Mieilica
+ emilm&mbtelecom.ro
+40691
+ Crosstel Inc
+ John Maliakal
+ john.maliakal&crosstel.com
+40692
+ The ZAP Group
+ John Zaitseff
+ J.Zaitseff&zap.org.au
+40693
+ Inter Vehicle Communication
+ Simon Hsieh
+ simon&interconnect.com.tw
+40694
+ antrou
+ HongCai Wang
+ hongcai.wang&antrou.com
+40695
+ BitPlanet Inc.
+ Poornaprajna Udupi
+ poorna&bitplanet.io
+40696
+ IDENETWORK
+ Benoit MBOUBATEUVAWE
+ benoit&idenetwork.fr
+40697
+ Alma Manu Oy
+ Mikko Junnila
+ mikko.junnila&almamanu.fi
+40698
+ TeliSwitch Solutions
+ Shaike Zalitzky
+ shaikez&teliswitch.com
+40699
+ LexSoft, LTD
+ Alexandr A. Larin
+ iana&cpp.su
+40700
+ M-Cube S.p.A.
+ Paolo Ferracin
+ p.ferracin&mcube.it
+40701
+ Vitera Healthcare Solutions
+ Michael Rosile
+ mike.rosile&viterahealthcare.com
+40702
+ San Mateo Medical Center
+ Kathleen Boutte Foster
+ kbfoster&co.sanmateo.ca.us
+40703
+ Hokkaido Tracks
+ Simon Walter
+ simon.walter&hokkaidotracks.com
+40704
+ Amstar Creative Ltd
+ Charles Chin
+ service&amstar.tw
+40705
+ Signal Processing Devices
+ Patrik Thalin
+ patrik.thalin&spdevices.com
+40706
+ AGMF Prévoyance Union de mutuelles soumise au livre II du Code de la Mutualité - Filiale de GPM
+ Dominique RIBAUTE
+ dominique.ribaute&gpm.fr
+40707
+ Aleturo Group
+ Stefan Unterweger
+ ca&aleturo.com
+40708
+ Rhythm Engineering, LLC
+ Steve Penrod
+ snmp&rhythmtraffic.com
+40709
+ Jiaheng Medical Technology Co., Ltd.
+ Dai Songshi
+ ss5309&yahoo.com
+40710
+ Grasshopper
+ Kevin Cormier
+ kcormier&grasshopper.com
+40711
+ DSTA S.L.
+ Jon Noble
+ jnoble&dsta-sl.com
+40712
+ DHCPCD Project
+ Roy Marples
+ roy&marples.name
+40713
+ Migame.org
+ Alex Morgenegg
+ alex&migame.org
+40714
+ Accelera Mobile Broadband, Inc.
+ Aakash Sahai
+ aakash.sahai&acceleramb.com
+40715
+ Innerworkings
+ Justin Baker
+ jbaker&inwk.com
+40716
+ Kyle Brantley
+ Kyle Brantley
+ kyle&glidegaming.com
+40717
+ Conde Nast
+ Erick Cano
+ TSOITSecurity&condenast.com
+40718
+ RelySys Technologies India Private Limited
+ Praveen Kumar Bijadi
+ praveen&relysys.co.in
+40719
+ The Lubrizol Corporation
+ Phil Evans
+ phil.evans&lubrizol.com
+40720
+ Texas Department of Public Safety
+ William Berry
+ william.berry&dps.texas.gov
+40721
+ FormFactor, Inc.
+ Seng Ing
+ sing&formfactor.com
+40722
+ HUVITZ
+ Sun Kim
+ Sun&huvitz.com
+40723
+ New Zealand Defence Force
+ Christina Porter, NZDF Site Manager
+ webmaster&nzdf.mil.nz
+40724
+ Ubisoft Entertainment
+ Jason Joseph
+ jason.joseph&ubisoft.com
+40725
+ Intune Networks Limited
+ Lewis Hanly
+ Lewis.Hanly&intunenetworks.com
+40726
+ CIPHRON GmbH
+ Oliver Skibbe
+ os&ciphron.de
+40727
+ Cosium
+ Cyril Bailly
+ netadmin&cosium.com
+40728
+ Falck Danmark A/S
+ Claus Canzella
+ inetadmin&falck.dk
+40729
+ LAND-DATA GmbH
+ Dennis Röhrs
+ iut-hotline&landdata.de
+40730
+ Neocom Software Ltd.
+ Anton Galushkin
+ a.galushkin&trbonet.com
+40731
+ Elephant Talk Communications Corp.
+ Thomas Bhatia
+ thomas.bhatia&elephanttalk.com
+40732
+ Consortium for Smart Energy Profile 2 Interoperability
+ Rob Ranck
+ admin&csep.org
+40733
+ Sabzfaam ICT
+ Ahmadreza Khaleghi
+ khaleghi&sabzfaam.com
+40734
+ Karina Mobile Solutions
+ Siavash Safi
+ siavash&karinaco.ir
+40735
+ DoctuSoft Ltd.
+ Tibor Czimer
+ tibor.czimer&doctusoft.com
+40736
+ Audeo, Inc.
+ Justin Baugh
+ justin.baugh&audeocloud.com
+40737
+ National Labor Relations Board
+ Mark Jeweler
+ mark.jeweler&nlrb.gov
+40738
+ The Children's Institute of Pittsburgh
+ Sharon L. Dorogy
+ sdo&the-institute.org
+40739
+ Affirmative Insurance Holdings, Inc.
+ Fabian Schramke
+ fabian.schramke&affirmativeinsurance.com
+40740
+ DirectOut GmbH
+ Claudio Becker-Foss
+ claudio.becker-foss&directout.eu
+40741
+ Flying Horse Productions, LLC
+ Mark A. Munza
+ commander&flying-horses.com
+40742
+ PDI Ninth House
+ Chris Mulcahy
+ chris.mulcahy&pdinh.com
+40743
+ Reissmann IT-Services
+ Sven Reissmann
+ info&reissmann.it
+40744
+ Center for Translational Molecular Medicine (CTMM TraIT)
+ Erik Roelofs
+ erik.roelofs&maastro.nl
+40745
+ WiValley, Inc
+ Brian Foucher
+ NOC&wivalley.com
+40746
+ GOZUBUYUKOGLU
+ Arda GOZUBUYUKOGLU
+ arda&gozubuyukoglu.com
+40747
+ Radiant Logic, Inc.
+ Claude Samuelson
+ csam&radiantlogic.com
+40748
+ IONODES Inc.
+ Eric Tasso
+ etasso&ionodes.com
+40749
+ Corfire (SK C&C USA) Inc.
+ Byungkwon Jeon
+ byungkwonjeon&corfire.com
+40750
+ Synrc Research Center
+ Maksym Sokhatskyi
+ maxim&synrc.com
+40751
+ Homemail - Ross Johnson
+ Ross Johnson
+ ross&homemail.org
+40752
+ Barricane Technology Ltd.
+ Chris Dew
+ iana-pen&barricane.com
+40753
+ Beijing Time Antaeus Media Technology Co.,Ltd
+ houhongji
+ u3email&yahoo.com.cn
+40754
+ Liikennevirasto TVT
+ Jyrki Jarvinen
+ jyrki.jarvinen&ely-keskus.fi
+40755
+ Acticom
+ Jaroslav Beneš
+ acticom&acticom.cz
+40756
+ K.W.Doggett Fine Paper
+ Ben Grech
+ bgrech&kwdoggett.com.au
+40757
+ MOSCOW COMMERCIAL BANK MOSCOMPRIVATBANK ZAO
+ Alexey Pavlov
+ aleksej.pavlov&privatbank.ru
+40758
+ Eltek Polska
+ Jaroslaw Gawin
+ jaroslaw.gawin&eltek.com.pl
+40759
+ EGRIMA BuisnessCenter
+ Joris Mocka
+ joris.mocka&egrima-bc.com
+40760
+ TOMRA Systems ASA
+ Erik R. Hersløv
+ erik.reinhardt.herslov&tomra.no
+40761
+ Mideye AB
+ Ulf Schuberth
+ support&mideye.com
+40762
+ Hitec Electric b.v.
+ Gert-Jan Dorenbos
+ pen&hitecelectric.com
+40763
+ Kennedy University Hospitals, Inc.
+ Thomas J. Balcavage
+ t.balcavage&kennedyhealth.org
+40764
+ Resonate Insights
+ Adam Glenn
+ adam.glenn&resonateinsights.com
+40765
+ hSenid Software (Singapore) PVT Limited
+ Jason Jebanesan
+ jason&hsenid.com
+40766
+ Xenode Co. Ltd.
+ Nikolay V. Krasko
+ n.krasko&xenode.ru
+40767
+ Reporting Estándar S.L.
+ Ignacio Hernandez-Ros
+ ignacio&reportingstandard.com
+40768
+ Hotwords Tecnologia
+ Bento Loewenstein
+ tech&hotwords.com.br
+40769
+ VendScreen
+ Cory Johannsen
+ cory.johannsen&vendscreen.com
+40770
+ Partheas
+ Jeroen Serpieters
+ jeroen.serpieters&partheas.com
+40771
+ VISUAPPS GmbH
+ Armin Kanitsar
+ office&visuapps.com
+40772
+ SuperMedia, LLC
+ Colin Cheline
+ colin.cheline&supermedia.com
+40773
+ The Prosecutor General`s Office of Ukraine
+ Dmytro Chub
+ chub_ds&gp.gov.ua
+40774
+ NagSNMP
+ Remi Broemeling
+ remi&broemeling.org
+40775
+ TripodWorks CO.,LTD.
+ SHOJI Takeshi
+ t.shoji&tripodw.jp
+40776
+ Kalyan Kadiyala
+ Kalyana Kadiyala
+ kckadiyala&gmail.com
+40777
+ Qin Technology SpA
+ Jaime Vasquez Acuña
+ jaime&qin.cl
+40778
+ Unassigned
+ Removed 2012-11-12
+ ---none---
+40779
+ 2reallife
+ IT Department (Mazitov Farid, Motylev Dmitriy, Ozerov Vailiy)
+ noc&2reallife.com
+40780
+ 5th Tier Limited
+ Jon Baldachin
+ jon.baldachin&5thtier.com
+40781
+ Cynaptica
+ Roger Cocks
+ rogerc&cynaptica.net
+40782
+ Dyne System Co., Ltd
+ Do Woong Park
+ adams&dynesys.co.kr
+40783
+ icoMetrix
+ Dirk Loeckx
+ Dirk.Loeckx&icometrix.com
+40784
+ Kumahira Co., Ltd.
+ Daisuke Chanohara
+ da-chanohara&kumahira-safe.co.jp
+40785
+ Optro Co.,Ltd
+ Park InSoo
+ greatpis&optro.co.kr
+40786
+ Unassigned
+ Removed 2012-11-12
+ ---none---
+40787
+ Compumatica secure networks
+ Thorsten Müller
+ thorsten.mueller&compumatica.eu
+40788
+ Abegglen Management Consultants AG
+ Brunner Rita
+ itcontract&abegglen.com
+40789
+ Logix
+ Michal Ludvig
+ mludvig&logix.net.nz
+40790
+ Simple Solution Technologies LLC
+ David Goldberg
+ godberg&gmail.com
+40791
+ Beijing OMATE Digital Technology CO.,Ltd
+ Weixun Meng
+ mwx&omate.com.cn
+40792
+ Express-Interfracht Internationale Spedition GmbH
+ Martin Haschek
+ martin.haschek&railcargo.at
+40793
+ Andelskassen JAK
+ Martin Kjær Jørgensen
+ admin&ajak.dk
+40794
+ IG Metall Vorstandsverwaltung
+ Alexander Stahl
+ alexander.stahl&igmetall.de
+40795
+ otaku-realm.net
+ Olivier Lody
+ olivier.lody&otaku-realm.net
+40796
+ ICBPI S.p.A.
+ Enrico Galoni
+ enrico.galoni&icbpi.it
+40797
+ Sidion
+ Alexander Klimuk
+ alexander.klimuk&sidion.de
+40798
+ 3D-P
+ Stephan Marcotte, P.Eng.
+ stephanemarcotte&3d-p.com
+40799
+ Swiss International Air Lines Ltd.
+ Georges Mathis
+ U638067&dlh.de
+40800
+ Smart Refill i Helsingborg AB
+ Michael Jörgensen
+ michael.jorgensen&smartrefill.se
+40801
+ FiveCo
+ Antoine Gardiol
+ antoine.gardiol&fiveco.ch
+40802
+ Indra Navia as
+ Eldar Firing
+ eldar.firing&indra.no
+40803
+ netRapid GmbH & Co. KG
+ Eugen Staab
+ eugen.staab&netrapid.de
+40804
+ ULTEO
+ David PHAM-VAN
+ d.pham.van&ulteo.com
+40805
+ Nimbus Directory Services
+ Vladimir Dzhuvinov
+ vladimir&nimbusds.com
+40806
+ ICBTECH d.o.o.
+ Aleksandar Pejic
+ aleksandar.pejic&icbtech.rs
+40807
+ semyon.org
+ Semyon Chaichenets
+ IODadmin&semyon.org
+40808
+ Wi-Fi Alliance
+ Greg Ennis
+ technical&wi-fi.org
+40809
+ Tohoku Gakuin University
+ Nozomu Hino
+ regi&staff.tohoku-gakuin.ac.jp
+40810
+ BUPT-GUOAN Broadband Network Technology Co.Ltd
+ Junwei Ren
+ rjw&bupt.edu.cn
+40811
+ WebSistem
+ Ahmet Polat
+ ahmetpolat&web-sistem.com
+40812
+ Die Firma GmbH
+ Jann Heider
+ it&diefirma.de
+40813
+ Agenturadmin.de
+ Jann Heider
+ info&agenturadmin.de
+40814
+ Garden City Hospital
+ Donna Bellomo
+ DBellomo&gchosp.org
+40815
+ Dr. Thalmair
+ Dr. Tobias Thalmair
+ 884256247&s320403455.online.de
+40816
+ Ecodigi Tecnologia e Serviços Ltda.
+ Fernando Gago Gomes
+ fgomes&ecodigi.com.br
+40817
+ Dr. Martin Froehlich
+ Dr. Martin Froehlich
+ xdrcft&gmx.net
+40818
+ CYG SUNRI CO.,LTD
+ LiuFeng
+ liufeng_gx&hotmail.com
+40819
+ Provident Solutions LLC
+ James Nelson
+ jmn&provident-solutions.com
+40820
+ OpenIPMI
+ Trenton Corey Minyard
+ minyard&acm.org
+40821
+ Public Protector South Africa
+ Ignatius Makgoka
+ ignatiusm&pprotect.org
+40822
+ Hagedorn Informationssysteme GmbH
+ Michal Mlynar
+ michal.mlynar&hagedorn-infosysteme.de
+40823
+ NVable Limited
+ Bob McChesney
+ bob.mcchesney&nvable.com
+40824
+ Qore Technologies, sro
+ David Nichols
+ oid-admin&qoretechnologies.com
+40825
+ VeriTeknik
+ Cem Karaca
+ ckaraca&veriteknik.com
+40826
+ Short Films 4 U Limited
+ Andy Spooner
+ andy.spooner&shortfilms4u.com
+40827
+ Lifelan Technology Co., LTD.
+ Chang Hsu Hua
+ hua&lifelan.com.tw
+40828
+ CHIeru Co., Ltd.
+ takayuki toge
+ toge&chieru.co.jp
+40829
+ Cambridge Industries Group (CIG)
+ Jet Liu
+ zliu&ci-g.com
+40830
+ Qiaoy.info
+ Yi Qiao
+ qiaoy&qiaoy.info
+40831
+ Domenikss SIA
+ Eduards Čaikovskis
+ Eduards.caikovskis&domenikss.lv
+40832
+ MicroNova AG
+ Hannes Oberländer
+ Hannes.Oberlaenderµnova.de
+40833
+ Hytec Electronics Ltd
+ Mike Bacon
+ mike.bacon&hytec-electronics.co.uk
+40834
+ Kübler IT
+ Benjamin Kübler
+ b.kuebler&kuebler-it.de
+40835
+ Department of Microelectronics and Computer Science, Lodz University of Technology
+ Piotr Perek
+ pperek&dmcs.pl
+40836
+ Blackbird Group, Inc.
+ Dave Ruginski
+ d.ruginski&blackbird-group.com
+40837
+ iTech Comércio Importação e Exportação de Componentes Eletrônicos LTDA
+ Douglas Malvar Ribas
+ douglas&grupoitech.com.br
+40838
+ Commune de Niort
+ BROUARD Yohann
+ yohann.brouard&mairie-niort.fr
+40839
+ SARDA South Wales
+ Chris Daw
+ chris.daw.pen&sardasouthwales.org.uk
+40840
+ Rainydayz
+ Andy Ruddock
+ admin&rainydayz.org
+40841
+ n-Systems GmbH & Co. KG
+ Bernhard Grün
+ bernhard.gruen&n-systems.de
+40842
+ A10 Networks
+ Madhusudhan Vadde
+ mvadde&a10networks.com
+40843
+ Chatmongers, LLC
+ Shaun Kruger
+ skruger&chatmongers.com
+40844
+ MAC&C LLC
+ Matuzko Andrey
+ macandc&macandc.ru
+40845
+ Veris Industries
+ Aaron Parker
+ support&veris.com
+40846
+ Montpelier Technical Resources Ltd
+ Hugh Kelley
+ helpdesk&montpeliertr.com
+40847
+ CRDP de l'Académie de Versailles
+ Pascal Fautrero
+ pascal.fautrero&crdp.ac-versailles.fr
+40848
+ VeriFyle, Inc.
+ Stephen Pierce
+ spierce&verifyle.com
+40849
+ Ceiec Electric Technology Inc.
+ Dachuan Liu
+ liudachuan&ceiec-electric.com
+40850
+ Kongsberg Spacetec AS
+ Sverre Moe
+ sverre&spacetec.no
+40851
+ IPContact Software
+ Jorge Merlino
+ jorge.merlino&ipcontact.com.uy
+40852
+ Main Line Health Inc.
+ James A Robinson
+ robinsonj&mlhs.org
+40853
+ ATOSS CSD Software GmbH
+ Andreas Blochberger
+ ablochberger&atoss-csd.de
+40854
+ WH Ireland Limited
+ Richard Pugh
+ richard.pugh&wh-ireland.co.uk
+40855
+ University of Pittsburgh
+ Jeff White
+ jaw171&pitt.edu
+40856
+ Tofino Security
+ Oliver Kleineberg
+ oliver.kleineberg&belden.com
+40857
+ Mira Soft
+ Gokhan Toplar
+ gokhan&mira-soft.com
+40858
+ ModemTec, spol. s r. o.
+ Lešek Franek
+ lesek.franek&modemtec.cz
+40859
+ VOSGELIS
+ COURROY Régis
+ rcourroy&vosgelis.fr
+40860
+ Protocom Technology
+ Mohamad Charafeddine
+ support&protocomtech.com.au
+40861
+ Silent Softwares Pvt. Ltd.
+ Patel Jigneshkumar Prakashbai
+ admin&silentcomponents.com
+40862
+ Systema Technologies SA
+ Mike Chatzipetros
+ michalis&systema.gr
+40863
+ UP-nxt
+ Maarten Bynens
+ maarten.bynens&up-nxt.com
+40864
+ Larcan Inc
+ Mr William E Meechem
+ bmeechem&larcan.com
+40865
+ Majorpower Corporation
+ Samuel Norman
+ snorman&majorpower.com
+40866
+ Arcusys Oy
+ Jouni Hiltunen
+ jouni.hiltunen&arcusys.fi
+40867
+ Boardroom Pty Limited
+ David Watson
+ pen&boardroomlimited.com.au
+40868
+ Genew Technologies Co.,Ltd
+ mingtao yang
+ yangmt&genew.com.cn
+40869
+ TAIWAN-CA Inc.
+ Robin Lin
+ robin.lin&twca.com.tw
+40870
+ Closed Joint Stock Company Interfax
+ Vladimir Timofeev
+ noc&interfax.ru
+40871
+ poweroasis
+ Pete Bishop
+ Pete.Bishop&poweroasis.com
+40872
+ Pardazeshgaran Saman Banking Solutions
+ Bijan Hoomand
+ hoomand&samanpr.com
+40873
+ Semafone Limited
+ Sam Harry
+ techsupport&semafone.com
+40874
+ LL Control Solutions International (PTY) Ltd
+ Lukas Hendriks
+ lukas&llcsi.com
+40875
+ OfficeCore
+ Dan Avni
+ danavni&officecore.com
+40876
+ Pressens Fællesindkøb
+ Martin Kjeldsen
+ mk&bluepipe.dk
+40877
+ myprocurement
+ Quentin Ambard
+ qambard&myprocurement.fr
+40878
+ Venere Net Srl
+ Giuseppe Lavagetto
+ vsysadm&expedia.com
+40879
+ VERION TEKNOLOJI A.S.
+ BULENT KAPTAN
+ bulent.kaptan&verion.com.tr
+40880
+ DBI Software, Inc.
+ Ward Fry
+ support&dbisoftware.com
+40881
+ Mutualink Inc
+ Charles Wegrzyn
+ cwegrzyn&mutualink.net
+40882
+ Step One AS
+ Nils Magnus Englund
+ nme&stepone.no
+40883
+ Beijing CangLang TV Technologies Co., Ltd.
+ Tom Yu
+ yutao&canglangtv.com
+40884
+ Instituto Federal Fluminense - IFF
+ Andre Cunha
+ acunha&iff.edu.br
+40885
+ ELCUS
+ Lukowkin Andrey
+ mail&elcus.ru
+40886
+ Kommunales Rechenzentrum Minden-Ravensberg/Lippe
+ Andreas Ollenburg
+ a.ollenburg&krz.de
+40887
+ Edeka Minden-Hannover IT-/logistic service GmbH
+ Sven Linscheid
+ idm.admin&minden.edeka.de
+40888
+ Universitaetsklinikum Tuebingen
+ Oliver Warda
+ oliver.warda&med.uni-tuebingen.de
+40889
+ Global Invacom Ltd
+ Leigh Coombs
+ leigh.coombs&globalinvacom.com
+40890
+ Hardomo
+ Diego Mejia
+ ingenieria&hardomo.com
+40891
+ RDC, Inc. dba LynTec
+ Dan Nguyen
+ dan&lyntec.com
+40892
+ Abimus
+ Patrik Karisch
+ office&abimus.com
+40893
+ University of the Arts Helsinki
+ Juha Nyholm
+ oid-admin&uniarts.fi
+40894
+ Cory-Net
+ Craig Cory
+ craig&cory-net.com
+40895
+ VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH
+ Sergej Schweizer, Adi Kriegisch
+ ssc&vrvis.at
+40896
+ Pearson Technology
+ David Ferguson
+ david.ferguson&pearson.com
+40897
+ C.S. Veritas
+ Maarten Abbink
+ coda&veritas.nl
End of Document
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/radius_dict.c
^
|
| @@ -986,7 +986,7 @@
*
* RADIUS dictionary parser
*
- * $Id: radius_dict.l 39636 2011-10-27 16:00:31Z gerald $
+ * $Id: radius_dict.l 46231 2012-11-27 18:00:37Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -1730,9 +1730,18 @@
if (!Radiusin) {
if (errno) {
- g_string_append_printf(error, "Could not open file: '%s', error: %s\n", fullpaths[include_stack_ptr], g_strerror(errno) );
- yyterminate();
+ g_string_append_printf(error,
+ "Could not open file: '%s', error: %s\n",
+ fullpaths[include_stack_ptr],
+ g_strerror(errno) );
+ } else {
+ g_string_append_printf(error,
+ "Could not open file: '%s', no errno\n",
+ fullpaths[include_stack_ptr]);
}
+ g_free(fullpaths[include_stack_ptr]);
+ fullpaths[include_stack_ptr] = NULL;
+ include_stack_ptr--;
} else {
linenums[include_stack_ptr] = 1;
Radius_switch_to_buffer(Radius_create_buffer(Radiusin,YY_BUF_SIZE ) );
@@ -1765,7 +1774,7 @@
case YY_STATE_EOF(VENDOR_W_CONTINUATION):
case YY_STATE_EOF(BEGIN_TLV):
case YY_STATE_EOF(END_TLV):
-#line 282 "radius_dict.l"
+#line 291 "radius_dict.l"
{
fclose(Radiusin);
@@ -1787,15 +1796,15 @@
case 59:
/* rule 59 can match eol */
YY_RULE_SETUP
-#line 300 "radius_dict.l"
+#line 309 "radius_dict.l"
{ linenums[include_stack_ptr]++; BEGIN WS_OUT; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 303 "radius_dict.l"
+#line 312 "radius_dict.l"
ECHO;
YY_BREAK
-#line 1799 "radius_dict.c"
+#line 1808 "radius_dict.c"
case YY_END_OF_BUFFER:
{
@@ -2751,7 +2760,7 @@
#define YYTABLES_NAME "yytables"
-#line 303 "radius_dict.l"
+#line 312 "radius_dict.l"
@@ -2787,6 +2796,7 @@
radius_attr_info_t* a;
GHashTable* by_id;
guint32 code;
+ const gchar *tmpName = NULL;
if (current_attr){
@@ -2832,12 +2842,20 @@
a->ett = -1;
a->tlvs_by_id = NULL;
- if (a->name)
- g_free((gpointer) a->name);
+ if (a->name) {
+ tmpName = a->name;
+ }
a->name = g_strdup(name);
g_hash_table_insert(by_id, GUINT_TO_POINTER(code),a);
g_hash_table_insert(dict->attrs_by_name,(gpointer) (a->name),a);
+
+ /* Don't free the old name until after the hash_table ops, since it
+ seems to end up being used in there somewhere, causing valgrind
+ errors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803 */
+ if (tmpName) {
+ g_free((gpointer) tmpName);
+ }
}
void add_tlv(const gchar* name, const gchar* codestr, radius_attr_dissector_t type, const gchar* current_attr) {
@@ -2967,61 +2985,6 @@
return TRUE;
}
-static gboolean destroy_tlvs(gpointer k _U_, gpointer v, gpointer p _U_) {
- radius_attr_info_t* s = v;
- int i;
-
- g_free((gpointer) (s->name));
-
- if (s->vs) {
- for(i=0; s->vs[i].strptr; i++) {
- g_free((void *)s->vs[i].strptr);
- }
- g_free((void *)s->vs);
- }
- g_free(s);
- return TRUE;
-}
-
-static gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
- radius_attr_info_t* a = v;
- int i;
-
- g_free((gpointer) (a->name));
- if (a->tlvs_by_id) {
- g_hash_table_foreach_remove(a->tlvs_by_id, destroy_tlvs, p);
- g_hash_table_destroy(a->tlvs_by_id);
- }
-
- if (a->vs) {
- for(i=0; a->vs[i].strptr; i++) {
- g_free((void *)a->vs[i].strptr);
- }
- g_free((void *)a->vs);
- }
- g_free(a);
- return TRUE;
-}
-
-static gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
- radius_vendor_info_t* vnd = v;
- g_free( (gpointer) vnd->name);
- g_hash_table_foreach_remove(vnd->attrs_by_id,destroy_attrs,p);
- g_hash_table_destroy(vnd->attrs_by_id);
- g_free(vnd);
- return TRUE;
-}
-
-static void destroy_dict(radius_dictionary_t* d) {
- g_hash_table_foreach_remove(d->attrs_by_id,destroy_attrs,NULL);
- g_hash_table_foreach_remove(d->vendors_by_id,destroy_vendors,NULL);
- g_hash_table_destroy(d->vendors_by_id);
- g_hash_table_destroy(d->attrs_by_id);
- g_hash_table_destroy(d->vendors_by_name);
- g_hash_table_destroy(d->attrs_by_name);
- g_free(d);
-}
-
gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar* filename, gchar** err_str) {
int i;
@@ -3061,9 +3024,8 @@
g_hash_table_foreach_remove(value_strings,destroy_value_strings,NULL);
if (error->len > 0) {
- *err_str = error->str;
+ *err_str = error->str;
g_string_free(error,FALSE);
- destroy_dict(dict);
return FALSE;
} else {
*err_str = NULL;
@@ -3083,3 +3045,16 @@
return 1;
}
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
+
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/radius_dict.l
^
|
| @@ -26,7 +26,7 @@
*
* RADIUS dictionary parser
*
- * $Id: radius_dict.l 39636 2011-10-27 16:00:31Z gerald $
+ * $Id: radius_dict.l 46231 2012-11-27 18:00:37Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -267,9 +267,18 @@
if (!yyin) {
if (errno) {
- g_string_append_printf(error, "Could not open file: '%s', error: %s\n", fullpaths[include_stack_ptr], g_strerror(errno) );
- yyterminate();
+ g_string_append_printf(error,
+ "Could not open file: '%s', error: %s\n",
+ fullpaths[include_stack_ptr],
+ g_strerror(errno) );
+ } else {
+ g_string_append_printf(error,
+ "Could not open file: '%s', no errno\n",
+ fullpaths[include_stack_ptr]);
}
+ g_free(fullpaths[include_stack_ptr]);
+ fullpaths[include_stack_ptr] = NULL;
+ include_stack_ptr--;
} else {
linenums[include_stack_ptr] = 1;
yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
@@ -334,6 +343,7 @@
radius_attr_info_t* a;
GHashTable* by_id;
guint32 code;
+ const gchar *tmpName = NULL;
if (current_attr){
@@ -379,12 +389,20 @@
a->ett = -1;
a->tlvs_by_id = NULL;
- if (a->name)
- g_free((gpointer) a->name);
+ if (a->name) {
+ tmpName = a->name;
+ }
a->name = g_strdup(name);
g_hash_table_insert(by_id, GUINT_TO_POINTER(code),a);
g_hash_table_insert(dict->attrs_by_name,(gpointer) (a->name),a);
+
+ /* Don't free the old name until after the hash_table ops, since it
+ seems to end up being used in there somewhere, causing valgrind
+ errors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803 */
+ if (tmpName) {
+ g_free((gpointer) tmpName);
+ }
}
void add_tlv(const gchar* name, const gchar* codestr, radius_attr_dissector_t type, const gchar* current_attr) {
@@ -514,61 +532,6 @@
return TRUE;
}
-static gboolean destroy_tlvs(gpointer k _U_, gpointer v, gpointer p _U_) {
- radius_attr_info_t* s = v;
- int i;
-
- g_free((gpointer) (s->name));
-
- if (s->vs) {
- for(i=0; s->vs[i].strptr; i++) {
- g_free((void *)s->vs[i].strptr);
- }
- g_free((void *)s->vs);
- }
- g_free(s);
- return TRUE;
-}
-
-static gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
- radius_attr_info_t* a = v;
- int i;
-
- g_free((gpointer) (a->name));
- if (a->tlvs_by_id) {
- g_hash_table_foreach_remove(a->tlvs_by_id, destroy_tlvs, p);
- g_hash_table_destroy(a->tlvs_by_id);
- }
-
- if (a->vs) {
- for(i=0; a->vs[i].strptr; i++) {
- g_free((void *)a->vs[i].strptr);
- }
- g_free((void *)a->vs);
- }
- g_free(a);
- return TRUE;
-}
-
-static gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
- radius_vendor_info_t* vnd = v;
- g_free( (gpointer) vnd->name);
- g_hash_table_foreach_remove(vnd->attrs_by_id,destroy_attrs,p);
- g_hash_table_destroy(vnd->attrs_by_id);
- g_free(vnd);
- return TRUE;
-}
-
-static void destroy_dict(radius_dictionary_t* d) {
- g_hash_table_foreach_remove(d->attrs_by_id,destroy_attrs,NULL);
- g_hash_table_foreach_remove(d->vendors_by_id,destroy_vendors,NULL);
- g_hash_table_destroy(d->vendors_by_id);
- g_hash_table_destroy(d->attrs_by_id);
- g_hash_table_destroy(d->vendors_by_name);
- g_hash_table_destroy(d->attrs_by_name);
- g_free(d);
-}
-
gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar* filename, gchar** err_str) {
int i;
@@ -608,9 +571,8 @@
g_hash_table_foreach_remove(value_strings,destroy_value_strings,NULL);
if (error->len > 0) {
- *err_str = error->str;
+ *err_str = error->str;
g_string_free(error,FALSE);
- destroy_dict(dict);
return FALSE;
} else {
*err_str = NULL;
@@ -629,3 +591,16 @@
int yywrap(void) {
return 1;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/epan/sminmpec.c
^
|
| @@ -2874,7 +2874,7 @@
{ 2850, "Tevycom Fapeco S.A." },
{ 2851, "Polaris Communications" },
{ 2852, "Competitive Automation, Inc." },
- { 2853, "IDEXX Software Division" },
+ { 2853, "IDEXX Laboratories, Inc." },
{ 2854, "Network Computing Technologies, Inc." },
{ 2855, "Axxcelera Broadband Wireless" },
{ 2856, "Cableware Electronics" },
@@ -4487,7 +4487,7 @@
{ 4463, "TaoNet" },
{ 4464, "MPB Communications Inc." },
{ 4465, "ViewCast.com" },
- { 4466, "Tadiran Scopus" },
+ { 4466, "Harmonic Video Network (previous was 'Tadiran Scopus')" },
{ 4467, "FibroLan" },
{ 4468, "Telkoor-QPS" },
{ 4469, "Diversinet Corp." },
@@ -8789,7 +8789,7 @@
{ 8765, "Telesoft Technologies Ltd" },
{ 8766, "Elsag S.p.A." },
{ 8767, "Bayour.COM" },
- { 8768, "Network Electronics" },
+ { 8768, "Nevion (previous was 'Network Electronics')" },
{ 8769, "TeraOptic Networks, Inc." },
{ 8770, "The Emerginggroup Group" },
{ 8771, "ARCANVS, Inc." },
@@ -15587,7 +15587,7 @@
{ 15563, "Adtron" },
{ 15564, "Aselia Technologies, Inc." },
{ 15565, "Great Plains Mall.net" },
- { 15566, "A-Care Systems, Inc." },
+ { 15566, "Experian Japan Co., Ltd (previous was 'A-Care Systems, Inc.')" },
{ 15567, "Neople Ltd." },
{ 15568, "Center for Development of Information Technology - CDIT" },
{ 15569, "Krasnoyarsk ICC subdivision of MCC, JSC \"Russian Railways\"" },
@@ -16386,7 +16386,7 @@
{ 16362, "Waters Network Systems" },
{ 16363, "SCHOLZ & VOLKMER Intermediales Design, GmbH" },
{ 16364, "SMARTDATA" },
- { 16365, "Swissrisk Financial Systems GmbH (previous was 'Swissrisk AG')" },
+ { 16365, "Dion Global Solutions GmbH (previous was 'Swissrisk Financial Systems GmbH')" },
{ 16366, "INFORMA DEL PERU, INFORMACION ECONOMICA SA" },
{ 16367, "saarstahl" },
{ 16368, "Sysapex Communications Inc." },
@@ -20651,7 +20651,7 @@
{ 20627, "Institut National d'Histoire de l'Art" },
{ 20628, "Qual-Pro Corporation" },
{ 20629, "STREAMTEL" },
- { 20630, "ODIBOSS NETWORK" },
+ { 20630, "ODIBOSS NETWORKS" },
{ 20631, "MC110-GRUPO1" },
{ 20632, "Barracuda Networks, Inc." },
{ 20633, "Security First Networks" },
@@ -24921,7 +24921,7 @@
{ 24897, "Indel Industria Eletronica Ltda" },
{ 24898, "d&b audiotechnik AG" },
{ 24899, "Agama Technologies AB" },
- { 24900, "GoBackTV, Inc." },
+ { 24900, "Aurora Networks (GoBackTV)" },
{ 24901, "Future Infonet" },
{ 24902, "Astech Corporation" },
{ 24903, "Corporaci\0303\0263n Polit\0303\0251cnica Nacional de Colombia" },
@@ -24938,7 +24938,7 @@
{ 24914, "WSOFT, Lda." },
{ 24915, "iG Internet Group do Brasil Ltda" },
{ 24916, "Essent Corporation" },
- { 24917, "Collaborative Fusion, Inc." },
+ { 24917, "Intermedix (previous was 'Collaborative Fusion, Inc.')" },
{ 24918, "Radmer" },
{ 24919, "Web Wizard Design" },
{ 24920, "Our Help Desk" },
@@ -32907,7 +32907,7 @@
{ 32883, "One23 Designs" },
{ 32884, "Chemnitzer Verlag und Druck GmbH & Co. KG" },
{ 32885, "H-Net AG" },
- { 32886, "TADASoft Ltd" },
+ { 32886, "Restorepoint (previous was 'TADASoft Ltd')" },
{ 32887, "Joseph King ICT Consultants" },
{ 32888, "Bizsensors" },
{ 32889, "The College at Brockport State University of New York" },
@@ -33527,7 +33527,7 @@
{ 33503, "Heavens-Above GmbH" },
{ 33504, "Narodni technicka knihovna" },
{ 33505, "tw telecom, inc." },
- { 33506, "Enginuity PLM LLC" },
+ { 33506, "Dassault Systemes (previous was 'Enginuity PLM LLC')" },
{ 33507, "Elster Electricity, LLC" },
{ 33508, "Avere Systems, Inc." },
{ 33509, "Sociedad Hebraica Argentina" },
@@ -36487,7 +36487,7 @@
{ 36463, "DNW Technologies" },
{ 36464, "henrich" },
{ 36465, "Data Center Manageability Interface Forum" },
- { 36466, "IdaTech, LLC" },
+ { 36466, "Ballard Fuel Cell Systems (previous was 'IdaTech, LLC')" },
{ 36467, "adesso AG" },
{ 36468, "Cornastone Infrastructure Services (Pty) Ltd" },
{ 36469, "Through IP Pty. Ltd." },
@@ -40647,6 +40647,278 @@
{ 40623, "Morgowicz Inc" },
{ 40624, "Willops Management" },
{ 40625, "SBO \"Centre of Information Technology of the Orenburg region\"" },
+ { 40626, "Web de Confianza Andaluza S.Coop.And." },
+ { 40627, "Jefferson Regional Medical Center" },
+ { 40628, "FormPipe Software A/S" },
+ { 40629, "Lexington, S.L." },
+ { 40630, "Crexendo, Inc." },
+ { 40631, "AVA Communications" },
+ { 40632, "Tr\0303\0274b AG" },
+ { 40633, "\"Scan Engineering Telecom\" CJSC" },
+ { 40634, "Willway, S.A." },
+ { 40635, "opvizor GmbH" },
+ { 40636, "Use System Engineering B.V." },
+ { 40637, "Deliservice Punnitse & S\0303\0244\0303\0244st\0303\0244 Oy" },
+ { 40638, "BSC Nutrition LTD" },
+ { 40639, "PROFI-UC Ltd." },
+ { 40640, "Polisnab JSC" },
+ { 40641, "Dierichsweiler Unternehmens- und Prozessberatung GmbH" },
+ { 40642, "Gardado s.r.o." },
+ { 40643, "Broadpeak" },
+ { 40644, "Formanek" },
+ { 40645, "UFAL - Universidade Federal de Alagoas" },
+ { 40646, "iNet Telecoms Ltd (Voipfone)" },
+ { 40647, "HELVETAS Swiss Intercooperation" },
+ { 40648, "AREAL" },
+ { 40649, "Acumentrics Corporation" },
+ { 40650, "InterMedia Enterprises" },
+ { 40651, "Beijing Huasun Unicreate Technology LTD." },
+ { 40652, "Illinois Wesleyan University" },
+ { 40653, "Bittoo" },
+ { 40654, "Cons\0303\0263rcio de Inform\0303\0241tica na Gest\0303\0243o P\0303\0272blica Municipal" },
+ { 40655, "Nanjing Wlanease Co., Ltd." },
+ { 40656, "State independent \0321\0203establishment Tula region center of information technologies" },
+ { 40657, "experience4you GmbH" },
+ { 40658, "Delta Meccanica S.r.l." },
+ { 40659, "Oregano Systems \0342\0200\0223 Design & Consulting GesmbH" },
+ { 40660, "Southern Record Distributors Ltd." },
+ { 40661, "Airwave Solutions" },
+ { 40662, "NISZ Co." },
+ { 40663, "Kupson spol. s r.o." },
+ { 40664, "Noblis, Inc." },
+ { 40665, "Akron Group" },
+ { 40666, "Zito Media" },
+ { 40667, "BRToken Ind. e Com. de Produtos Eletr\0303\0264nicos Ltda." },
+ { 40668, "NEC New Zealand Ltd" },
+ { 40669, "Microlab RF Ltd" },
+ { 40670, "Lanka Government Information Infrastucture" },
+ { 40671, "Radinet Communications Inc." },
+ { 40672, "Fiber SenSys, Inc." },
+ { 40673, "Unigine Inc." },
+ { 40674, "SAIT Zenitel" },
+ { 40675, "geiger BDT GmbH" },
+ { 40676, "Microsemi Corporation" },
+ { 40677, "RKF Engineering Solutions, LLC" },
+ { 40678, "Nexura Internacional S.A" },
+ { 40679, "Centre Hospitalier de Fougeres" },
+ { 40680, "La Trobe University" },
+ { 40681, "ELNO" },
+ { 40682, "Thanis.org" },
+ { 40683, "Open Grid Europe GmbH " },
+ { 40684, "Appdynamics" },
+ { 40685, sminmpec_unknown }, /* (Added by Wireshark) */
+ { 40686, "Issac Systems Inc." },
+ { 40687, "ezamber" },
+ { 40688, "Kum and Go" },
+ { 40689, "Digital Processing Systems" },
+ { 40690, "MBTechnology Ltd" },
+ { 40691, "Crosstel Inc" },
+ { 40692, "The ZAP Group" },
+ { 40693, "Inter Vehicle Communication" },
+ { 40694, "antrou" },
+ { 40695, "BitPlanet Inc." },
+ { 40696, "IDENETWORK" },
+ { 40697, "Alma Manu Oy" },
+ { 40698, "TeliSwitch Solutions " },
+ { 40699, "LexSoft, LTD" },
+ { 40700, "M-Cube S.p.A." },
+ { 40701, "Vitera Healthcare Solutions" },
+ { 40702, "San Mateo Medical Center" },
+ { 40703, "Hokkaido Tracks" },
+ { 40704, "Amstar Creative Ltd" },
+ { 40705, "Signal Processing Devices" },
+ { 40706, "AGMF Pr\0303\0251voyance Union de mutuelles soumise au livre II du Code de la Mutualit\0303\0251 - Filiale de GPM" },
+ { 40707, "Aleturo Group" },
+ { 40708, "Rhythm Engineering, LLC" },
+ { 40709, "Jiaheng Medical Technology Co., Ltd." },
+ { 40710, "Grasshopper" },
+ { 40711, "DSTA S.L." },
+ { 40712, "DHCPCD Project" },
+ { 40713, "Migame.org" },
+ { 40714, "Accelera Mobile Broadband, Inc." },
+ { 40715, "Innerworkings" },
+ { 40716, "Kyle Brantley" },
+ { 40717, "Conde Nast" },
+ { 40718, "RelySys Technologies India Private Limited" },
+ { 40719, "The Lubrizol Corporation" },
+ { 40720, "Texas Department of Public Safety" },
+ { 40721, "FormFactor, Inc." },
+ { 40722, "HUVITZ" },
+ { 40723, "New Zealand Defence Force" },
+ { 40724, "Ubisoft Entertainment" },
+ { 40725, "Intune Networks Limited" },
+ { 40726, "CIPHRON GmbH" },
+ { 40727, "Cosium" },
+ { 40728, "Falck Danmark A/S" },
+ { 40729, "LAND-DATA GmbH" },
+ { 40730, "Neocom Software Ltd." },
+ { 40731, "Elephant Talk Communications Corp." },
+ { 40732, "Consortium for Smart Energy Profile 2 Interoperability" },
+ { 40733, "Sabzfaam ICT" },
+ { 40734, "Karina Mobile Solutions" },
+ { 40735, "DoctuSoft Ltd." },
+ { 40736, "Audeo, Inc." },
+ { 40737, "National Labor Relations Board" },
+ { 40738, "The Children's Institute of Pittsburgh" },
+ { 40739, "Affirmative Insurance Holdings, Inc." },
+ { 40740, "DirectOut GmbH" },
+ { 40741, "Flying Horse Productions, LLC" },
+ { 40742, "PDI Ninth House" },
+ { 40743, "Reissmann IT-Services" },
+ { 40744, "Center for Translational Molecular Medicine (CTMM TraIT)" },
+ { 40745, "WiValley, Inc" },
+ { 40746, "GOZUBUYUKOGLU" },
+ { 40747, "Radiant Logic, Inc." },
+ { 40748, "IONODES Inc." },
+ { 40749, "Corfire (SK C&C USA) Inc." },
+ { 40750, "Synrc Research Center" },
+ { 40751, "Homemail - Ross Johnson" },
+ { 40752, "Barricane Technology Ltd." },
+ { 40753, "Beijing Time Antaeus Media Technology Co.,Ltd" },
+ { 40754, "Liikennevirasto TVT" },
+ { 40755, "Acticom" },
+ { 40756, "K.W.Doggett Fine Paper" },
+ { 40757, "MOSCOW COMMERCIAL BANK MOSCOMPRIVATBANK ZAO" },
+ { 40758, "Eltek Polska" },
+ { 40759, "EGRIMA BuisnessCenter" },
+ { 40760, "TOMRA Systems ASA" },
+ { 40761, "Mideye AB" },
+ { 40762, "Hitec Electric b.v." },
+ { 40763, "Kennedy University Hospitals, Inc." },
+ { 40764, "Resonate Insights" },
+ { 40765, "hSenid Software (Singapore) PVT Limited" },
+ { 40766, "Xenode Co. Ltd." },
+ { 40767, "Reporting Est\0303\0241ndar S.L." },
+ { 40768, "Hotwords Tecnologia" },
+ { 40769, "VendScreen" },
+ { 40770, "Partheas" },
+ { 40771, "VISUAPPS GmbH" },
+ { 40772, "SuperMedia, LLC" },
+ { 40773, "The Prosecutor General`s Office of Ukraine" },
+ { 40774, "NagSNMP" },
+ { 40775, "TripodWorks CO.,LTD." },
+ { 40776, "Kalyan Kadiyala" },
+ { 40777, "Qin Technology SpA" },
+ { 40778, "Unassigned" },
+ { 40779, "2reallife" },
+ { 40780, "5th Tier Limited" },
+ { 40781, "Cynaptica" },
+ { 40782, "Dyne System Co., Ltd" },
+ { 40783, "icoMetrix" },
+ { 40784, "Kumahira Co., Ltd." },
+ { 40785, "Optro Co.,Ltd" },
+ { 40786, "Unassigned" },
+ { 40787, "Compumatica secure networks" },
+ { 40788, "Abegglen Management Consultants AG" },
+ { 40789, "Logix" },
+ { 40790, "Simple Solution Technologies LLC" },
+ { 40791, "Beijing OMATE Digital Technology CO.,Ltd" },
+ { 40792, "Express-Interfracht Internationale Spedition GmbH" },
+ { 40793, "Andelskassen JAK" },
+ { 40794, "IG Metall Vorstandsverwaltung" },
+ { 40795, "otaku-realm.net" },
+ { 40796, "ICBPI S.p.A." },
+ { 40797, "Sidion" },
+ { 40798, "3D-P" },
+ { 40799, "Swiss International Air Lines Ltd." },
+ { 40800, "Smart Refill i Helsingborg AB" },
+ { 40801, "FiveCo" },
+ { 40802, "Indra Navia as" },
+ { 40803, "netRapid GmbH & Co. KG" },
+ { 40804, "ULTEO" },
+ { 40805, "Nimbus Directory Services" },
+ { 40806, "ICBTECH d.o.o." },
+ { 40807, "semyon.org" },
+ { 40808, "Wi-Fi Alliance" },
+ { 40809, "Tohoku Gakuin University" },
+ { 40810, "BUPT-GUOAN Broadband Network Technology Co.Ltd" },
+ { 40811, "WebSistem" },
+ { 40812, "Die Firma GmbH" },
+ { 40813, "Agenturadmin.de" },
+ { 40814, "Garden City Hospital " },
+ { 40815, "Dr. Thalmair" },
+ { 40816, "Ecodigi Tecnologia e Servi\0303\0247os Ltda." },
+ { 40817, "Dr. Martin Froehlich" },
+ { 40818, "CYG SUNRI CO.,LTD" },
+ { 40819, "Provident Solutions LLC" },
+ { 40820, "OpenIPMI" },
+ { 40821, "Public Protector South Africa" },
+ { 40822, "Hagedorn Informationssysteme GmbH" },
+ { 40823, "NVable Limited" },
+ { 40824, "Qore Technologies, sro" },
+ { 40825, "VeriTeknik" },
+ { 40826, "Short Films 4 U Limited" },
+ { 40827, "Lifelan Technology Co., LTD." },
+ { 40828, "CHIeru Co., Ltd." },
+ { 40829, "Cambridge Industries Group (CIG)" },
+ { 40830, "Qiaoy.info" },
+ { 40831, "Domenikss SIA" },
+ { 40832, "MicroNova AG" },
+ { 40833, "Hytec Electronics Ltd" },
+ { 40834, "K\0303\0274bler IT" },
+ { 40835, "Department of Microelectronics and Computer Science, Lodz University of Technology" },
+ { 40836, "Blackbird Group, Inc." },
+ { 40837, "iTech Com\0303\0251rcio Importa\0303\0247\0303\0243o e Exporta\0303\0247\0303\0243o de Componentes Eletr\0303\0264nicos LTDA" },
+ { 40838, "Commune de Niort" },
+ { 40839, "SARDA South Wales" },
+ { 40840, "Rainydayz" },
+ { 40841, sminmpec_unknown }, /* (Added by Wireshark) */
+ { 40842, "A10 Networks" },
+ { 40843, "Chatmongers, LLC" },
+ { 40844, "MAC&C LLC" },
+ { 40845, "Veris Industries" },
+ { 40846, "Montpelier Technical Resources Ltd" },
+ { 40847, "CRDP de l'Acad\0303\0251mie de Versailles" },
+ { 40848, "VeriFyle, Inc." },
+ { 40849, "Ceiec Electric Technology Inc." },
+ { 40850, "Kongsberg Spacetec AS" },
+ { 40851, "IPContact Software" },
+ { 40852, "Main Line Health Inc." },
+ { 40853, "ATOSS CSD Software GmbH" },
+ { 40854, "WH Ireland Limited" },
+ { 40855, "University of Pittsburgh" },
+ { 40856, "Tofino Security" },
+ { 40857, "Mira Soft" },
+ { 40858, "ModemTec, spol. s r. o." },
+ { 40859, "VOSGELIS" },
+ { 40860, "Protocom Technology" },
+ { 40861, "Silent Softwares Pvt. Ltd." },
+ { 40862, "Systema Technologies SA" },
+ { 40863, "UP-nxt" },
+ { 40864, "Larcan Inc" },
+ { 40865, "Majorpower Corporation" },
+ { 40866, "Arcusys Oy" },
+ { 40867, "Boardroom Pty Limited" },
+ { 40868, "Genew Technologies Co.,Ltd" },
+ { 40869, "TAIWAN-CA Inc." },
+ { 40870, "Closed Joint Stock Company Interfax" },
+ { 40871, "poweroasis" },
+ { 40872, "Pardazeshgaran Saman Banking Solutions" },
+ { 40873, "Semafone Limited" },
+ { 40874, "LL Control Solutions International (PTY) Ltd" },
+ { 40875, "OfficeCore" },
+ { 40876, "Pressens F\0303\0246llesindk\0303\0270b" },
+ { 40877, "myprocurement" },
+ { 40878, "Venere Net Srl" },
+ { 40879, "VERION TEKNOLOJI A.S." },
+ { 40880, "DBI Software, Inc." },
+ { 40881, "Mutualink Inc" },
+ { 40882, "Step One AS" },
+ { 40883, "Beijing CangLang TV Technologies Co., Ltd." },
+ { 40884, "Instituto Federal Fluminense - IFF" },
+ { 40885, "ELCUS" },
+ { 40886, "Kommunales Rechenzentrum Minden-Ravensberg/Lippe" },
+ { 40887, "Edeka Minden-Hannover IT-/logistic service GmbH" },
+ { 40888, "Universitaetsklinikum Tuebingen" },
+ { 40889, "Global Invacom Ltd" },
+ { 40890, "Hardomo" },
+ { 40891, "RDC, Inc. dba LynTec" },
+ { 40892, "Abimus" },
+ { 40893, "University of the Arts Helsinki" },
+ { 40894, "Cory-Net" },
+ { 40895, "VRVis Zentrum f\0303\0274r Virtual Reality und Visualisierung Forschungs-GmbH" },
+ { 40896, "Pearson Technology" },
+ { 40897, "C.S. Veritas" },
{ 0, NULL}
};
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/file.c
^
|
| @@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c 43867 2012-07-20 18:52:56Z gerald $
+ * $Id: file.c 45624 2012-10-17 21:38:34Z guy $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -2971,7 +2971,7 @@
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
for (i = 0; i < buf_len; i++) {
c_char = cf->pd[i];
if (cf->case_type)
@@ -3011,7 +3011,7 @@
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
for (i = 0; i < buf_len; i++) {
c_char = cf->pd[i];
if (cf->case_type)
@@ -3049,7 +3049,7 @@
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
for (i = 0; i < buf_len; i++) {
c_char = cf->pd[i];
if (cf->case_type)
@@ -3087,7 +3087,7 @@
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
for (i = 0; i < buf_len; i++) {
if (cf->pd[i] == binary_data[c_match]) {
c_match++;
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/gtk/color_edit_dlg.c
^
|
| @@ -1,7 +1,7 @@
/* color_edit_dlg.c
* Definitions for single color filter edit dialog boxes
*
- * $Id: color_edit_dlg.c 35966 2011-02-16 18:27:00Z sfisher $
+ * $Id: color_edit_dlg.c 46232 2012-11-27 18:15:23Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -468,8 +468,11 @@
static void
edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_data _U_)
{
- /* Delete the entry. As a side effect this destroys the edit_dialog window. */
- color_delete_single(color_dlg_num_of_filters-1, (GtkWidget*)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL));
+ /* Delete the entry. As a side effect this destroys the edit_dialog window.
+ Before the edit dialogue was launched, the color filter list was
+ prepended with a default entry. This is the entry at position 0 that we
+ want to delete now. */
+ color_delete_single(0, (GtkWidget*)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL));
}
static GtkWidget*
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/gtk/gui_utils.c
^
|
| @@ -3,7 +3,7 @@
* and some with GUI-independent APIs, with this file containing the GTK+
* implementations of them (declared in ui_util.h)
*
- * $Id: gui_utils.c 36259 2011-03-22 18:28:08Z stig $
+ * $Id: gui_utils.c 46232 2012-11-27 18:15:23Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -364,18 +364,16 @@
* other.
*
* If the requested (x,y) position isn't within the monitor's
- * viewable area, change it to the viewable area's (0,0). */
-
+ * viewable area, change it to the viewable area's (x,y). */
default_screen = gdk_screen_get_default();
monitor_num = gdk_screen_get_monitor_at_point(default_screen,
geom->x, geom->y);
gdk_screen_get_monitor_geometry(default_screen, monitor_num,
&viewable_area);
-
- if(geom->x < viewable_area.x || geom->x > viewable_area.width)
+ if(geom->x < viewable_area.x || geom->x > (viewable_area.x + viewable_area.width))
geom->x = viewable_area.x;
- if(geom->y < viewable_area.y || geom->y > viewable_area.height)
+ if(geom->y < viewable_area.y || geom->y > (viewable_area.y + viewable_area.height))
geom->y = viewable_area.y;
gtk_window_move(GTK_WINDOW(widget),
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/gtk/sctp_stat.c
^
|
| @@ -1,7 +1,7 @@
/*
* Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de>
*
- * $Id: sctp_stat.c 34017 2010-08-30 16:10:01Z morriss $
+ * $Id: sctp_stat.c 46234 2012-11-27 18:37:46Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -866,7 +866,6 @@
info->min_tsn2 = tsnumber;
if (tsnumber > info->max_tsn2)
info->max_tsn2 = tsnumber;
- info->n_sack_chunks_ep2++;
length = tvb_get_ntohs(sctp_info->tvb[chunk_number], CHUNK_LENGTH_OFFSET);
if (sack->first_tsn == 0)
sack->first_tsn = tsnumber;
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/make-version.pl
^
|
| @@ -2,7 +2,7 @@
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl 44531 2012-08-15 20:24:56Z gerald $
+# $Id: make-version.pl 45264 2012-10-02 19:46:57Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -75,7 +75,7 @@
my %version_pref = (
"version_major" => 1,
"version_minor" => 6,
- "version_micro" => 11,
+ "version_micro" => 12,
"version_build" => 0,
"enable" => 1,
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/manuf
^
|
| @@ -4,7 +4,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf 45222 2012-09-30 15:04:11Z gerald $
+# $Id: manuf 46180 2012-11-25 16:04:34Z gerald $
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -5528,7 +5528,7 @@
00:15:7F ChuangIn # ChuanG International Holding CO.,LTD.
00:15:80 U-Way # U-WAY CORPORATION
00:15:81 Makus # MAKUS Inc.
-00:15:82 Tvonics # TVonics Ltd
+00:15:82 PulseEig # Pulse Eight Limited
00:15:83 Ivt # IVT corporation
00:15:84 SchenckP # Schenck Process GmbH
00:15:85 Aonvisio # Aonvision Technolopy Corp.
@@ -5602,7 +5602,7 @@
00:15:C9 Gumstix # Gumstix, Inc
00:15:CA Terareco # TeraRecon, Inc.
00:15:CB SurfComm # Surf Communication Solutions Ltd.
-00:15:CC TepcoUqu # TEPCO UQUEST, LTD.
+00:15:CC Uquest # UQUEST, LTD.
00:15:CD Exartech # Exartech International Corp.
00:15:CE ArrisInt # ARRIS International
00:15:CF ArrisInt # ARRIS International
@@ -12177,7 +12177,7 @@
00:50:C2:59:40:00/36 PixelVel # Pixel Velocity, Inc.
00:50:C2:59:50:00/36 Callpod # Callpod, Inc.
00:50:C2:59:60:00/36 Spansion
-00:50:C2:59:70:00/36 Nautel # Nautel Ltd.
+00:50:C2:59:70:00/36 Nautel # Nautel Limited
00:50:C2:59:80:00/36 Bundesam # Bundesamt fÃÂür Strahlenschutz
00:50:C2:59:90:00/36 FenTechn # Fen Technology Limited
00:50:C2:59:A0:00/36 Multitro # MultiTrode Pty Ltd
@@ -14570,6 +14570,7 @@
00:50:C2:F0:00:00/36 SyscomIn # Syscom Instruments
00:50:C2:F0:10:00/36 MangoDsp # Mango DSP, Inc
00:50:C2:F0:20:00/36 Bmr
+00:50:C2:F0:30:00/36 WrenSoun # Wren Sound Systems
00:50:C2:F0:40:00/36 KinkiRoe # KINKI ROENTGEN INDUSTRIAL CO.,LTD
00:50:C2:F0:50:00/36 EsiVentu # ESI Ventures
00:50:C2:F0:60:00/36 Micro-Ke # Micro-Key BV
@@ -14730,7 +14731,6 @@
00:50:C2:FA:10:00/36 N-HandsU # N-Hands GmbH und Co KG
00:50:C2:FA:20:00/36 Power-On # Power-One
00:50:C2:FA:30:00/36 XemexNv # Xemex NV
-00:50:C2:FA:40:00/36 Jasmine # Jasmine Systems, Inc.
00:50:C2:FA:50:00/36 Intuitiv # Intuitive Surgical, Inc.
00:50:C2:FA:60:00/36 HilkomDi # Hilkom digital GmbH
00:50:C2:FA:70:00/36 Exelis # Exelis Inc.
@@ -15402,7 +15402,9 @@
00:80:FD ExsceedC # EXSCEED CORPRATION
00:80:FE AzureTec # AZURE TECHNOLOGIES, INC.
00:80:FF SocDeTel # SOC. DE TELEINFORMATIQUE RTC
+00:88:65 Apple
00:8C:10 BlackBox # Black Box Corp.
+00:8C:54 AdbBroad # ADB Broadband Italia
00:8C:FA Inventec # Inventec Corporation
00:8D:4E CjscNiiS # CJSC NII STT
00:8D:DA LinkOne # Link One Co., Ltd.
@@ -15976,6 +15978,7 @@
00:B9:F6 Shenzhen # Shenzhen Super Rich Electronics Co.,Ltd
00:BA:C0 Biometri # Biometric Access Company
00:BB:01 Octothor # OCTOTHORPE CORP.
+00:BB:3A Private
00:BB:8E Hme # HME Co., Ltd.
00:BB:F0 Ungerman # UNGERMANN-BASS INC.
00:BD:27 Exar # Exar Corp.
@@ -16813,6 +16816,7 @@
04:0A:E0 XmitComp # XMIT AG COMPUTER NETWORKS
04:0C:CE Apple # Apple, Inc.
04:0E:C2 Viewsoni # ViewSonic Mobile China Limited
+04:15:52 Apple
04:18:0F SamsungE # Samsung Electronics Co.,Ltd
04:18:B6 Private
04:18:D6 Ubiquiti # Ubiquiti Networks
@@ -16831,12 +16835,14 @@
04:4F:AA RuckusWi # Ruckus Wireless
04:54:53 Apple # Apple, Inc.
04:55:CA BriviewX # BriView (Xiamen) Corp.
+04:58:6F SichuanW # Sichuan Whayer information industry Co.,LTD
04:5A:95 Nokia # Nokia Corporation
04:5C:06 ZmodoTec # Zmodo Technology Corporation
04:5D:56 CamtronI # camtron industrial inc.
04:62:D7 AlstomHy # ALSTOM HYDRO FRANCE
04:63:E0 NomeOy # Nome Oy
04:6D:42 Bryston # Bryston Ltd.
+04:6E:49 TaiyearE # TaiYear Electronic Technology (Suzhou) Co., Ltd
04:70:BC Globalst # Globalstar Inc.
04:74:A1 AligeraE # Aligera Equipamentos Digitais Ltda
04:75:F5 Csst
@@ -17041,11 +17047,13 @@
08:2E:5F HewlettP # Hewlett Packard
08:37:9C Topaz # Topaz Co. LTD.
08:38:A5 Funkwerk # Funkwerk plettac electronic GmbH
+08:3A:B8 ShinodaP # Shinoda Plasma Co., Ltd.
08:3E:8E HonHaiPr # Hon Hai Precision Ind.Co.Ltd
08:4E:1C H2aLlc # H2A Systems, LLC
08:4E:BF BroadNet # Broad Net Mux Corporation
08:51:2E OrionDia # Orion Diagnostica Oy
08:5B:0E Fortinet # Fortinet, Inc.
+08:60:6E AsustekC # ASUSTek COMPUTER INC.
08:68:EA EitoElec # EITO ELECTRONICS CO., LTD.
08:75:72 ObeluxOy # Obelux Oy
08:76:18 VieTechn # ViE Technologies Sdn. Bhd.
@@ -17077,8 +17085,10 @@
08:E5:DA NanjingF # NANJING FUJITSU COMPUTER PRODUCTS CO.,LTD.
08:E6:72 JebseeEl # JEBSEE ELECTRONICS CO.,LTD.
08:EA:44 Aerohive # Aerohive Networks, Inc.
+08:EB:74 Humax
08:EB:ED WorldEli # World Elite Technology Co.,LTD
08:ED:B9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+08:F1:B7 Towerstr # Towerstream Corpration
08:F2:F4 NetOnePa # Net One Partners Co.,Ltd.
08:F6:F8 GetEngin # GET Engineering
08:FA:E0 FohhnAud # Fohhn Audio AG
@@ -17192,12 +17202,14 @@
10:47:80 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
10:48:B1 BeijingD # Beijing Duokan Technology Limited
10:56:CA PeplinkI # Peplink International Ltd.
+10:5C:BF Durobyte # DuroByte Inc
10:5F:49 CiscoSpv # Cisco SPVTG
10:60:4B HewlettP # Hewlett Packard
10:62:C9 Adatis # Adatis GmbH & Co. KG
10:64:E2 AdfwebCo # ADFweb.com s.r.l.
10:65:A3 Panamax # Panamax Inc.
10:65:CF Iqsim
+10:68:3F LgElectr # LG Electronics
10:6F:3F Buffalo # Buffalo Inc.
10:6F:EF Ad-SolNi # Ad-Sol Nissin Corp
10:71:F9 CloudTel # Cloud Telecomputers, LLC
@@ -17293,8 +17305,10 @@
14:EB:33 Bsmedias # BSMediasoft Co., Ltd.
14:EE:9D AirnavLl # AirNav Systems LLC
14:F0:C5 Xtremio # Xtremio Ltd.
+14:F4:2A SamsungE # Samsung Electronics
14:FE:AF Sagittar # SAGITTAR LIMITED
14:FE:B5 Dell # Dell Inc
+18:00:2D SonyMobi # Sony Mobile Communications AB
18:01:E3 Elektrob # Elektrobit Wireless Communications Ltd
18:03:73 Dell # Dell Inc
18:03:FA IbtInter # IBT Interfaces
@@ -17305,9 +17319,11 @@
18:14:20 TebSas # TEB SAS
18:14:56 Nokia # Nokia Corporation
18:17:14 Daewoois
+18:17:25 CameoCom # Cameo Communications, Inc.
18:19:3F TamtronO # Tamtron Oy
18:20:32 Apple # Apple, Inc.
18:28:61 AirtiesW # AirTies Wireless Networks
+18:2A:7B Nintendo # Nintendo Co., Ltd.
18:2B:05 8dTechno # 8D Technologies
18:2C:91 ConceptD # Concept Development, Inc.
18:33:9D Cisco # Cisco Systems
@@ -17323,11 +17339,13 @@
18:48:D8 Fastback # Fastback Networks
18:4E:94 MessoaTe # MESSOA TECHNOLOGIES INC.
18:52:53 Pixord # Pixord Corporation
+18:55:0F CiscoSpv # Cisco SPVTG
18:59:33 CiscoSpv # Cisco SPVTG
18:66:E3 Veros # Veros Systems, Inc.
18:67:3F HanoverD # Hanover Displays Limited
18:67:51 KomegInd # KOMEG Industrielle Messtechnik GmbH
18:6D:99 Adanis # Adanis Inc.
+18:7A:93 AmiccomE # AMICCOM Electronics Corporation
18:7C:81 ValeoVis # Valeo Vision Systems
18:80:CE Barberry # Barberry Solutions Ltd
18:80:F5 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd
@@ -17382,6 +17400,7 @@
1C:45:93 TexasIns # Texas Instruments
1C:4B:D6 Azurewav # AzureWave
1C:51:B5 Techaya # Techaya LTD
+1C:52:D6 FlatDisp # FLAT DISPLAY TECHNOLOGY CORPORATION
1C:5A:3E SamsungE # Samsung Eletronics Co., Ltd (Visual Display Divison)
1C:5A:6B PhilipsE # Philips Electronics Nederland BV
1C:5C:55 PrimaCin # PRIMA Cinema, Inc
@@ -17402,6 +17421,7 @@
1C:84:64 FormosaW # FORMOSA WIRELESS COMMUNICATION CORP.
1C:8E:8E DbCommun # DB Communication & Systems Co., ltd.
1C:8F:8A PhaseMot # Phase Motion Control SpA
+1C:91:79 Integrat # Integrated System Technologies Ltd
1C:94:92 RuagSchw # RUAG Schweiz AG
1C:95:5D I-LaxEle # I-LAX ELECTRONICS INC.
1C:95:9F Veethree # Veethree Electronics And Marine LLC
@@ -17436,6 +17456,7 @@
20:10:7A GemtekTe # Gemtek Technology Co., Ltd.
20:12:57 MostLuck # Most Lucky Trading Ltd
20:13:E0 SamsungE # Samsung Electronics Co.,Ltd
+20:16:D8 LiteonTe # Liteon Technology Corporation
20:21:A5 LgElectr # LG Electronics Inc
20:25:98 Teleview
20:2B:C1 HuaweiDe # Huawei Device Co., Ltd
@@ -17465,7 +17486,9 @@
20:74:CF Shenzhen # Shenzhen Voxtech Co.,Ltd
20:76:00 Actionte # Actiontec Electronics, Inc
20:7C:8F QuantaMi # Quanta Microsystems,Inc.
+20:85:8C Assa
20:89:84 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD
+20:91:8A Profalux
20:91:D9 I'M # I'M SPA
20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd
20:A2:E7 Lee-Dick # Lee-Dickens Ltd
@@ -17497,6 +17520,7 @@
20:FD:F1 3comEuro # 3COM EUROPE LTD
20:FE:CD SystemIn # System In Frontier Inc.
20:FE:DB M2mSolut # M2M Solution S.A.S.
+24:01:C7 Cisco
24:09:17 DevlinEl # Devlin Electronics Limited
24:0B:2A ViettelG # Viettel Group
24:0B:B1 KostalIn # KOSTAL Industrie Elektrik GmbH
@@ -17507,6 +17531,7 @@
24:1B:13 Shanghai # Shanghai Nutshell Electronic Co., Ltd.
24:1F:2C Calsys # Calsys, Inc.
24:21:AB SonyEric # Sony Ericsson Mobile Communications
+24:2F:FA ToshibaG # Toshiba Global Commerce Solutions
24:37:4C CiscoSpv # Cisco SPVTG
24:37:EF EmcElect # EMC Electronic Media Communication SA
24:3C:20 Dynamode # Dynamode Group
@@ -17640,6 +17665,7 @@
2C:36:A0 Capisco # Capisco Limited
2C:36:F8 Cisco # Cisco Systems
2C:3A:28 FagorEle # Fagor ElectrÃÂónica
+2C:3B:FD NetstorT # Netstor Technology Co., Ltd.
2C:3F:38 Cisco # Cisco Systems
2C:3F:3E Alge-Tim # Alge-Timing GmbH
2C:41:38 Hewlett- # Hewlett-Packard Company
@@ -17679,6 +17705,7 @@
2C:DD:0C Discover # Discovergy GmbH
2C:E2:A8 Devicede # DeviceDesign
2C:E4:12 Sagemcom # SAGEMCOM SAS
+2C:E8:71 AlertMet # Alert Metalguard ApS
2C:ED:EB AlpheusD # Alpheus Digital Company Limited
2C:EE:26 Petroleu # Petroleum Geo-Services
2C:F4:C5 Avaya # Avaya Inc
@@ -17727,6 +17754,8 @@
30:AE:F6 RadioMob # Radio Mobile Access
30:B2:16 HytecGer # Hytec Geraetebau GmbH
30:B3:A2 Shenzhen # Shenzhen Heguang Measurement & Control Technology Co.,Ltd
+30:C8:2A Wi-NextS # Wi-Next s.r.l.
+30:D3:57 Logosol # Logosol, Inc.
30:DE:86 CedacSof # Cedac Software S.r.l.
30:E4:8E Vodafone # Vodafone UK
30:E4:DB Cisco # Cisco Systems
@@ -17734,6 +17763,7 @@
30:EF:D1 AlstomSt # Alstom Strongwish (Shenzhen) Co., Ltd.
30:F3:3A +PluggSr # +plugg srl
30:F7:0D Cisco # Cisco Systems
+30:F7:C5 Apple
30:F9:ED Sony # Sony Corporation
30:FD:11 Macrotec # MACROTECH (USA) INC.
34:07:FB Ericsson # Ericsson AB
@@ -17773,6 +17803,7 @@
34:AA:99 Alcatel- # Alcatel-Lucent
34:AA:EE Mikrovis # Mikrovisatos Servisas UAB
34:AF:2C Nintendo # Nintendo Co., Ltd.
+34:B1:F7 TexasIns # Texas Instruments
34:B5:71 Plds
34:BA:51 Se-KureC # Se-Kure Controls, Inc.
34:BA:9A Asiatelc # Asiatelco Technologies Co.
@@ -17781,6 +17812,7 @@
34:BD:C8 Cisco # Cisco Systems
34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd.
34:BD:FA CiscoSpv # Cisco SPVTG
+34:C0:59 Apple
34:C3:AC SamsungE # Samsung Electronics
34:C6:9A Enecsys # Enecsys Ltd
34:C7:31 AlpsElec # ALPS Electric Co,. Ltd.
@@ -17796,6 +17828,7 @@
34:EF:44 2wire
34:EF:8B NttCommu # NTT Communications Corporation
34:F3:9B Wizlan # WizLAN Ltd.
+34:F6:2D Sharp # SHARP Corporation
34:F9:68 AtekProd # ATEK Products, LLC
34:FA:40 Guangzho # Guangzhou Robustel Technologies Co., Limited
34:FC:6F Alcea
@@ -17812,6 +17845,7 @@
38:28:EA FujianNe # Fujian Netcom Technology Co., LTD
38:31:AC Weg
38:3F:10 DblTechn # DBL Technology Ltd.
+38:43:69 PatrolPr # Patrol Products Consortium LLC
38:45:8C MycloudT # MyCloud Technology corporation
38:46:08 Zte # ZTE Corporation
38:52:1A Alcatel- # Alcatel-Lucent 7705
@@ -17820,6 +17854,7 @@
38:5F:C3 YuJeongS # Yu Jeong System, Co.Ltd
38:60:77 Pegatron # PEGATRON CORPORATION
38:63:F6 3nodMult # 3NOD MULTIMEDIA(SHENZHEN)CO.,LTD
+38:66:45 OosicTec # OOSIC Technology CO.,Ltd
38:6B:BB Motorola # Motorola Mobility, Inc.
38:6E:21 WasionGr # Wasion Group Ltd.
38:72:C0 Comtrend
@@ -17834,9 +17869,11 @@
38:A9:5F Actifio # Actifio Inc
38:AA:3C SamsungE # SAMSUNG ELECTRO-MECHANICS
38:B1:2D Sonotron # Sonotronic Nagel GmbH
+38:B5:BD EGOElekt # E.G.O. Elektro-Ger
38:BB:23 Ozvision # OzVision America LLC
38:BC:1A MeizuTec # Meizu technology co.,ltd
38:BF:33 NecCasio # NEC CASIO Mobile Communications
+38:C0:96 AlpsElec # ALPS ELECTRIC CO.,LTD.
38:C7:BA CsServic # CS Services Co.,Ltd.
38:C8:5C CiscoSpv # Cisco SPVTG
38:D1:35 EasyioSd # EasyIO Corporation Sdn. Bhd.
@@ -17845,8 +17882,10 @@
38:E7:D8 Htc # HTC Corporation
38:E8:DF BMedien+ # b gmbh medien + datenbanken
38:E9:8C RecoSPA # Reco S.p.A.
+38:EA:A7 HewlettP # Hewlett Packard
38:EC:E4 SamsungE # Samsung Electronics
38:EE:9D Anedo # Anedo Ltd.
+38:F5:97 Home2net # home2net GmbH
38:F8:B7 V2comPar # V2COM PARTICIPACOES S.A.
38:FE:C5 EllipsBV # Ellips B.V.
3C:00:00 3Com
@@ -17875,6 +17914,7 @@
3C:4C:69 Infinity # Infinity System S.L.
3C:4E:47 Etronic # Etronic A/S
3C:57:BD KesslerC # Kessler Crane Inc.
+3C:57:D5 Fiveco
3C:5A:37 SamsungE # Samsung Electronics
3C:5F:01 Synerchi # Synerchip Co., Ltd.
3C:62:00 SamsungE # Samsung electronics CO., LTD
@@ -17914,6 +17954,7 @@
3C:D7:DA SkMtekMi # SK Mtek microelectronics(shenzhen)limited
3C:D9:2B Hewlett- # Hewlett-Packard Company
3C:DF:1E Cisco # Cisco Systems
+3C:E0:72 Apple
3C:E5:A6 Hangzhou # Hangzhou H3C Technologies Co., Ltd.
3C:E5:B4 KidasenI # KIDASEN INDUSTRIA E COMERCIO DE ANTENAS LTDA
3C:E6:24 LgDispla # LG Display
@@ -17936,6 +17977,7 @@
40:1D:59 Biometri # Biometric Associates, LP
40:22:ED DigitalP # Digital Projection Ltd
40:25:C2 IntelCor # Intel Corporate
+40:27:0B Mobileec # Mobileeco Co., Ltd
40:2B:A1 SonyEric # Sony Ericsson Mobile Communications AB
40:2C:F4 Universa # Universal Global Scientific Industrial Co., Ltd.
40:30:04 Apple # Apple, Inc.
@@ -17978,6 +18020,7 @@
40:A6:D9 Apple # Apple, Inc.
40:AC:8D DataMana # Data Management, Inc.
40:B2:C8 NortelNe # Nortel Networks
+40:B3:95 Apple
40:B3:FC Logital # Logital Co. Limited
40:B4:F0 JuniperN # Juniper Networks
40:B7:F3 Motorola # Motorola Mobility, Inc.
@@ -18010,6 +18053,65 @@
40:D8:55:01:00:00/36 ApgCashD # APG CASH DRAWER
40:D8:55:01:10:00/36 FleximSe # Flexim Security Oy
40:D8:55:01:20:00/36 Sencon # Sencon Inc.
+40:D8:55:01:30:00/36 GrandeVi # Grande Vitesse Systems
+40:D8:55:01:40:00/36 ToniStud # Toni Studio
+40:D8:55:01:50:00/36 BitmillS # BITMILL srl
+40:D8:55:01:60:00/36 Par-Tech # Par-Tech, Inc.
+40:D8:55:01:70:00/36 FrankeAq # Franke Aquarotter GmbH
+40:D8:55:01:80:00/36 StaneoSa # STANEO SAS
+40:D8:55:01:90:00/36 Nautel # Nautel Limited
+40:D8:55:01:A0:00/36 MeggittD # MEGGITT DEFENSE SYSTEMS INC.
+40:D8:55:01:B0:00/36 AudioEnh # Audio Enhancement
+40:D8:55:01:C0:00/36 Berg
+40:D8:55:01:D0:00/36 ScharcoE # Scharco Elektronik GmbH
+40:D8:55:01:E0:00/36 A2s
+40:D8:55:01:F0:00/36 SitepIta # Sitep Italia Spa
+40:D8:55:02:00:00/36 EntecEle # ENTEC Electric & Electronic CO., LTD.
+40:D8:55:02:10:00/36 SmtDOO # SMT D.O.O.
+40:D8:55:02:20:00/36 Digimerg # Digimerge Technology Inc
+40:D8:55:02:30:00/36 Shanghai # Shanghai o-solution electronics & Technology Co., Ltd.
+40:D8:55:02:40:00/36 Electric # Electrical Geodesics Incorporated
+40:D8:55:02:50:00/36 Rosemoun # Rosemount Analytical
+40:D8:55:02:60:00/36 Symetric # Symetrics Industries
+40:D8:55:02:70:00/36 GrupoEpe # GRUPO EPELSA S.L.
+40:D8:55:02:80:00/36 Integrat # Integrated Control Corp.
+40:D8:55:02:90:00/36 DeproEle # Depro Electronique
+40:D8:55:02:A0:00/36 Tinkerfo # Tinkerforge GmbH
+40:D8:55:02:B0:00/36 Nomatron # Nomatronics
+40:D8:55:02:C0:00/36 Inventla # InventLab s.c.
+40:D8:55:02:D0:00/36 ElgamaSi # Elgama Sistemos
+40:D8:55:02:E0:00/36 Circuite # Circuitec Ind. Equip. Eletr. Ltda
+40:D8:55:02:F0:00/36 AdvaTech # Adva Technologies
+40:D8:55:03:00:00/36 Tecnolog # Tecnologias Plexus
+40:D8:55:03:10:00/36 Dommel # Dommel GmbH
+40:D8:55:03:20:00/36 BettiniS # BETTINI SRL
+40:D8:55:03:30:00/36 ErmesEle # Ermes Elettronica s.r.l.
+40:D8:55:03:40:00/36 DacomWes # Dacom West GmbH
+40:D8:55:03:50:00/36 Mesotech # Mesotech International, Inc.
+40:D8:55:03:60:00/36 Schweers # Schweers informationstechnologie GmbH
+40:D8:55:03:70:00/36 Software # Software Workshop
+40:D8:55:03:80:00/36 SpecialM # Special Measurements Labs LLC
+40:D8:55:03:90:00/36 Ci # CI Systems Ltd
+40:D8:55:03:A0:00/36 SocusNet # Socus networks
+40:D8:55:03:B0:00/36 Telcomko # Telcomkorea
+40:D8:55:03:C0:00/36 Computer # Computer System Co.,Ltd
+40:D8:55:03:D0:00/36 TekelekE # Tekelek Europe Ltd
+40:D8:55:03:E0:00/36 VishayCe # Vishay Celtron Technologies, Inc.
+40:D8:55:03:F0:00/36 UnisvrGl # UniSVR Global Information Technology Corp.
+40:D8:55:04:00:00/36 GhlBerha # GHL Systems Berhad
+40:D8:55:04:10:00/36 TQMItaca # T.Q.M. Itaca Technology s.r.l.
+40:D8:55:04:20:00/36 MangoCom # Mango Communicaitons Inc.
+40:D8:55:04:30:00/36 Schulerc # SchulerControl GmbH
+40:D8:55:04:40:00/36 AnChenCo # An Chen Computer Co. Ltd.
+40:D8:55:04:50:00/36 Genadsys # Genadsystem
+40:D8:55:04:60:00/36 Circuitl # Circuitlink Pty Ltd
+40:D8:55:04:70:00/36 Dos&Dont # Dos&Donts SRL
+40:D8:55:04:80:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS
+40:D8:55:04:90:00/36 ThermoFi # Thermo Fisher Scientific
+40:D8:55:04:A0:00/36 GatewayT # Gateway Technologies SA de CV
+40:D8:55:04:B0:00/36 VitalTec # Vital Tech Industria e Comercio Ltda
+40:D8:55:04:C0:00/36 Serveron # Serveron Corporation
+40:D8:55:04:D0:00/36 Machinep # MACHINEPERFORMANCE ApS
40:E7:93 Shenzhen # Shenzhen Siviton Technology Co.,Ltd
40:EC:F8 Siemens # Siemens AG
40:EF:4C Fihonest # Fihonest communication co.,Ltd
@@ -18019,6 +18121,7 @@
40:F4:EC Cisco # Cisco Systems
40:F5:2E LeicaMic # Leica Microsystems (Schweiz) AG
40:FC:89 Motorola # Motorola Mobility, Inc.
+44:03:A7 Cisco
44:0C:FD Netman # NetMan Co., Ltd.
44:13:19 WkkTechn # WKK TECHNOLOGY LTD.
44:1E:A1 Hewlett- # Hewlett-Packard Company
@@ -18062,6 +18165,7 @@
44:8E:81 Vig
44:91:DB Shanghai # Shanghai Huaqin Telecom Technology Co.,Ltd
44:95:FA QingdaoS # Qingdao Santong Digital Technology Co.Ltd
+44:9B:78 NowFacto # The Now Factory
44:9C:B5 Alcomp # Alcomp, Inc
44:A4:2D TctMobil # TCT Mobile Limited
44:A6:89 PromaxEl # PROMAX ELECTRONICA SA
@@ -18088,6 +18192,7 @@
44:E8:A5 MyrekaTe # Myreka Technologies Sdn. Bhd.
44:ED:57 Longicor # Longicorn, inc.
44:F4:59 SamsungE # Samsung Electronics
+44:FB:42 Apple
47:54:43 GtcNotRe # GTC (Not registered!) (This number is a multicast!)
48:02:2A B-LinkEl # B-Link Electronic Limited
48:03:62 DesayEle # DESAY ELECTRONICS(HUIZHOU)CO.,LTD
@@ -18123,6 +18228,7 @@
48:AA:5D StoreEle # Store Electronic Systems
48:B2:53 Marketax # Marketaxess Corporation
48:B8:DE Homewins # HOMEWINS TECHNOLOGY CO.,LTD.
+48:B9:C2 Teletics # Teletics Inc.
48:C1:AC Plantron # PLANTRONICS, INC.
48:C8:62 SimoWire # Simo Wireless,Inc.
48:C8:B6 Systec # SysTec GmbH
@@ -18136,6 +18242,7 @@
48:EA:63 Zhejiang # Zhejiang Uniview Technologies Co., Ltd.
48:EB:30 EternaTe # ETERNA TECHNOLOGY, INC.
48:ED:80 DaesungE # daesung eltec
+48:F2:30 Ubizcore # Ubizcore Co.,LTD
48:F3:17 Private
48:F4:7D Techvisi # TechVision Holding Internation Limited
48:F7:F1 Alcatel- # Alcatel-Lucent
@@ -18154,6 +18261,7 @@
4C:17:EB Sagemcom
4C:1A:3A PrimaRes # PRIMA Research And Production Enterprise Ltd.
4C:1F:CC HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+4C:22:58 Cozybit # cozybit, Inc.
4C:2C:80 BeijingS # Beijing Skyway Technologies Co.,Ltd
4C:2F:9D IcmContr # ICM Controls
4C:30:89 ThalesTr # Thales Transportation Systems GmbH
@@ -18180,6 +18288,7 @@
4C:80:93 IntelCor # Intel Corporate
4C:8B:55 GrupoDig # Grupo Digicon
4C:8B:EF HuaweiTe # Huawei Technologies Co., Ltd
+4C:8F:A5 Jastec
4C:98:EF Zeo
4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd.
4C:9E:E4 HanyangN # Hanyang Navicom Co.,Ltd.
@@ -18240,6 +18349,7 @@
50:8C:77 Dirmeier # DIRMEIER Schanktechnik GmbH &Co KG
50:93:4F GradualT # Gradual Tecnologia Ltda.
50:97:72 Westingh # Westinghouse Digital
+50:A4:C8 SamsungE # Samsung Electronics Co.,Ltd
50:A6:E3 DavidCla # David Clark Company
50:A7:33 RuckusWi # Ruckus Wireless
50:AF:73 Shenzhen # Shenzhen Bitland Information Technology Co., Ltd.
@@ -18279,10 +18389,12 @@
54:53:ED Sony # Sony Corporation
54:5E:BD NlTechno # NL Technologies
54:5F:A9 Teracom # Teracom Limited
+54:61:EA Zaplox # Zaplox AB
54:73:98 ToyoElec # Toyo Electronics Corporation
54:74:E6 WebtechW # Webtech Wireless
54:75:D0 Cisco # Cisco Systems
54:78:1A Cisco
+54:79:75 Nokia # Nokia Corporation
54:7F:54 Ingenico
54:7F:A8 TelcoSRO # TELCO systems, s.r.o.
54:7F:EE Cisco # Cisco Systems
@@ -18304,6 +18416,7 @@
54:D1:B0 Universa # Universal Laser Systems, Inc
54:D4:6F CiscoSpv # Cisco SPVTG
54:DF:63 Intrakey # Intrakey technologies GmbH
+54:E0:32 JuniperN # Juniper Networks
54:E6:3F Shenzhen # ShenZhen LingKeWeiEr Technology Co., Ltd.
54:E6:FC Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
54:F5:B6 Oriental # ORIENTAL PACIFIC INTERNATIONAL LIMITED
@@ -18367,7 +18480,9 @@
58:C2:32 Nec # NEC Corporation
58:C3:8B SamsungE # Samsung Electronics
58:CF:4B LufkinIn # Lufkin Industries
+58:D0:71 BwBroadc # BW Broadcast
58:D0:8F Ieee1904 # IEEE 1904.1 Working Group
+58:D6:D3 DairyChe # Dairy Cheq Inc
58:DB:8D Fast # Fast Co., Ltd.
58:E4:76 CentronC # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD
58:E6:36 EvrsafeT # EVRsafe Technologies
@@ -18395,6 +18510,7 @@
5C:35:DA ThereOy # There Corporation Oy
5C:38:E0 Shanghai # Shanghai Super Electronics Technology Co.,LTD
5C:40:58 Jefferso # Jefferson Audio Video Systems, Inc.
+5C:43:D2 Hazemeye # HAZEMEYER
5C:4A:26 EnguityT # Enguity Technology Corp
5C:4C:A9 HuaweiDe # Huawei Device Co., Ltd
5C:50:15 Cisco # Cisco Systems
@@ -18414,9 +18530,11 @@
5C:7D:5E HuaweiTe # Huawei Technologies Co., Ltd
5C:86:4A SecretLa # Secret Labs LLC
5C:87:78 Cybertel # Cybertelbridge co.,ltd
+5C:89:D4 BeijingB # Beijing Banner Electric Co.,Ltd
5C:95:AE Apple # Apple Inc
5C:96:9D Apple
5C:9A:D8 Fujitsu # Fujitsu Limited
+5C:A3:9D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD.
5C:AC:4C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
5C:B5:24 SonyEric # Sony Ericsson Mobile Communications AB
5C:BD:9E Hongkong # HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
@@ -18441,6 +18559,7 @@
5C:F3:FC Ibm # IBM Corp
5C:F9:DD Dell # Dell Inc
5C:FF:35 Wistron # Wistron Corporation
+60:02:B4 WistronN # Wistron NeWeb Corp.
60:0F:77 Silverpl # SilverPlus, Inc
60:11:99 Data-Tes # Data-Tester Inc.
60:12:83 Solucion # Soluciones Tecnologicas para la Salud y el Bienestar SA
@@ -18542,6 +18661,7 @@
64:54:22 EquinoxP # Equinox Payments
64:55:63 Inteligh # Intelight Inc.
64:55:7F NsfocusI # NSFOCUS Information Technology Co., Ltd.
+64:5A:04 ChiconyE # Chicony Electronics Co., Ltd.
64:5D:D7 Shenzhen # Shenzhen Lifesense Medical Electronics Co., Ltd.
64:5E:BE Yahoo!Ja # Yahoo! JAPAN
64:5F:FF NicoletN # Nicolet Neuro
@@ -18572,6 +18692,7 @@
64:A0:E7 Cisco # Cisco Systems
64:A2:32 OooSamli # OOO Samlight
64:A3:41 Wonderla # Wonderlan (Beijing) Technology Co., Ltd.
+64:A3:CB Apple
64:A7:69 Htc # HTC Corporation
64:A8:37 JuniKore # Juni Korea Co., Ltd
64:AE:0C Cisco # Cisco Systems
@@ -18611,6 +18732,7 @@
68:17:29 IntelCor # Intel Corporate
68:1A:B2 Zte # zte corporation
68:1C:A2 Rosewill # Rosewill Inc.
+68:1E:8B Infosigh # InfoSight Corporation
68:1F:D8 Advanced # Advanced Telemetry
68:23:4B NihonDen # Nihon Dengyo Kousaku
68:3B:1E Countwis # Countwise LTD
@@ -18633,6 +18755,8 @@
68:7F:74 Cisco-Li # Cisco-Linksys, LLC
68:84:70 Essys # eSSys Co.,Ltd
68:85:40 IgiMobil # IGI Mobile, Inc.
+68:86:A7 Cisco
+68:86:E7 Orbotix # Orbotix, Inc.
68:87:6B InqMobil # INQ Mobile Limited
68:92:34 RuckusWi # Ruckus Wireless
68:94:23 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
@@ -18648,6 +18772,7 @@
68:B4:3A Waterfur # WaterFurnace International, Inc.
68:B5:99 Hewlett- # Hewlett-Packard Company
68:B6:FC HitronTe # Hitron Technologies. Inc
+68:B8:D9 ActKde # Act KDE, Inc.
68:BC:0C Cisco # Cisco Systems
68:BD:AB Cisco # Cisco Systems
68:CA:00 Octopus # Octopus Systems Limited
@@ -18665,6 +18790,7 @@
68:EF:BD Cisco # Cisco Systems
68:F1:25 DataCont # Data Controls Inc.
68:F8:95 Redflow # Redflow Limited
+68:FB:95 Generalp # Generalplus Technology Inc.
6C:04:60 RbhAcces # RBH Access Technologies Inc.
6C:0E:0D SonyEric # Sony Ericsson Mobile Communications AB
6C:0F:6A JdcTech # JDC Tech Co., Ltd.
@@ -18715,6 +18841,7 @@
6C:C1:D2 Motorola # Motorola Mobility, Inc.
6C:C2:6B Apple # Apple, Inc.
6C:D0:32 LgElectr # LG Electronics
+6C:D1:46 SmartekD # Smartek d.o.o.
6C:D6:8A LgElectr # LG Electronics Inc
6C:DC:6A Promethe # Promethean Limited
6C:E0:B0 Sound4
@@ -18747,6 +18874,9 @@
70:41:B7 EdwardsL # Edwards Lifesciences LLC
70:46:42 ChyngHon # CHYNG HONG ELECTRONIC CO., LTD.
70:4A:AE XstreamF # Xstream Flow (Pty) Ltd
+70:4A:E4 Rinstrum # Rinstrum Pty Ltd
+70:54:D2 Pegatron # PEGATRON CORPORATION
+70:54:F5 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
70:56:81 Apple # Apple Inc
70:58:12 Panasoni # Panasonic AVC Networks Company
70:5A:B6 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD.
@@ -18760,6 +18890,7 @@
70:72:3C HuaweiTe # Huawei Technologies Co., Ltd
70:72:CF Edgecore # EdgeCore Networks
70:73:CB Apple # Apple, Inc.
+70:76:DD Oxyguard # Oxyguard International A/S
70:76:F0 Levelone # LevelOne Communications (India) Private Limited
70:7B:E8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
70:7E:43 Motorola # Motorola Mobility, Inc.
@@ -18809,6 +18940,7 @@
74:2F:68 Azurewav # Azurewave Technologies, Inc.
74:31:70 Arcadyan # Arcadyan Technology Corporation
74:32:56 Nt-WareS # NT-ware Systemprg GmbH
+74:37:2F Tongfang # Tongfang Shenzhen Cloudcomputing Technology Co.,Ltd
74:38:89 AnnaxAnz # ANNAX Anzeigesysteme GmbH
74:44:01 Netgear
74:45:8A SamsungE # Samsung Electronics Co.,Ltd
@@ -18852,6 +18984,7 @@
74:E0:6E Ergophon # Ergophone GmbH
74:E1:B6 Apple # Apple, Inc.
74:E2:F5 Apple # Apple Inc
+74:E4:24 Apiste # APISTE CORPORATION
74:E5:0B IntelCor # Intel Corporate
74:E5:37 Radspin
74:E5:43 LiteonTe # Liteon Technology Corporation
@@ -18862,6 +18995,7 @@
74:F6:12 Motorola # Motorola Mobility, Inc.
74:F7:26 NeuronRo # Neuron Robotics
74:FD:A0 Compupal # Compupal (Group) Corporation
+74:FE:48 Advantec # ADVANTECH CO., LTD.
74:FF:7D WrenSoun # Wren Sound Systems, LLC
78:02:8F Adaptive # Adaptive Spectrum and Signal Alignment (ASSIA), Inc.
78:07:38 ZUKElzab # Z.U.K. Elzab S.A.
@@ -18879,6 +19013,7 @@
78:2B:CB Dell # Dell Inc
78:2E:EF Nokia # Nokia Corporation
78:30:E1 Ultracle # UltraClenz, LLC
+78:32:4F Millenni # Millennium Group, Inc.
78:3C:E3 Kai-Ee
78:3F:15 Easysync # EasySYNC Ltd.
78:44:05 FujituHo # FUJITU(HONG KONG) ELECTRONIC Co.,LTD.
@@ -18894,6 +19029,7 @@
78:5C:72 HiosoTec # Hioso Technology Co., Ltd.
78:61:7C MitsumiE # MITSUMI ELECTRIC CO.,LTD
78:66:AE ZtecInst # ZTEC Instruments, Inc.
+78:6C:1C Apple
78:7F:62 GikMbh # GiK mbH
78:81:8F ServerRa # Server Racks Australia Pty Ltd
78:84:3C Sony # Sony Corporation
@@ -18901,8 +19037,10 @@
78:89:73 Cmc
78:8C:54 EnkomTec # Enkom Technologies Ltd.
78:92:9C IntelCor # Intel Corporate
+78:98:FD Q9Networ # Q9 Networks Inc.
78:99:5C NationzT # Nationz Technologies Inc
78:99:8F Mediline # MEDILINE ITALIA SRL
+78:9E:D0 SamsungE # Samsung Electronics
78:9F:87 SiemensI # Siemens AG I IA PP PRM
78:A0:51 IinetLab # iiNet Labs Pty Ltd
78:A1:83 Advidia
@@ -18963,6 +19101,7 @@
7C:39:20 SsomaSec # SSOMA SECURITY
7C:3B:D5 ImagoGro # Imago Group
7C:3E:9D Patech
+7C:43:8F E-BandCo # E-Band Communications Corp.
7C:4A:82 Portsmit # Portsmith LLC
7C:4A:A8 Mindtree # MindTree Wireless PVT Ltd
7C:4B:78 RedSunSy # Red Sun Synthesis Pte Ltd
@@ -19054,11 +19193,13 @@
80:71:1F JuniperN # Juniper Networks
80:76:93 NewagSa # Newag SA
80:7A:7F AbbGenwa # ABB Genway Xiamen Electrical Equipment CO., LTD
+80:7B:1E CorsairC # Corsair Components
80:7D:1B Neosyste # Neosystem Co. Ltd.
80:7D:E3 Chongqin # Chongqing Sichuan Instrument Microcircuit Co.LTD.
80:81:A5 Tongqing # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
80:82:87 AtcomTec # ATCOM Technology Co.Ltd.
80:86:98 Netronic # Netronics Technologies Inc.
+80:8B:5C Shenzhen # Shenzhen Runhuicheng Technology Co., Ltd
80:91:2A LihRongE # Lih Rong electronic Enterprise Co., Ltd.
80:91:C0 Agilemes # AgileMesh, Inc.
80:92:9F Apple
@@ -19073,6 +19214,7 @@
80:B2:89 Forworld # Forworld Electronics Ltd.
80:B3:2A AlstomGr # Alstom Grid
80:B6:86 HuaweiTe # Huawei Technologies Co., Ltd
+80:B9:5C Elftech # ELFTECH Co., Ltd.
80:BA:AC Teleadap # TeleAdapt Ltd
80:C1:6E HewlettP # Hewlett Packard
80:C6:3F RemecBro # Remec Broadband Wireless , LLC
@@ -19088,6 +19230,7 @@
80:EE:73 Shuttle # Shuttle Inc.
80:F5:93 IrcoSist # IRCO Sistemas de TelecomunicaciÃÂón S.A.
80:F6:2E Hangzhou # Hangzhou H3C Technologies Co., Limited
+80:FA:5B Clevo # CLEVO CO.
80:FB:06 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
80:FF:A8 Unidis
84:00:D2 SonyEric # Sony Ericsson Mobile Communications AB
@@ -19111,11 +19254,14 @@
84:48:23 WoxterTe # WOXTER TECHNOLOGY Co. Ltd
84:49:15 VarmourN # vArmour Networks, Inc.
84:4B:F5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+84:51:81 SamsungE # Samsung Electronics Co.,Ltd
84:57:87 DvrC&C # DVR C&C Co., Ltd.
84:5D:D7 Shenzhen # Shenzhen Netcom Electronics Co.,Ltd
+84:62:A6 EurocbPh # EuroCB (Phils), Inc.
84:6A:ED Wireless # Wireless Tsukamoto.,co.LTD
84:6E:B1 ParkAssi # Park Assist LLC
84:74:2A Zte # zte corporation
+84:78:AC Cisco
84:7E:40 TexasIns # Texas Instruments
84:82:F4 BeijingH # Beijing Huasun Unicreate Technology Co., Ltd
84:85:06 Apple # Apple Inc
@@ -19123,6 +19269,7 @@
84:8F:69 Dell # Dell Inc.
84:90:00 Arnold&A # Arnold & Richter Cine Technik
84:97:B8 Memjet # Memjet Inc.
+84:9C:A6 Arcadyan # Arcadyan Technology Corporation
84:9D:C5 CenteraP # Centera Photonics Inc.
84:A6:C8 IntelCor # Intel Corporate
84:A8:E4 HuaweiDe # Huawei Device Co., Ltd
@@ -19130,6 +19277,7 @@
84:AF:1F BeatSyst # Beat System Service Co,. Ltd.
84:C7:27 Gnodal # Gnodal Ltd
84:C7:A9 C3poSA # C3PO S.A.
+84:C8:B1 Incognit # Incognito Software Inc.
84:C9:B2 D-LinkIn # D-Link International
84:D3:2A IeeeP190 # IEEE P1905.1
84:D9:C8 Unipatte # Unipattern Co.,
@@ -19138,9 +19286,11 @@
84:DF:0C Net2grid # NET2GRID BV
84:E7:14 LiangHer # Liang Herng Enterprise,Co.Ltd.
84:EA:99 Vieworks
+84:ED:33 Bbmc # BBMC Co.,Ltd
84:F6:4C CrossPoi # Cross Point BV
84:FC:FE Apple
88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted
+88:15:44 Meraki # Meraki, Inc.
88:18:AE Tamron # Tamron Co., Ltd
88:20:12 LmiTechn # LMI Technologies
88:21:E3 Nebusens # Nebusens, S.L.
@@ -19150,6 +19300,7 @@
88:41:C1 OrbisatD # ORBISAT DA AMAZONIA IND E AEROL SA
88:43:E1 Cisco # Cisco Systems
88:4B:39 SiemensH # Siemens AG, Healthcare Sector
+88:51:FB HewlettP # Hewlett Packard
88:53:2E IntelCor # Intel Corporate
88:53:95 Apple
88:53:D4 HuaweiTe # Huawei Technologies Co., Ltd
@@ -19159,6 +19310,7 @@
88:75:56 Cisco
88:86:A0 SimtonTe # Simton Technologies, Ltd.
88:87:17 Canon # CANON INC.
+88:87:DD Darbeevi # DarbeeVision Inc.
88:8B:5D StorageA # Storage Appliance Corporation
88:8C:19 BradyAsi # Brady Corp Asia Pacific Ltd
88:91:DD Racktivi # Racktivity
@@ -19168,6 +19320,7 @@
88:97:DF Entrypas # Entrypass Corporation Sdn. Bhd.
88:98:21 Teraon
88:9F:FA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+88:A3:CC AmatisCo # Amatis Controls
88:A5:BD Qpcom # QPCOM INC.
88:AC:C1 Generito # Generiton Co., Ltd.
88:AE:1D CompalIn # COMPAL INFORMATION(KUNSHAN)CO.,LTD
@@ -19188,10 +19341,12 @@
88:ED:1C CudoComm # Cudo Communication Co., Ltd.
88:F0:77 Cisco # Cisco Systems
88:F4:88 CellonCo # cellon communications technology(shenzhen)Co.,Ltd.
+88:F4:90 Jetmobil # Jetmobile Pte Ltd
88:FD:15 Lineeye # LINEEYE CO., LTD
8C:04:FF Technico # Technicolor USA Inc.
8C:0C:90 RuckusWi # Ruckus Wireless
8C:0C:A3 Amper
+8C:0E:E3 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
8C:11:CB AbusSecu # ABUS Security-Center GmbH & Co. KG
8C:1F:94 RfSurgic # RF Surgical System Inc.
8C:21:0A Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
@@ -19202,6 +19357,7 @@
8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC.
8C:44:35 Shanghai # Shanghai BroadMobi Communication Technology Co., Ltd.
8C:4A:EE GigaTms # GIGA TMS INC
+8C:4C:DC PlanexCo # PLANEX COMMUNICATIONS INC.
8C:4D:EA Cerio # Cerio Corporation
8C:51:05 Shenzhen # Shenzhen ireadygo Information Technology CO.,LTD.
8C:53:F7 A&DEngin # A&D ENGINEERING CO., LTD.
@@ -19318,6 +19474,7 @@
90:B8:D0 Joyent # Joyent, Inc.
90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota
90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB
+90:CC:24 Synaptic # Synaptics, Inc
90:CF:15 Nokia # Nokia Corporation
90:CF:6F Dlogixs # Dlogixs Co Ltd
90:CF:7D QingdaoH # Qingdao Hisense Electric Co.,Ltd.
@@ -19404,6 +19561,7 @@
98:03:D8 Apple # Apple, Inc.
98:0C:82 SamsungE # Samsung Electro Mechanics
98:0E:E4 Private
+98:20:8E Definium # Definium Technologies
98:26:2A AppliedR # Applied Research Associates, Inc
98:29:1D JaguarDe # Jaguar de Mexico, SA de CV
98:29:3F FujianSt # Fujian Start Computer Equipment Co.,Ltd
@@ -19417,6 +19575,7 @@
98:4A:47 ChgHospi # CHG Hospital Beds
98:4B:4A Motorola # Motorola Mobility Inc.
98:4B:E1 Hewlett- # Hewlett-Packard Company
+98:4C:D3 MantisDe # Mantis Deposition
98:4E:97 Starligh # Starlight Marketing (H. K.) Ltd.
98:52:B1 SamsungE # Samsung Electronics
98:57:D3 HonHai-C # HON HAI-CCPBG PRECISION IND.CO.,LTD.
@@ -19498,6 +19657,7 @@
9C:8E:DC Teracom # Teracom Limited
9C:93:4E Xerox # Xerox Corporation
9C:95:F8 Smartdoo # SmartDoor Systems, LLC
+9C:9C:1D StarkeyL # Starkey Labs Inc.
9C:A1:34 Nike # Nike, Inc.
9C:A3:BA SakuraIn # SAKURA Internet Inc.
9C:AD:EF ObihaiTe # Obihai Technology, Inc.
@@ -19512,13 +19672,16 @@
9C:CA:D9 Nokia # Nokia Corporation
9C:CD:82 ChengUei # CHENG UEI PRECISION INDUSTRY CO.,LTD
9C:D2:4B Zte # zte corporation
+9C:D3:6D Netgear # NETGEAR INC.,
9C:DF:03 Harman/B # Harman/Becker Automotive Systems GmbH
9C:E1:0E Nctech # NCTech Ltd
+9C:E1:D6 JungerAu # Junger Audio-Studiotechnik GmbH
9C:EB:E8 BizlinkK # BizLink (Kunshan) Co.,Ltd
9C:F6:1A UtcFireA # UTC Fire and Security
9C:F6:7D RicardoP # Ricardo Prague, s.r.o.
9C:F9:38 ArevaNp # AREVA NP GmbH
9C:FF:BE Otsl # OTSL Inc.
+A0:03:63 RobertBo # Robert Bosch Healthcare GmbH
A0:07:98 SamsungE # Samsung Electronics
A0:07:B6 Advanced # Advanced Technical Support, Inc.
A0:0A:BF WiesonTe # Wieson Technologies Co., Ltd.
@@ -19527,6 +19690,7 @@
A0:13:3B Copyrigh # Copyright ÃÂé HiTi Digital, Inc.
A0:16:5C Tangotec # TangoTec Ltd.
A0:18:59 Shenzhen # Shenzhen Yidashi Electronics Co Ltd
+A0:19:17 BertelSP # Bertel S.p.a.
A0:21:95 SamsungE # Samsung Electronics Digital Imaging
A0:21:B7 Netgear
A0:23:1B Telecomp # TeleComp R&D Corp.
@@ -19574,13 +19738,16 @@
A0:B5:DA Hongkong # HongKong THTF Co., Ltd
A0:B6:62 Acutvist # Acutvista Innovation Co., Ltd.
A0:B9:ED Skytap
+A0:BA:B8 PixonIma # Pixon Imaging
A0:BF:A5 Coresys
A0:C3:DE TritonEl # Triton Electronic Systems Ltd.
A0:CF:5B Cisco # Cisco Systems
A0:DC:04 Becker-A # Becker-Antriebe GmbH
+A0:DD:97 Polarlin # PolarLink Technologies, Ltd
A0:DD:E5 Sharp # SHARP CORPORATION
A0:DE:05 Jsc"Irbi # JSC "Irbis-T"
A0:E2:01 AvtraceC # AVTrace Ltd.(China)
+A0:E2:5A AmicusSk # Amicus SK, s.r.o.
A0:E2:95 DatSyste # DAT System Co.,Ltd
A0:E5:34 StratecB # Stratec Biomedical AG
A0:E9:DB NingboFr # Ningbo FreeWings Technologies Co.,Ltd
@@ -19689,6 +19856,7 @@
A8:8C:EE Micromad # MicroMade Galka i Drozdz sp.j.
A8:92:2C LgElectr # LG Electronics
A8:93:E6 JiangxiJ # JIANGXI JINGGANGSHAN CKING COMMUNICATION TECHNOLOGY CO.,LTD
+A8:96:8A Apple
A8:98:C6 Shinbo # Shinbo Co., Ltd.
A8:99:5C Aizo # aizo ag
A8:9B:10 Inmotion # inMotion Ltd.
@@ -19723,6 +19891,7 @@
AC:14:61 Ataw # ATAW Co., Ltd.
AC:14:D2 Wi-Daq # wi-daq, inc.
AC:16:2D HewlettP # Hewlett Packard
+AC:17:02 FibarGro # Fibar Group sp. z o.o.
AC:19:9F SungrowP # SUNGROW POWER SUPPLY CO.,LTD.
AC:20:AA Dmatek # DMATEK Co., Ltd.
AC:2F:A8 Humannix # Humannix Co.,Ltd.
@@ -19742,6 +19911,7 @@
AC:51:EE Cambridg # Cambridge Communication Systems Ltd
AC:54:EC IeeeP182 # IEEE P1823 Standards Working Group
AC:58:3B HumanAss # Human Assembler, Inc.
+AC:5D:10 PaceAmer # Pace Americas
AC:5E:8C Utillink
AC:61:23 Drivven # Drivven, Inc.
AC:67:06 RuckusWi # Ruckus Wireless
@@ -19838,10 +20008,12 @@
B0:BD:6D Echostre # Echostreams Innovative Solutions
B0:BD:A1 ZakladEl # ZAKLAD ELEKTRONICZNY SIMS
B0:BF:99 Wizitdon # WIZITDONGDO
+B0:C4:E7 SamsungE # Samsung Electronics
B0:C6:9A JuniperN # Juniper Networks
B0:C7:45 Buffalo # Buffalo Inc.
B0:C8:3F JiangsuC # Jiangsu Cynray IOT Co., Ltd.
B0:C8:AD PeoplePo # People Power Company
+B0:C9:5B BeijingS # Beijing Symtech CO.,LTD
B0:CF:4D Mi-ZoneT # MI-Zone Technology Ireland
B0:D0:9C SamsungE # Samsung Electronics Co.,Ltd
B0:D2:F5 Vello # Vello Systems, Inc.
@@ -19892,6 +20064,7 @@
B4:82:FE AskeyCom # Askey Computer Corp
B4:89:10 CosterTE # Coster T.E. S.P.A.
B4:94:4E Weteleco # WeTelecom Co., Ltd.
+B4:98:42 Zte # zte corporation
B4:99:BA Hewlett- # Hewlett-Packard Company
B4:9D:B4 AxionTec # Axion Technologies Inc.
B4:9E:E6 Shenzhen # SHENZHEN TECHNOLOGY CO LTD
@@ -19899,6 +20072,7 @@
B4:A4:E3 Cisco # Cisco Systems
B4:A5:A9 Modi # MODI GmbH
B4:AA:4D Ensequen # Ensequence, Inc.
+B4:AB:2C MtmTechn # MtM Technology Corporation
B4:B0:17 Avaya # Avaya, Inc
B4:B3:62 Zte # ZTE Corporation
B4:B5:2F HewlettP # Hewlett Packard
@@ -19915,6 +20089,7 @@
B4:DF:FA LitemaxE # Litemax Electronics Inc.
B4:E0:CD IoTurbin # IO Turbine, Inc.
B4:E1:EB Private
+B4:E9:B0 Cisco
B4:ED:19 PieDigit # Pie Digital, Inc.
B4:ED:54 WohlerTe # Wohler Technologies
B4:EE:D4 TexasIns # Texas Instruments
@@ -19942,6 +20117,7 @@
B8:41:5F Asp # ASP AG
B8:55:10 ZioncomE # Zioncom Electronics (Shenzhen) Ltd.
B8:58:10 Numera # NUMERA, INC.
+B8:5A:F7 Ouya # Ouya, Inc
B8:5A:FE HandaerC # Handaer Communication Technology (Beijing) Co., Ltd
B8:61:6F AcctonWi # Accton Wireless Broadband(AWB), Corp.
B8:62:1F Cisco # Cisco Systems
@@ -19982,6 +20158,7 @@
B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd
B8:C7:16 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
B8:C7:5D Apple # Apple, Inc.
+B8:CA:3A DellPcba # Dell PCBA Test
B8:CD:A7 MaxelerT # Maxeler Technologies Ltd.
B8:D0:6F Guangzho # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
B8:D4:9D MSevenSy # M Seven System Ltd.
@@ -20017,11 +20194,14 @@
BC:30:5B Dell # Dell Inc.
BC:35:E5 Hydro # Hydro Systems Company
BC:38:D2 Pandachi # Pandachip Limited
+BC:39:A6 CsunSyst # CSUN System Technology Co.,LTD
+BC:3B:AF Apple
BC:3E:13 Accordan # Accordance Systems Inc.
BC:43:77 HangZhou # Hang Zhou Huite Technology Co.,ltd.
BC:47:60 SamsungE # Samsung Electronics Co.,Ltd
BC:4B:79 Sensingt # SensingTek
BC:4E:3C CoreStaf # CORE STAFF CO., LTD.
+BC:51:FE SwannCom # Swann Communications Pty Ltd
BC:52:B7 Apple # Apple Inc
BC:5F:F4 AsrockIn # ASRock Incorporation
BC:67:78 Apple # Apple Inc
@@ -20083,8 +20263,10 @@
C0:3F:0E Netgear
C0:3F:2A Biscotti # Biscotti, Inc.
C0:41:F6 LgElectr # LG Electronics Inc
+C0:44:E3 Shenzhen # Shenzhen Sinkna Electronics Co., LTD
C0:49:3D Maitrise # MAITRISE TECHNOLOGIQUE
C0:58:A7 Pico # Pico Systems Co., Ltd.
+C0:5E:6F VStonkau # V. Stonkaus firma "Kodinis Raktas"
C0:5E:79 Shenzhen # SHENZHEN HUAXUN ARK TECHNOLOGIES CO.,LTD
C0:62:6B Cisco # Cisco Systems
C0:6C:0F DobbsSta # Dobbs Stanford
@@ -20098,12 +20280,14 @@
C0:91:34 Procurve # ProCurve Networking by HP
C0:9C:92 Coby
C0:9F:42 Apple # Apple Inc
+C0:A0:C7 Fairfiel # FAIRFIELD INDUSTRIES
C0:A0:DE MultiTou # Multi Touch Oy
C0:A0:E2 EdenInno # Eden Innovations
C0:A2:6D AbbottPo # Abbott Point of Care
C0:A3:64 3dBurlin # 3D Systems Burlington
C0:AA:68 OsasiTec # OSASI Technos Inc.
C0:AC:54 Sagemcom
+C0:B3:39 Comigo # Comigo Ltd.
C0:B3:57 YoshikiE # Yoshiki Electronics Industry Ltd.
C0:BA:E6 Applicat # Application Solutions (Safety and Security) Ltd
C0:BD:42 ZpaSmart # ZPA Smart Energy a.s.
@@ -20176,6 +20360,7 @@
C4:DA:26 NoblexSa # NOBLEX SA
C4:E1:7C U2s # U2S co.
C4:E7:BE Scspro # SCSpro Co.,Ltd
+C4:ED:BA TexasIns # Texas Instruments
C4:EE:AE VssMonit # VSS Monitoring
C4:EE:F5 Oclaro # Oclaro, Inc.
C4:F4:64 SpicaInt # Spica international
@@ -20248,6 +20433,7 @@
C8:D1:5E HuaweiTe # Huawei Technologies Co., Ltd
C8:D1:D1 AgaitTec # AGAiT Technology Corporation
C8:D2:C1 JetlunSh # Jetlun (Shenzhen) Corporation
+C8:D3:A3 D-LinkIn # D-Link International
C8:D5:FE Shenzhen # Shenzhen Zowee Technology Co., Ltd
C8:D7:19 CiscoCon # Cisco Consumer Products, LLC
C8:DE:51 IntegraN # Integra Networks, Inc.
@@ -20273,11 +20459,13 @@
CC:22:18 Innodigi # InnoDigital Co., Ltd.
CC:26:2D VerifiLl # Verifi, LLC
CC:34:D7 GewissSP # GEWISS S.P.A.
+CC:3A:61 SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD.
CC:43:E3 TrumpSA # Trump s.a.
CC:4B:FB Hellberg # Hellberg Safety AB
CC:50:1C KvhIndus # KVH Industries, Inc.
CC:50:76 OcomComm # Ocom Communications, Inc.
CC:52:AF Universa # Universal Global Scientific Industrial Co., Ltd.
+CC:53:B5 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
CC:54:59 OntimeNe # OnTime Networks AS
CC:55:AD Rim
CC:59:3E Toumaz # TOUMAZ LTD
@@ -20316,6 +20504,7 @@
CC:CC:81 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
CC:CD:64 Sm-Elect # SM-Electronic GmbH
CC:CE:40 Janteq # Janteq Corp
+CC:D5:39 Cisco
CC:D8:11 AiconnTe # Aiconn Technology Corporation
CC:D9:E9 ScrEngin # SCR Engineers Ltd.
CC:E7:98 MySocial # My Social Stuff
@@ -20342,8 +20531,10 @@
D0:27:88 HonHaiPr # Hon Hai Precision Ind.Co.Ltd
D0:31:10 IngenicS # Ingenic Semiconductor Co.,Ltd
D0:37:61 TexasIns # Texas Instruments
+D0:46:DC Southwes # Southwest Research Institute
D0:4C:C1 Sintrone # SINTRONES Technology Corp.
D0:51:62 SonyMobi # Sony Mobile Communications AB
+D0:52:A8 Physical # Physical Graph Corporation
D0:54:2D Cambridg # Cambridge Industries(Group) Co.,Ltd.
D0:57:4C Cisco # Cisco Systems
D0:57:85 Pantech # Pantech Co., Ltd.
@@ -20351,6 +20542,7 @@
D0:59:C3 Ceramicr # CeraMicro Technology Corporation
D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD
D0:5F:CE HitachiD # Hitachi Data Systems
+D0:63:B4 Solidrun # SolidRun Ltd.
D0:66:7B SamsungE # Samsung Electronics Co., LTD
D0:67:E5 Dell # Dell Inc
D0:69:9E LuminexL # LUMINEX Lighting Control Equipment
@@ -20359,6 +20551,7 @@
D0:7D:E5 ForwardP # Forward Pay Systems, Inc.
D0:7E:28 HewlettP # Hewlett Packard
D0:89:99 Apcon # APCON, Inc.
+D0:8B:7E PassifSe # Passif Semiconductor
D0:8C:B5 TexasIns # Texas Instruments
D0:8C:FF Upwis # UPWIS AB
D0:93:F8 Stonestr # Stonestreet One LLC
@@ -20367,6 +20560,7 @@
D0:AE:EC AlphaNet # Alpha Networks Inc.
D0:AF:B6 LinktopT # Linktop Technology Co., LTD
D0:B3:3F Shenzhen # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD.
+D0:B4:98 RobertBo # Robert Bosch LLC Automotive Electronics
D0:B5:3D SeproRob # SEPRO ROBOTIQUE
D0:BB:80 ShlTelem # SHL Telemedicine International Ltd.
D0:C1:B1 SamsungE # Samsung Electronics Co.,Ltd
@@ -20376,17 +20570,22 @@
D0:D2:12 K2net # K2NET Co.,Ltd.
D0:D2:86 BeckmanC # Beckman Coulter Biomedical K.K.
D0:D3:FC Mios # Mios, Ltd.
+D0:D6:CC Wintop
D0:DB:32 Nokia # Nokia Corporation
D0:DF:9A LiteonTe # Liteon Technology Corporation
+D0:DF:B2 GenieNet # Genie Networks Limited
D0:DF:C7 SamsungE # Samsung Electronics Co.,Ltd
D0:E3:47 Yoga
D0:E4:0B Wearable # Wearable Inc.
D0:E5:4D Pace # Pace plc
+D0:E7:82 Azurewav # Azurewave Technologies, Inc.
D0:EB:9E Seowoo # Seowoo Inc.
D0:F0:DB Ericsson
D0:F7:3B HelmutMa # Helmut Mauell GmbH
D4:00:0D PhoenixB # Phoenix Broadband Technologies, LLC.
+D4:00:57 McTechno # MC Technologies GmbH
D4:02:4A Delphian # Delphian Systems LLC
+D4:0F:B2 AppliedM # Applied Micro Electronics AME bv
D4:10:CF Huanshun # Huanshun Network Science and Technology Co., Ltd.
D4:11:D6 Shotspot # ShotSpotter, Inc.
D4:12:96 AnobitTe # Anobit Technologies Ltd.
@@ -20453,6 +20652,7 @@
D4:E3:2C SSiedleS # S. Siedle & Sohne
D4:E3:3F Alcatel- # Alcatel-Lucent
D4:E8:B2 SamsungE # Samsung Electronics
+D4:EA:0E Avaya # Avaya, Inc
D4:EC:0C Harley-D # Harley-Davidson Motor Company
D4:F0:27 NavetasE # Navetas Energy Management
D4:F0:B4 NapcoSec # Napco Security Technologies
@@ -20462,9 +20662,11 @@
D8:05:2E Skyviia # Skyviia Corporation
D8:06:D1 Honeywel # Honeywell Fire System (Shanghai) Co,. Ltd.
D8:08:F5 ArcadiaN # Arcadia Networks Co. Ltd.
+D8:09:C3 Cercacor # Cercacor Labs
D8:0D:E3 FxiTechn # FXI TECHNOLOGIES AS
D8:16:0A NipponEl # Nippon Electro-Sensory Devices
D8:18:2B ContiTem # Conti Temic Microelectronic GmbH
+D8:19:CE Telesqua # Telesquare
D8:1B:FE Twinlinx # TWINLINX CORPORATION
D8:1C:14 Compacta # Compacta International, Ltd.
D8:24:BD Cisco # Cisco Systems
@@ -20474,6 +20676,7 @@
D8:2A:7E Nokia # Nokia Corporation
D8:2D:E1 Tricasca # Tricascade Inc.
D8:30:62 Apple # Apple, Inc
+D8:31:CF SamsungE # Samsung Electronics Co.,Ltd
D8:33:7F OfficeFa # Office FA.com Co.,Ltd.
D8:42:AC Freecomm # FreeComm Data Communication Co.,Ltd.
D8:46:06 SiliconV # Silicon Valley Global Marketing
@@ -20561,9 +20764,11 @@
DC:A7:D9 Compress # Compressor Controls Corp
DC:A8:CF NewSpinG # New Spin Golf, LLC.
DC:A9:71 IntelCor # Intel Corporate
+DC:A9:89 Macandc
DC:B0:58 BurkertW # Burkert Werke GmbH
DC:B4:C4 Microsof # Microsoft XCG
DC:BF:90 HuizhouQ # HUIZHOU QIAOXING TELECOMMUNICATION INDUSTRY CO.,LTD.
+DC:C0:DB Shenzhen # Shenzhen Kaiboer Technology Co., Ltd.
DC:C1:01 SolidTec # SOLiD Technologies, Inc.
DC:CB:A8 ExploraT # Explora Technologies Inc
DC:CE:41 FeGlobal # FE GLOBAL HONG KONG LIMITED
@@ -20600,6 +20805,7 @@
E0:3C:5B Shenzhen # SHENZHEN JIAXINJIE ELECTRON CO.,LTD
E0:3E:7D Data-Com # data-complex GmbH
E0:46:9A Netgear
+E0:55:97 Emergent # Emergent Vision Technologies Inc.
E0:58:9E LaerdalM # Laerdal Medical
E0:5B:70 Innovid # Innovid, Co., Ltd.
E0:5D:A6 DetlefFi # Detlef Fink Elektronik & Softwareentwicklung
@@ -20626,6 +20832,7 @@
E0:B9:BA Apple # Apple, Inc.
E0:BC:43 C2Micros # C2 Microsystems, Inc.
E0:C2:86 AisaiCom # Aisai Communication Technology Co., Ltd.
+E0:C2:B7 Masimo # Masimo Corporation
E0:C7:9D TexasIns # Texas Instruments
E0:C9:22 JirehEne # Jireh Energy Tech., Ltd.
E0:C9:7A Apple # Apple Inc
@@ -20633,9 +20840,11 @@
E0:CA:94 AskeyCom # Askey Computer
E0:CB:1D Private
E0:CB:4E AsustekC # ASUSTek COMPUTER INC.
+E0:CE:C3 AskeyCom # ASKEY COMPUTER CORP
E0:CF:2D Gemintek # Gemintek Corporation
E0:D1:0A Katouden # Katoudenkikougyousyo co ltd
E0:D7:BA TexasIns # Texas Instruments
+E0:D9:A2 HippihAp # Hippih aps
E0:DA:DC JvcKenwo # JVC KENWOOD Corporation
E0:DB:55 Dell # Dell Inc
E0:E7:51 Nintendo # Nintendo Co., Ltd.
@@ -20682,6 +20891,7 @@
E4:8A:D5 RfWindow # RF WINDOW CO., LTD.
E4:8B:7F Apple
E4:90:69 Rockwell # Rockwell Automation
+E4:96:AE Altograp # ALTOGRAPHICS Inc.
E4:97:F0 Shanghai # Shanghai VLC Technologies Ltd. Co.
E4:A5:EF TronLink # TRON LINK ELECTRONICS CO., LTD.
E4:A7:FD CellcoPa # Cellco Partnership
@@ -20689,6 +20899,7 @@
E4:AD:7D SclEleme # SCL Elements
E4:AF:A1 Hes-So
E4:B0:21 SamsungE # Samsung Electronics Co.,Ltd
+E4:C1:46 Objetivo # Objetivos y Servicios de Valor A
E4:C6:E6 MophieLl # Mophie, LLC
E4:C8:06 CeiecEle # Ceiec Electric Technology Inc.
E4:CE:8F Apple # Apple, Inc.
@@ -20697,7 +20908,10 @@
E4:D7:1D OrayaThe # Oraya Therapeutics
E4:DD:79 En-Visio # En-Vision America, Inc.
E4:E0:C5 SamsungE # Samsung Electronics Co., LTD
+E4:E4:09 Leifheit # LEIFHEIT AG
E4:EC:10 Nokia # Nokia Corporation
+E4:EE:FD Mr&DManu # MR&D Manufacturing
+E4:F3:65 Time-O-M # Time-O-Matic, Inc.
E4:FA:1D PadPerip # PAD Peripheral Advanced Design Inc.
E4:FF:DD Electron # ELECTRON INDIA
E8:03:9A SamsungE # Samsung Electronics Co.,LTD
@@ -20714,6 +20928,7 @@
E8:13:24 Guangzho # GuangZhou Bonsoninfo System CO.,LTD
E8:28:77 Tmy # TMY Co., Ltd.
E8:28:D5 CotsTech # Cots Technology
+E8:2E:24 OutOfFog # Out of the Fog Research LLC
E8:39:35 HewlettP # Hewlett Packard
E8:39:DF AskeyCom # Askey Computer
E8:3A:97 OczTechn # OCZ Technology Group
@@ -20727,6 +20942,7 @@
E8:4E:CE Nintendo # Nintendo Co., Ltd.
E8:54:84 NeoInfor # NEO INFORMATION SYSTEMS CO., LTD.
E8:56:D6 Nctech # NCTech Ltd
+E8:5A:A7 LlcEmzio # LLC Emzior
E8:5B:5B LgElectr # LG ELECTRONICS INC
E8:5B:F0 ImagingD # Imaging Diagnostics
E8:5E:53 Infratec # Infratec Datentechnik GmbH
@@ -20739,13 +20955,16 @@
E8:78:A1 BeoviewI # BEOVIEW INTERCOM DOO
E8:7A:F3 S5TechSR # S5 Tech S.r.l.
E8:89:2C ArrisGro # ARRIS Group, Inc
+E8:8D:28 Apple
E8:8D:F5 ZnyxNetw # ZNYX Networks, Inc.
E8:92:A4 LgElectr # LG Electronics
E8:94:4C CogentHe # Cogent Healthcare Systems Ltd
E8:99:5A PiigabPr # PiiGAB, Processinformation i Goteborg AB
E8:99:C4 Htc # HTC Corporation
E8:9A:8F QuantaCo # Quanta Computer Inc.
+E8:9A:FF FujianLa # Fujian Landi Commercial Equipment Co.,Ltd
E8:9D:87 Toshiba
+E8:A3:64 SignalPa # Signal Path International / Peachtree Audio
E8:A4:C1 DeepSeaE # Deep Sea Electronics PLC
E8:AB:FA Shenzhen # Shenzhen Reecam Tech.Ltd.
E8:B4:AE Shenzhen # Shenzhen C&D Electronics Co.,Ltd
@@ -20782,6 +21001,7 @@
EC:3F:05 Institut # Institute 706, The Second Academy China Aerospace Science & Industry Corp
EC:42:F0 AdlEmbed # ADL Embedded Solutions, Inc.
EC:43:E6 Awcer # AWCER Ltd.
+EC:43:F6 ZyxelCom # ZyXEL Communications Corporation
EC:44:76 Cisco # Cisco Systems
EC:46:44 TtkSas # TTK SAS
EC:46:70 Meinberg # Meinberg Funkuhren GmbH & Co. KG
@@ -20800,6 +21020,7 @@
EC:83:6C RmTech # RM Tech Co., Ltd.
EC:85:2F Apple # Apple, Inc.
EC:88:8F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
+EC:89:F5 LenovoMo # Lenovo Mobile Communication Technology Ltd.
EC:8E:AD Dlx
EC:92:33 EddyfiNd # Eddyfi NDT Inc
EC:93:27 Memmert+ # MEMMERT GmbH + Co. KG
@@ -20812,6 +21033,7 @@
EC:A2:9B KemppiOy # Kemppi Oy
EC:A8:6B Elitegro # ELITEGROUP COMPUTER SYSTEMS CO., LTD.
EC:B1:06 AcuroNet # Acuro Networks, Inc
+EC:B5:41 ShinanoE # SHINANO E and E Co.Ltd.
EC:BB:AE Digivoic # Digivoice Tecnologia em Eletronica Ltda
EC:BD:09 FusionEl # FUSION Electronics Ltd
EC:C3:8A Accuener # Accuenergy (CANADA) Inc
@@ -20841,6 +21063,7 @@
F0:08:F1 SamsungE # Samsung Electronics Co.,Ltd
F0:13:C3 Shenzhen # SHENZHEN FENDA TECHNOLOGY CO., LTD
F0:1C:13 LgElectr # LG Electronics
+F0:21:9D Cal-Comp # Cal-Comp Electronics & Communications Company Ltd.
F0:24:08 TalarisS # Talaris (Sweden) AB
F0:25:72 Cisco # Cisco Systems
F0:26:4C DrSigris # Dr. Sigrist AG
@@ -20860,6 +21083,7 @@
F0:62:81 Procurve # ProCurve Networking by HP
F0:65:DD PrimaxEl # Primax Electronics Ltd.
F0:68:53 Integrat # Integrated Corporation
+F0:73:AE Peak-Sys # PEAK-System Technik
F0:77:D0 Xcellen
F0:7B:CB HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
F0:7D:68 D-Link # D-Link Corporation
@@ -20884,6 +21108,7 @@
F0:C8:8C Leddarte # LeddarTech Inc.
F0:CB:A1 Apple # Apple, Inc.
F0:D1:4F LinearLl # LINEAR LLC
+F0:D1:A9 Apple
F0:D3:E7 Sensomet # Sensometrix SA
F0:D7:67 AxemaPas # Axema Passagekontroll AB
F0:DA:7C RlhIndus # RLH INDUSTRIES,INC.
@@ -20898,6 +21123,8 @@
F0:ED:1E BilkonBi # Bilkon Bilgisayar Kontrollu Cih. Im.Ltd.
F0:EE:BB Vipar # VIPAR GmbH
F0:F0:02 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+F0:F6:44 Whitesky # Whitesky Science & Technology Co.,Ltd.
+F0:F6:69 MotionAn # Motion Analysis Corporation
F0:F7:55 Cisco # Cisco Systems
F0:F7:B3 Phorm
F0:F8:42 Keebox # KEEBOX, Inc.
@@ -20907,6 +21134,7 @@
F4:04:4C Valencet # ValenceTech Limited
F4:0B:93 Research # Research In Motion
F4:0F:9B Wavelink
+F4:1B:A1 Apple
F4:1E:26 Simon-Ka # Simon-Kaloi Engineering
F4:1F:0B Yamabish # YAMABISHI Corporation
F4:36:E1 AbilisSa # Abilis Systems SARL
@@ -20961,6 +21189,8 @@
F4:FC:32 TexasIns # Texas Instruments
F8:03:32 Khomp
F8:05:1C DrsImagi # DRS Imaging and Targeting Solutions
+F8:0B:BE Motorola # Motorola Mobility, Inc.
+F8:0B:D0 DatangTe # Datang Telecom communication terminal (Tianjin) Co., Ltd.
F8:0C:F3 LgElectr # LG Electronics
F8:0F:41 WistronI # Wistron InfoComm(ZhongShan) Corporation
F8:0F:84 NaturalS # Natural Security SAS
@@ -20977,6 +21207,7 @@
F8:3D:FF HuaweiTe # Huawei Technologies Co., Ltd
F8:46:2D SyntecIn # SYNTEC Incorporation
F8:47:2D X2genDig # X2gen Digital Corp. Ltd
+F8:48:97 Hitachi # Hitachi, Ltd.
F8:50:63 Verathon
F8:52:DF VnlEurop # VNL Europe AB
F8:5F:2A Nokia # Nokia Corporation
@@ -20985,6 +21216,7 @@
F8:6E:CF Arcx # Arcx Inc
F8:71:FE GoldmanS # The Goldman Sachs Group, Inc.
F8:76:9B Neopis # Neopis Co., Ltd.
+F8:7B:62 FastwelI # FASTWEL INTERNATIONAL CO., LTD. Taiwan Branch
F8:7B:7A Motorola # Motorola Mobility, Inc.
F8:7B:8C AmpedWir # Amped Wireless
F8:81:1A Overkiz
@@ -21011,6 +21243,7 @@
F8:D3:A9 AxanNetw # AXAN Networks
F8:D4:62 Pumatron # Pumatronix Equipamentos Eletronicos Ltda.
F8:D7:56 SimmTron # Simm Tronic Limited
+F8:D7:BF RevRitte # REV Ritter GmbH
F8:DA:E2 BetaLase # Beta LaserMike
F8:DA:F4 TaishanO # Taishan Online Technology Co., Ltd.
F8:DB:4C PnyTechn # PNY Technologies, INC.
@@ -21022,6 +21255,7 @@
F8:EA:0A Dipl-Mat # Dipl.-Math. Michael Rauch
F8:ED:A5 ArrisGro # ARRIS Group, Inc.
F8:F0:14 Rackware # RackWare Inc.
+F8:F0:82 NagLlc # NAG LLC
F8:F2:5A G-Lab # G-Lab GmbH
F8:F7:D3 Internat # International Communications Corporation
F8:F7:FF Syn-Tech # SYN-TECH SYSTEMS INC
@@ -21029,12 +21263,14 @@
F8:FE:5C Reciproc # Reciprocal Labs Corp
FC:00:12 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corporation
FC:01:CD Fundacio # FUNDACION TEKNIKER
+FC:06:47 Cortland # Cortland Research, LLC
FC:08:77 PrentkeR # Prentke Romich Company
FC:0A:81 Motorola # Motorola Solutions Inc.
FC:0F:E6 SonyComp # Sony Computer Entertainment Inc.
FC:10:BD ControlS # Control Sistematizado S.A.
FC:17:94 Intercre # InterCreative Co., Ltd
FC:1D:59 ISmartCi # I Smart Cities HK Ltd
+FC:1F:19 SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD.
FC:1F:C0 Eurecam
FC:25:3F Apple # Apple, Inc.
FC:2A:54 Connecte # connected data
@@ -21050,6 +21286,7 @@
FC:5B:24 WeibelSc # Weibel Scientific A/S
FC:5B:26 Mikrobit # MikroBits
FC:61:98 NecPerso # NEC Personal Products, Ltd
+FC:62:6E BeijingM # Beijing MDC Telecom
FC:68:3E Directed # Directed Perception, Inc
FC:6C:31 Lxinstru # LXinstruments GmbH
FC:75:16 D-LinkIn # D-Link International
@@ -21062,6 +21299,7 @@
FC:94:6C Ubivelox
FC:94:E3 Technico # Technicolor USA Inc.
FC:99:47 Cisco
+FC:9F:AE Fidus # Fidus Systems Inc
FC:A1:3E SamsungE # Samsung Electronics
FC:A8:41 Avaya # Avaya, Inc
FC:A9:B0 Miartech # MIARTECH (SHANGHAI),INC.
@@ -21088,7 +21326,7 @@
#
# Well-known addresses.
#
-# $Id: manuf 45222 2012-09-30 15:04:11Z gerald $
+# $Id: manuf 46180 2012-11-25 16:04:34Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/packaging/macosx/Info.plist
^
|
| @@ -8,7 +8,7 @@
<key>CFBundleExecutable</key>
<string>Wireshark</string>
<key>CFBundleGetInfoString</key>
- <string>1.6.11, Copyright 1998-2012 Wireshark Development Team</string>
+ <string>1.6.12, Copyright 1998-2012 Wireshark Development Team</string>
<key>CFBundleIconFile</key>
<string>Wireshark.icns</string>
<key>CFBundleIdentifier</key>
@@ -55,11 +55,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.11</string>
+ <string>1.6.12</string>
<key>CFBundleSignature</key>
<string>Wshk</string>
<key>CFBundleVersion</key>
- <string>1.6.11</string>
+ <string>1.6.12</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/print.ps
^
|
| @@ -4,6 +4,7 @@
% Anything else is thrown away, and is for testing only.
%
% ---- wireshark preamble start ---- %
+%!
%!PS-Adobe-2.0
%
% Wireshark - Network traffic analyzer
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/ps.c
^
|
| @@ -29,6 +29,7 @@
#include "ps.h"
void print_ps_preamble(FILE *fd) {
+ fprintf(fd, "%%!\n");
fprintf(fd, "%%!PS-Adobe-2.0\n");
fprintf(fd, "%%\n");
fprintf(fd, "%% Wireshark - Network traffic analyzer\n");
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/services
^
|
| @@ -1,6 +1,6 @@
# This is a local copy of the IANA port-numbers file.
#
-# $Id: services 45222 2012-09-30 15:04:11Z gerald $
+# $Id: services 46180 2012-11-25 16:04:34Z gerald $
#
# Wireshark uses it to resolve port numbers into human readable
# service names, e.g. TCP port 80 -> http.
@@ -14,7 +14,7 @@
# Service Name and Transport Protocol Port Number Registry
#
# Last Updated
-# 2012-09-26
+# 2012-11-20
#
# Experts
#
@@ -2127,7 +2127,7 @@
blackjack 1025/udp # network blackjack
cap 1026/tcp # Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09
cap 1026/udp # Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09
-6a44 1027/udp # IPv6 Behind NAT44 CPEs [IESG] [IETF_Chair] 2012-08-02 [RFC-despres-6a44-02]
+6a44 1027/udp # IPv6 Behind NAT44 CPEs [IESG] [IETF_Chair] 2012-08-02 [RFC6751]
# 1027 tcp Reserved
# 1028 Deprecated 2004-02
solid-mux 1029/tcp # Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11
@@ -8266,12 +8266,10 @@
m2pa 3565/sctp # M2PA [RFC4165]
quest-data-hub 3566/tcp # Quest Data Hub [Greg_Cottman_2] [Greg_Cottman_2] 2010-10-18
# 3566 udp Reserved 2010-10-18
-oap 3567/tcp # Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2002-08
-oap 3567/udp # Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2002-08
-oap-s 3568/tcp # Object Access Protocol over [Bryant_Eastham] [Bryant_Eastham] 2003-01
-# SSL
-oap-s 3568/udp # Object Access Protocol over [Bryant_Eastham] [Bryant_Eastham] 2003-01
-# SSL
+enc-eps 3567/tcp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2002-08 2012-11-12
+enc-eps 3567/udp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2002-08 2012-11-12
+enc-tunnel-sec 3568/tcp # EMIT secure tunnel [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2003-01 2012-11-12
+enc-tunnel-sec 3568/udp # EMIT secure tunnel [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2003-01 2012-11-12
mbg-ctrl 3569/tcp # Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08
mbg-ctrl 3569/udp # Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08
mccwebsvr-port 3570/tcp # MCC Web Server Port
@@ -9594,10 +9592,8 @@
# Communication
fprams 4122/tcp # Fiber Patrol Alarm Service [Zhizhong_Zhuang] [Zhizhong_Zhuang] 2006-12
fprams 4122/udp # Fiber Patrol Alarm Service [Zhizhong_Zhuang] [Zhizhong_Zhuang] 2006-12
-z-wave 4123/tcp # Zensys Z-Wave Control [Anders_Brandt] [Anders_Brandt] 2007-02
-# Protocol
-z-wave 4123/udp # Zensys Z-Wave Control [Anders_Brandt] [Anders_Brandt] 2007-02
-# Protocol
+z-wave 4123/tcp # Z-Wave Protocol [Sigma_Designs_Inc_2] [Anders_Brandt][Mary_Miller] 2007-02 2012-11-08
+z-wave 4123/udp # Z-Wave Protocol [Sigma_Designs_Inc_2] [Anders_Brandt][Mary_Miller] 2007-02 2012-11-08
tigv2 4124/tcp # Rohill TetraNode Ip Gateway [Bert_Bouwers] [Bert_Bouwers] 2007-05
# v2
tigv2 4124/udp # Rohill TetraNode Ip Gateway [Bert_Bouwers] [Bert_Bouwers] 2007-05
@@ -10218,7 +10214,10 @@
ipsec-nat-t 4500/udp # IPsec NAT-Traversal [RFC3947]
# 4501 Unassigned [IANA] [IANA] De-registered 08 June 2001
a25-fap-fgw 4502/sctp # A25 (FAP-FGW) [ThreeGPP2] [Zhiming_Li] 2012-01-11
-# 4503-4534 Unassigned
+# 4503-4533 Unassigned
+# 4534 tcp Reserved
+armagetronad 4534/udp # Armagetron Advanced Game [Manuel_Moos] [Yann_Kaiser] 2012-11-02
+# Server
ehs 4535/tcp # Event Heap Server
ehs 4535/udp # Event Heap Server
ehs-ssl 4536/tcp # Event Heap Server SSL [Brad_Johanson] [Brad_Johanson] 2005-08
@@ -10803,7 +10802,7 @@
ita-manager 5052/tcp # ITA Manager [Don_Merrell] [Don_Merrell]
ita-manager 5052/udp # ITA Manager [Don_Merrell] [Don_Merrell]
rlm 5053/tcp # RLM License Server [Matt_Christiano_2] [Matt_Christiano_2] 2008-07-28
-# 5053 udp Reserved
+rlm-disc 5053/udp # RLM Discovery Server [Reprise_Software_Inc] [Matt_Christiano_3] 2012-11-06
rlm-admin 5054/tcp # RLM administrative interface [Matt_Christiano_2] [Matt_Christiano_2] 2008-07-28
# 5054 udp Reserved
unot 5055/tcp # UNOT [Gordon_Mohr_2] [Gordon_Mohr_2]
@@ -11417,10 +11416,10 @@
# 5558-5565 Unassigned
westec-connect 5566/tcp # Westec Connect [Jon_Bolen] [Jon_Bolen] 2009-03-18
# 5566 udp Reserved
-m-oap 5567/tcp # Multicast Object Access [Bryant_Eastham] [Bryant_Eastham] 2004-11
-# Protocol
-m-oap 5567/udp # Multicast Object Access [Bryant_Eastham] [Bryant_Eastham] 2004-11
-# Protocol
+enc-eps-mc-sec 5567/tcp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12
+# multicast/secure transport
+enc-eps-mc-sec 5567/udp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12
+# multicast/secure transport
sdt 5568/tcp # Session Data Transport [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05
# Multicast
sdt 5568/udp # Session Data Transport [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05
@@ -11524,9 +11523,12 @@
vfmobile 5646/tcp # Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder] 2011-11-03
# 5646 udp Reserved
# UNAUTHORIZED
-# 5647-5670 Unassigned USE: Port
+# 5647-5669 Unassigned USE: Port
# 5666 used by
# SAIC NRPE
+filemq 5670/tcp # ZeroMQ file [ZeroMQ.org] [Pieter_Hintjens2] 2012-11-01
+# publish-subscribe protocol
+# 5670 udp Reserved
amqps 5671/tcp # amqp protocol over TLS/SSL [Ted_Ross_2] [Ted_Ross_2] 2008-03-26
amqps 5671/udp # amqp protocol over TLS/SSL [Ted_Ross_2] [Ted_Ross_2] 2008-03-26
amqp 5672/tcp # AMQP [Pieter_Hintjens] [Pieter_Hintjens] 2006-01
@@ -11710,9 +11712,9 @@
ppsuitemsg 5863/tcp # PlanetPress Suite Messeng [Yannick_Fortin] [Yannick_Fortin] 2006-02
ppsuitemsg 5863/udp # PlanetPress Suite Messeng [Yannick_Fortin] [Yannick_Fortin] 2006-02
# 5864-5867 Unassigned
-diameters 5868/tcp # Diameter over TLS/TCP [IESG] [IETF_Chair] [RFC-ietf-dime-rfc3588bis-34]
+diameters 5868/tcp # Diameter over TLS/TCP [IESG] [IETF_Chair] [RFC6733]
# 5868 udp Reserved
-diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC-ietf-dime-rfc3588bis-34]
+diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC6733]
# 5869-5882 Unassigned
jute 5883/tcp # Javascript Unit Test [Mark_Ethan_Trostler] [Mark_Ethan_Trostler] 2011-11-23
# Environment
@@ -12024,7 +12026,10 @@
dt-mgmtsvc 6325/tcp # Double-Take Management [Vision_Solutions] [James_Wilkinson2] 2012-06-06
# Service
# 6325 udp Reserved
-# 6326-6342 Unassigned
+dt-vra 6326/tcp # Double-Take Virtual Recovery [Vision_Solutions] [James_Wilkinson2] 2012-10-08
+# Assistant
+# 6326 udp Reserved
+# 6327-6342 Unassigned
sflow 6343/tcp # sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06
sflow 6343/udp # sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06
# 6344-6345 Unassigned
@@ -12318,7 +12323,7 @@
mcer-port 6510/udp # MCER Port [Portnoy_Boxman] [Portnoy_Boxman]
# 6511 tcp Reserved
# Datagram Congestion Control
-dccp-udp 6511/udp # Protocol Encapsulation for [IESG] [IETF_Chair] [RFC-ietf-dccp-udpencap-10]
+dccp-udp 6511/udp # Protocol Encapsulation for [IESG] [IETF_Chair] [RFC6773]
# NAT Traversal
# 6512-6512 Unassigned
netconf-tls 6513/tcp # NETCONF over TLS [RFC5539]
@@ -12425,7 +12430,9 @@
# 6656 udp Reserved
# 6657 tcp Reserved
palcom-disc 6657/udp # PalCom Discovery [Boris_Magnusson] [Boris_Magnusson] 2010-12-06
-# 6658-6664 Unassigned
+# Unauthorized
+# 6658-6664 Unassigned Use Known on
+# Port 6659
# ircu 6665-6669 tcp IRCU [Brian_Tackett] [Brian_Tackett]
# 6665-6669 udp Reserved
vocaltec-gold 6670/tcp # Vocaltec Global Online [Scott_Petrack] [Scott_Petrack]
@@ -12527,7 +12534,12 @@
plysrv-http 6770/udp # PolyServe http [Mike_Spitzer] [Mike_Spitzer] 2005-08
plysrv-https 6771/tcp # PolyServe https [Mike_Spitzer] [Mike_Spitzer] 2005-08
plysrv-https 6771/udp # PolyServe https [Mike_Spitzer] [Mike_Spitzer] 2005-08
-# 6772-6784 Unassigned
+# 6772-6783 Unassigned
+# 6784 tcp Reserved
+# Bidirectional Forwarding
+bfd-lag 6784/udp # Detection (BFD) on Link [IESG] [IETF_Chair] 2012-11-08 [draft-mmm-bfd-on-lags-05]
+# Aggregation Group (LAG)
+# Interfaces
dgpf-exchg 6785/tcp # DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04
dgpf-exchg 6785/udp # DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04
smc-jmx 6786/tcp # Sun Java Web Console JMX [Bill_Edwards] [Bill_Edwards] 2005-08
@@ -12675,7 +12687,10 @@
# 7026-7029 Unassigned
op-probe 7030/tcp # ObjectPlanet probe [Bjorn_Jarle_Kvande] [Bjorn_Jarle_Kvande] 2002-04
op-probe 7030/udp # ObjectPlanet probe [Bjorn_Jarle_Kvande] [Bjorn_Jarle_Kvande] 2002-04
-# 7031-7039 Unassigned
+iposplanet 7031/tcp # IPOSPLANET retailing multi [Fabrice_Paget] [Fabrice_Paget] 2012-10-23
+# devices protocol
+# 7031 udp Reserved
+# 7032-7039 Unassigned
# 7040 tcp Reserved
quest-disc 7040/udp # Quest application level [Quest_Software] [Henrik_Johnson] 2012-04-09
# network service discovery
@@ -13402,7 +13417,9 @@
# 8404 udp Reserved
svbackup 8405/tcp # SuperVault Backup [Nine_Technology_LLC] [Alex_Stoev] 2009-09-14 2011-08-01
# 8405 udp Reserved
-# 8406-8415 Unassigned
+# 8406-8414 Unassigned
+dlpx-sp 8415/tcp # Delphix Session Protocol [Delphix_Corp] [Peng_Dai] 2012-11-01
+# 8415 udp Reserved
espeech 8416/tcp # eSpeech Session Protocol [Scott_Tarone] [Scott_Tarone] 2002-11
espeech 8416/udp # eSpeech Session Protocol [Scott_Tarone] [Scott_Tarone] 2002-11
espeech-rtp 8417/tcp # eSpeech RTP Protocol [Scott_Tarone] [Scott_Tarone] 2003-04
@@ -13452,10 +13469,8 @@
d-fence 8555/tcp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01
d-fence 8555/udp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01
# 8556-8566 Unassigned
-oap-admin 8567/tcp # Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2005-08
-# Administration
-oap-admin 8567/udp # Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2005-08
-# Administration
+enc-tunnel 8567/tcp # EMIT tunneling protocol [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2005-08 2012-11-12
+enc-tunnel 8567/udp # EMIT tunneling protocol [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2005-08 2012-11-12
# 8568-8599 Unassigned
asterix 8600/tcp # Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11
asterix 8600/udp # Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11
@@ -13475,7 +13490,10 @@
canon-bjnp4 8614/udp # Canon BJNP Port 4 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11
imink 8615/tcp # Imink Service Control [Canon_Inc] [KEN_ICHI_FUJII] 2011-10-10
# 8615 udp Reserved
-# 8616-8674 Unassigned
+# Unauthorized
+# 8616-8674 Unassigned Use Known on
+# ports 8616
+# and 8617
# Motorola Solutions Customer
msi-cps-rm 8675/tcp # Programming Software for [Motorola_Solutions_Inc] [Jenish_Amin] 2012-03-14
# Radio Management
@@ -13488,7 +13506,10 @@
# 8687-8698 Unassigned
vnyx 8699/tcp # VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11
vnyx 8699/udp # VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11
-# 8700-8731 Unassigned
+# 8700-8710 Unassigned
+nvc 8711/tcp # Nuance Voice Control [Nuance_Communications_Inc2] [Diego_Negre] 2012-10-05
+# 8711 udp Reserved
+# 8712-8731 Unassigned
# 8732 tcp Reserved
dtp-net 8732/udp # DASGIP Net Services [Dr_Matthias_Arnold] [Dr_Matthias_Arnold] 2009-03-23
ibus 8733/tcp # iBus [Silvano_Maffeis] [Silvano_Maffeis]
@@ -14257,7 +14278,10 @@
# 10811-10859 Unassigned
helix 10860/tcp # Helix Client/Server [Matthew_Strange][Larry_Atkin_2] [Matthew_Strange][Larry_Atkin_2] 2009-03-06
helix 10860/udp # Helix Client/Server [Matthew_Strange][Larry_Atkin_2] [Matthew_Strange][Larry_Atkin_2] 2009-03-06
-# 10861-10989 Unassigned
+# 10861-10879 Unassigned
+bveapi 10880/tcp # BVEssentials HTTP API [Tri_Tech_Computers_Ltd] [James_Emerton] 2012-11-19
+bveapi 10880/udp # BVEssentials HTTP API [Tri_Tech_Computers_Ltd] [James_Emerton] 2012-11-19
+# 10881-10989 Unassigned
rmiaux 10990/tcp # Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2]
rmiaux 10990/udp # Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2]
# 10991-10999 Unassigned
@@ -15215,9 +15239,12 @@
# 28001 udp Reserved
# Unauthorized
# Use Known on
-# 28002-28239 Unassigned ports 28017,
+# 28002-28199 Unassigned ports 28017,
# 28018 and
# 28019
+voxelstorm 28200/tcp # VoxelStorm game server [VoxelStorm] [Eugene_Hopkinson] 2012-11-08
+voxelstorm 28200/udp # VoxelStorm game server [VoxelStorm] [Eugene_Hopkinson] 2012-11-08
+# 28201-28239 Unassigned
siemensgsm 28240/tcp # Siemens GSM [David_Anuszewski] [David_Anuszewski] 2004-11
siemensgsm 28240/udp # Siemens GSM [David_Anuszewski] [David_Anuszewski] 2004-11
# 28241-29117 Unassigned
@@ -15234,7 +15261,12 @@
sbcap 29168/sctp # SBcAP in 3GPP [GPP_Specifications] [GPP_Specifications] 2009-06-11
iuhsctpassoc 29169/sctp # HNBAP and RUA Common [John_Meredith] [John_Meredith] 2009-09-08
# Association
-# 29170-30000 Unassigned
+# 29170-29998 Unassigned
+# data exchange protocol for
+bingbang 29999/tcp # IEC61850 in wind power [DEIF_AS] [Armin_Solies] 2012-10-15
+# plants
+# 29999 udp Reserved
+# 30000 Unassigned
pago-services1 30001/tcp # Pago Services 1 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03
pago-services1 30001/udp # Pago Services 1 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03
pago-services2 30002/tcp # Pago Services 2 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03
@@ -15540,7 +15572,10 @@
# and Command Flooding
ciscocsdb 43441/tcp # Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11
ciscocsdb 43441/udp # Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11
-# 43442-44320 Unassigned
+# 43442-44122 Unassigned
+z-wave-s 44123/tcp # Z-Wave Secure Tunnel [Sigma_Designs_Inc] [Anders_Brandt_3] 2012-10-12
+# 44123 udp Reserved
+# 43124-44320 Unassigned
pmcd 44321/tcp # PCP server (pmcd) [Ken_McDonell] [Ken_McDonell] 2010-12-20
pmcd 44321/udp # PCP server (pmcd) [Ken_McDonell] [Ken_McDonell] 2010-12-20
pmcdproxy 44322/tcp # PCP server (pmcd) proxy [Ken_McDonell] [Ken_McDonell] 2003-07 2010-12-20
@@ -15944,6 +15979,7 @@
# boxraysrvr tcp Boxray Devices Host Server [Caprice_Productions] [Lance_Drake] 2012-07-05 Defined TXT keys: none
# bri RFID Reader Basic Reader [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: None
# Interface
+# bridgeprotocol tcp JSON RPC Bridge Protocol [Michel_Stam_2] [Michel_Stam_2] 2012-11-20 Defined TXT keys: path, version
# bsqdea Backup Simplicity [Qdea] [Qdea] Defined TXT keys: None
# caldav tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [draft-daboo-srv-caldav] This is an extension of the http service. Defined TXT keys:
# WebDAV (CalDAV) - non-TLS path=<context path>
@@ -16000,6 +16036,7 @@
# dbaudio udp d&b audiotechnik remote [d_b_audiotechnik] [Christian_Laendner] 2011-10-06 protovers=<version of proprietary protocol> guid=<type>
# network name=<name> sn=<serial number> device=<cleartext type>
# fwver=<firmware version>
+# dccp-ping dccp ping/traceroute using DCCP [Samuel_Jero] [Samuel_Jero] 2012-11-14 1885957735 Defined TXT keys: None
# device-info Device Info [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD device
# info.
# devonsync tcp DEVONthink synchronization [DEVONtechnologies_LLC] [Rob_Rix][Eric_Boehnisch-Volkmann] 2011-10-18 Defined TXT keys: None at present
@@ -16015,6 +16052,7 @@
# Protocol http://www.ditrios.org/index.php?link=tutorial/index#zeroconf
# divelogsync Dive Log Data Sharing and [Greg_McLaughlin] [Greg_McLaughlin] Defined TXT keys: None
# Synchronization Protocol
+# dlpx-sp tcp Delphix Session Protocol [Delphix_Corp] [Peng_Dai] 2012-10-02 Defined TXT keys: None
# dltimesync udp Local Area Dynamic Time [Geoff_Back_3] [Geoff_Back_3] Defined TXT keys: None
# Synchronisation Protocol
# dns-sd DNS Service Discovery [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD meta
@@ -16396,6 +16434,10 @@
# Defined TXT keys: None mxs.system.id=<system id>
# mxs MatrixStore [Object_Matrix] [Object_Matrix] mxs.system.version=<system layer version>
# mxs.cluster.id=<cluster id the system belongs to>
+# nasmon tcp Proprietary communication [Infinite_Loop] [Claus_Broch2] 2012-10-09 Defined TXT keys: Proprietary
+# protocol for NAS Monitor
+# nasmon udp Proprietary communication [Infinite_Loop] [Claus_Broch2] 2012-10-09 Defined TXT keys: Proprietary
+# protocol for NAS Monitor
# ncbroadcast Network Clipboard Broadcasts [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard
# at thezaz.com>
# ncdirect Network Clipboard Direct [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard
@@ -16432,6 +16474,22 @@
# objective servers in an Objective [Marc_Bailey] [Marc_Bailey] type={'production'|'standby'|'test'|'demo'}
# (http://www.objective.com) protocol={['SOAP'],['CORBA']} transport=['iiop']|['http']
# instance.
+# Insecure OCP.1 protocol,
+# oca tcp which is the insecure TCP/IP [OCA_Alliance] [Stephan_van_Tienen] 2012-10-11 Defined TXT keys: txtvers=1 protovers=x
+# implementation of the Object
+# Control Architecture
+# Insecure OCP.1 protocol,
+# oca udp which is the insecure TCP/IP [OCA_Alliance] [Stephan_van_Tienen] 2012-10-11 Defined TXT keys: txtvers=1 protovers=x
+# implementation of the Object
+# Control Architecture
+# Secure OCP.1 protocol, which
+# ocasec tcp is the secure TCP/IP [OCA_Alliance] [Stephan_van_Tienen] 2012-10-11 Defined TXT keys: txtvers=1 protovers=x
+# implementation of the Object
+# Control Architecture
+# Secure OCP.1 protocol, which
+# ocasec udp is the secure TCP/IP [OCA_Alliance] [Stephan_van_Tienen] 2012-10-11 Defined TXT keys: txtvers=1 protovers=x
+# implementation of the Object
+# Control Architecture
# oce Oce Common Exchange Protocol [Dion_Slijp] [Dion_Slijp] Defined TXT keys: type, version
# od-master OpenDirectory Master [Jason_Thorpe] [Jason_Thorpe] Defined TXT keys: None
# odabsharing OD4Contact [Objective_Decision] [Objective_Decision] Defined TXT keys: None
@@ -16470,6 +16528,7 @@
# Server
# p2pchat udp Peer-to-Peer Chat (Sample [Roger_Pantos] [Roger_Pantos] Defined TXT keys: None
# Java Bonjour application)
+# p2pstorage-sec tcp DataBOND p2p storage [Dell] [Jessica_Zhang] 2012-11-19 Defined TXT keys: txtvers, machineid, status
# pairandshare tcp Pair & Share data protocol [Intel] [Joshua_Boelter] 2011-10-18 Defined TXT keys: Proprietary
# panoply tcp Panoply multimedia composite [Natarajan_Balasundar] [Natarajan_Balasundar] Defined TXT keys: None
# transfer protocol
@@ -16716,6 +16775,7 @@
# spr-itunes netTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None
# splashsync SplashData Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary
# Service
+# spres tcp SongPresenter [Tobias_Hoffmann] [Tobias_Hoffmann] 2012-10-09 Defined TXT keys: version, name
# Defined TXT keys: txtvers=1 cport= the port for the content
# HTTP server (secondary HTTP server used for content
# publishing) mode= the mode in which the HMP device is
@@ -17120,8 +17180,9 @@
# [Anand_Gangadharan] Anand Gangadharan mailto:anand&goa.mainsoft.com
# [Anastasios_Kotsikona] Anastasios Kotsikonas mailto:tasos&cs.bu.edu
# [Anders_Borg] Anders Borg mailto:anders.borg&solid.se 2004-11
-# [Anders_Brandt] Anders Brandt Zensys Inc. mailto:abr&zen-sys.com 2007-02
+# [Anders_Brandt] Anders Brandt Sigma Designs, Inc. mailto:Anders_Brandt&sigmadesigns.com 2012-11-08
# [Anders_Brandt_2] Anders Brandt Sigma Designs, Inc. mailto:anders_brandt&sigmadesigns.com 2011-10-03
+# [Anders_Brandt_3] Anders Brandt Sigma Designs mailto:anders_brandt&sigmadesigns.com 2012-10-12
# [Anders_Hjelm] Anders Hjelm mailto:anders.hjelm&ec.se 2006-03
# [Anders_Klemets] Anders Klemets mailto:andersklµsoft.com
# [Anders_Svensson] Anders Svensson mailto:pong&simusoft.dk
@@ -17248,6 +17309,7 @@
# [Arman_Bedonian] Arman Bedonian mailto:Arman.Bedonian&asg.com 2009-07-15
# [Armin_Liebchen] Armin Liebchen mailto:armin&anteradesign.com 2007-06
# [Armin_Sawusch] Armin Sawusch mailto:armin&esd1.esd.de
+# [Armin_Solies] Armin Solies DEIF A/S mailto:aes&deif.com 2012-10-15
# [Arnaud_Clermonte] Arnaud Clermonte mailto:clermonte&4xtechnologies.com
# [Arne_Dirks] Arne Dirks mailto:ad&bnc.net
# [Arne_Haugland] Arne Haugland mailto:Arne.Haugland¶soldev.com
@@ -17525,7 +17587,9 @@
# [Bryan_Otey] Bryan Otey mailto:bwo&softdesk.com
# [Bryan_Vergato] Bryan Vergato mailto:iana&ivocalize.com 2006-05
# [Bryan_Wilcutt] Bryan Wilcutt mailto:bwilcutt&comtechefdata.com 2005-06
-# [Bryant_Eastham] Bryant Eastham mailto:protocols&pewla.us.pewg.panasonic.com 2005-08
+# Panasonic Intranet,
+# [Bryant_Eastham] Bryant Eastham Panasonic North mailto:bryant.eastham&us.panasonic.com 2012-11-12
+# America (PEWLA)
# [Bryce_Beeston] Bryce Beeston mailto:bryce.beeston&emerson.com 2011-06-23
# [Bryce_Bhatnagar] Bryce Bhatnagar mailto:BRYCEBH&attachmate.com
# [Buck_Caldwell] Buck Caldwell mailto:buck_c&polygon.com
@@ -17731,6 +17795,7 @@
# [Claudio_Lastrucci] Claudio Lastrucci POWERSOFT S.R.L. mailto:claudio.lastrucci&powersoft.it 2012-01-03
# [Claudio_Procida] Claudio Procida mailto:claudio&emeraldion.it 2007-05
# [Claus_Broch] Claus Broch NextDay Aps mailto:nextday&infinite-loop.dk 2012-04-24
+# [Claus_Broch2] Claus Broch Infinite Loop mailto:nasmon&infinite-loop.dk 2012-10-09
# [Claus_Jensen] Claus Jensen Libratone A/S mailto:cjn&libratone.com 2011-10-27
# [Claus_Thor_Barth] Claus Thor Barth mailto:iana&barth.dk
# [Clay_Maeckal] Clay Maeckal mailto:clay_maeckel&filemaker.com
@@ -18065,7 +18130,10 @@
# [Dean_Robson] Dean Robson mailto:dean.robson&fujitsu.com.au
# [Dean_Skelton] Dean Skelton mailto:mdskel&ftw.rsc.raytheon.com
# [Dean_Webb] Dean Webb mailto:dean.webb&ascend.com
+# [DEIF_AS] DEIF A/S mailto:aes&deif.com 2012-10-15
# [Delcio_Prizon] Delcio Prizon mailto:dprizon&smar.com.br
+# [Dell] Dell mailto:jessica_z&dell.com 2012-11-19
+# [Delphix_Corp] Delphix Corp mailto:peng.dai&delphix.com 2012-11-01
# [Denis_Ducharme] Denis Ducharme mailto:dducharme&softek.com
# [Denis_Leclerc] Denis Leclerc mailto:DLeclerc&banyan.com
# [Denise_Eckstein] Denise Eckstein mailto:denise.eckstein&hp.com 2004-11
@@ -18100,6 +18168,7 @@
# [Dick_van_der_Sijs] Dick van der Sijs mailto:dick&and.nl
# [Didier_Cabannes] Didier Cabannes mailto:Didier&matisse.com 2004-11
# [Diego_Friedel] Diego Friedel mailto:d.friedel&avm.de 2006-03
+# [Diego_Negre] Diego Negre Nuance Communications mailto:Diego.Negre&nuance.com 2012-10-05
# [Diego_Santa_Cruz] Diego Santa Cruz SpinetiX S.A. mailto:Diego.SantaCruz&spinetix.com 2011-10-18
# [Diego_Saravia] Diego Saravia mailto:dsa&unsa.edu.ar
# [Dieter_Siegmund] Dieter Siegmund mailto:dieter&apple.com 2007-10-22
@@ -18315,6 +18384,7 @@
# [Eriko_Shimada] Eriko Shimada mailto:eriko&kel.fujitsu.co.jp
# [Erlang] Erlang/OTP support mailto:epmd&erix.ericsson.se 2004-12
# [Erwin_Hogeweg] Erwin Hogeweg mailto:erwin&airtech.demon.nl
+# [Eugene_Hopkinson] Eugene Hopkinson VoxelStorm mailto:slowriot&voxelstorm.com 2012-11-08
# [Etai_Lev_Ran] Etai Lev-Ran mailto:elevran&cisco.com 2005-02
# [Ethan_Fremen] Ethan Fremen mailto:mindlace&digicool.com
# [Eugen_Bacic] Eugen Bacic mailto:ebacic&texar.com
@@ -18333,6 +18403,7 @@
# [Eyal_Yardeni] Eyal Yardeni mailto:eyal.yardeni&smarts.com 2003-11
# [Ezinne_Oji] Ezinne Oji mailto:ezinne.oji&t-mobile.com 2006-06
# [F_Englert] Fl SQRTDEGvio Englert mailto:flavio&elipse.com.br 2007-09-17
+# [Fabrice_Paget] Fabrice Paget mailto:onefrench&me.com 2012-10-23
# [Fabrizio_Guglielmino] Fabrizio Guglielmino mailto:guglielmino&infitsrl.com
# [Fabrizio_Massimo_Fer] Fabrizio Massimo Ferrara mailto:fmf&gesi.it 2002-02
# [Fahad_Gilani] Fahad Gilani mailto:fahad&guidedways.com
@@ -18759,6 +18830,7 @@
# [Ing_Tomas_Halabala] Ing. Tomas Halabala mailto:tomas.halabala®ulace.org 2010-10-06
# [Ingersoll_Rand_Inc] Ingersoll Rand, Inc. mailto:john.taylor&irco.com 2011-09-28
# [Ingo_Franzki] Ingo Franzki mailto:ifranzki&de.ibm.com
+# [Infinite_Loop] Infinite Loop mailto:nasmon&infinite-loop.dk 2012-10-09
# [Insider_Software] Insider Software http://www.insidersoftware.com
# [Insist] Insist mailto:support&isticky.net
# [Intel] Intel mailto:joshua.boelter&intel.com 2011-10-18
@@ -18810,6 +18882,8 @@
# [James_David_Fisher] James David Fisher mailto:jfisher1&avaya.com
# [James_E_Housley] James E. Housley mailto:jim&thehousleys.net
# [James_E_King_III] James E. King, III mailto:James_E_K&dell.com 2010-06-24
+# [James_Emerton] James Emerton Tri Tech Computers mailto:james&tri-tech.com 2012-11-19
+# Ltd.
# [James_Falkner] James Falkner mailto:james.falkner&sun.com
# [James_Figgins] James Figgins mailto:james.figgins&durodata.co.uk 2006-07
# [James_Gettys] James Gettys mailto:jg&w3.org
@@ -18979,6 +19053,7 @@
# [Jesse_Ursery] Jesse Ursery mailto:jesse.ursery&ametek.com 2010-11-22
# [Jesse_W_Towner] Jesse W. Towner mailto:jwtowner&dsmedialabs.com
# [Jessica_Yan] Jessica Yan mailto:jessica.yan2&t-mobile.com 2008-02-19
+# [Jessica_Zhang] Jessica Zhang Dell mailto:jessica_z&dell.com 2012-11-19
# [Jesus_David_Rodrigue] Jesus David Rodriguez mailto:jesusdavid&magaya.com 2003-02
# [Jesus_De_Meyer] Jesus De Meyer mailto:jesus&edot-studios.com
# [Jesus_Ortiz] Jesus Ortiz mailto:jesus_ortiz&emotion.com
@@ -19561,6 +19636,7 @@
# [Manickam_R_Sridhar] Manickam R.Sridhar mailto:msridhar&sitaranetworks.com
# [Manish_Talreja] Manish Talreja Crestron Electronics, mailto:mtalreja@crestron.com> 2012-06-27
# Inc.
+# [Manuel_Moos] Manuel Moos mailto:z-man&users.sf.net 2012-11-02
# [Marazzi] Marazzi mailto:fmarazzi&ideetique.com
# [Marc_Andre_Lemburg] Marc-Andre Lemburg mailto:mal&egenix.com 2009-11-13
# [Marc_Bailey] Marc Bailey mailto:marc&objective.com
@@ -19737,6 +19813,7 @@
# [Mary_Ann_Burt] Mary Ann Burt mailto:bytex!ws054!maryann&uunet.uu.net
# [Mary_Holstage] Mary Holstage mailto:holstege&firstfloor.com
# [Mary_Holstege] Mary Holstege mailto:holstege&firstfloor.com
+# [Mary_Miller] Mary Miller Sigma Designs, Inc. mailto:Mary_Miller&sigmadesigns.com 2012-11-08
# [Masahiro_Koiwai] Masahiro Koiwai mailto:Koiwai.Masahiro&exc.epson.co.jp 2006-10
# [Masakatsu_Matsuo] Masakatsu Matsuo mailto:masa&sdsft.kme.mei.co.jp
# [Masakuni_Okada] Masakuni Okada mailto:masakuni&jp.ibm.com
@@ -19758,6 +19835,8 @@
# [Matt_Cecile] Matt Cecile mailto:mattc&metrics.com
# [Matt_Christiano] Matt Christiano mailto:globes@matt&oliveb.atc.olivetti.com
# [Matt_Christiano_2] Matt Christiano mailto:matt&reprisesoftware.com 2008-07-28
+# [Matt_Christiano_3] Matt Christiano Reprise Software, mailto:matt&reprisesoftware.com 2012-11-06
+# Inc.
# [Matt_Craig] Matt Craig mailto:matt&luxology.com
# [Matt_Craighead] Matt Craighead mailto:matt.craighead&conifersystems.com 2008-09-11
# [Matt_Eagar] Matt Eagar mailto:matt.eagar&thinkflood.com
@@ -19918,6 +19997,7 @@
# [Michel_Bourget] Michel Bourget mailto:michel&sgi.com 2009-01-06
# [Michel_Stam] Michel Stam HaloteC Instruments mailto:michel.stam&halotec.com 2012-02-07
# B.V.
+# [Michel_Stam_2] Michel Stam mailto:michel.iana&reverze.net 2012-11-20
# [Micromat] Micromat mailto:supportµmat.com
# [Microsoft_Corporation] Microsoft Corporation mailto:pratsharµsoft.com 2011-08-04
# [Microsoft_Corporation_2] Microsoft Corporation mailto:stdsreqµsoft.com 2012-03-15
@@ -20123,12 +20203,14 @@
# [NovaWiz_LTD] NovaWiz LTD mailto:Moshe&novawiz.com
# [Nuance_Communications_Inc] Nuance mailto:Mark.Jackson&nuance.com 2011-10-27
# Communications, Inc.
+# [Nuance_Communications_Inc2] Nuance Communications mailto:NOD_SolutionsArchitecture&nuance.com 2012-10-05
# [OASIS_KMIP_Technical_Committee] OASIS KMIP Technical mailto:robin&oasis-open.org 2011-07-25
# Committee
# [OC] OC mailto:ocs&ocs.cz
# [Object_Matrix] Object Matrix mailto:support&object-matrix.com
# [Objective_Decision] Objective Decision mailto:od4contact&objective-decision.com
# [Oblamatik_AG] Oblamatik AG mailto:info&oblamatik.ch 2012-09-05
+# [OCA_Alliance] OCA Alliance mailto:tina.lipscomb&oca-alliance.com 2012-10-11
# [Odo_Maletzki] Odo Maletzki mailto:Odo.Maletzki&ioag.de
# [Oishi_Toshiaki] Oishi Toshiaki SEIKO EPSON mailto:Oishi.Toshiaki&exc.epson.co.jp 2002-02
# Corporation
@@ -20176,6 +20258,9 @@
# [PV_Shivkumar] PV Shivkumar mailto:p.shivkumar&oracle.com 2003-10
# [P_T_K_Farrar] P.T.K. Farrar mailto:farrarp&teccon.co.uk
# [P_V_Shivkumar] P.V.Shivkumar mailto:PSHIVKUM&us.oracle.com
+# Panasonic Intranet,
+# [Panasonic_Intranet_Panasonic_North_America_PEWLA] Panasonic North mailto:protocols&pewla.us.pewg.panasonic.com 2012-11-12
+# America (PEWLA)
# [Panic_Inc] Panic Inc. mailto:cabel&panic.com 2012-07-19
# [Panic_Ride] Panic Ride mailto:panicride&hao.org
# [Paolo_Desii] Paolo Desii POWERSOFT S.R.L. mailto:paolo.desii&powersoft.it 2012-01-03
@@ -20278,6 +20363,7 @@
# [Pedro_Alpedrinha] Pedro Alpedrinha mailto:pedro.alpedrinha&redevirtual.com 2006-02
# [Pekka_Riikonen] Pekka Riikonen mailto:priikone&poseidon.pspt.fi
# [Pekka_Takaranta] Pekka Takaranta mailto:pekka.takaranta&tellabs.fi
+# [Peng_Dai] Peng Dai Delphix Corp mailto:peng.dai&delphix.com 2012-11-01
# [Per_Cederqvist] Per Cederqvist mailto:ceder&lysator.liu.se
# [Per_Fahlberg] Per Fahlberg mailto:support&remograph.com 2009-01-21
# [Per_Hellberg] Per Hellberg mailto:phellberg&isogon.com 2002-02
@@ -20389,6 +20475,7 @@
# [Piers_Scannell_2] Piers Scannell mailto:piers&globecastne.com
# [Pieter_Ditmars] Pieter Ditmars mailto:pditmars&bbn.com
# [Pieter_Hintjens] Pieter Hintjens mailto:ph&imatix.com 2006-01
+# [Pieter_Hintjens2] Pieter Hintjens mailto:ph&imatix.com 2012-11-01
# [Pim_van_Riezen] Pim van Riezen mailto:registries&panelsix.com 2006-07
# [Piotr_Parlewicz] Piotr Parlewicz mailto:pparlewicz&queryobject.com
# [Pisharath_Krishnan] Pisharath Krishnan mailto:krishnan&axis-inc.com
@@ -20508,6 +20595,8 @@
# [Rene_Fontaine] Rene Fontaine mailto:fontaine_rene&emc.com
# [Rene_Jager] Rene Jager mailto:renej&frog.nl
# [Rene_Kurt] Rene Kurt mailto:rene.kurt&adasoft.ch 2005-08
+# [Reprise_Software_Inc] Reprise Software, mailto:matt&reprisesoftware.com 2012-11-06
+# Inc.
# [Resource_Allocation] Resource Allocation Team mailto:resources&littlehall.com 2010-09-27
# [Retrospect_Inc] Retrospect, Inc. mailto:JG.Heithcock&retrospect.com 2012-02-02
# [Reuven_Harrison] Reuven Harrison mailto:rnd_ana&checkpoint.com
@@ -20806,6 +20895,7 @@
# [Sameer_Deokule] Sameer Deokule mailto:sameer.deokule&veritas.com 2002-03
# [Samppa_Lahtinen] Samppa Lahtinen mailto:samppa.lahtinen&motivesys.com 2004-06
# [Samuel_Bercovici] Samuel Bercovici mailto:samuelb&radware.com 2011-08-05
+# [Samuel_Jero] Samuel Jero mailto:sj323707&ohio.edu 2012-11-14
# [Samuele_Sequi] Samuele Sequi mailto:samuelesequi&defcom.it 2004-02
# [Sanchaita_Datta] Sanchaita Datta mailto:sdatta&ragula.com
# [Sancho_Lerena] Sancho Lerena mailto:slerena&artica.es 2009-06-02
@@ -20927,6 +21017,7 @@
# [Siew_Sim] Siew Sim mailto:ssim&asempra.com 2005-08
# [Sigfus_Magnusson] Sigfus Magnusson mailto:sigfusm&menandmice.com
# [Sigma_Designs_Inc] Sigma Designs, Inc. mailto:anders_brandt&sigmadesigns.com 2011-10-03
+# [Sigma_Designs_Inc_2] Sigma Designs, Inc. mailto:pr&sdesigns.com 2012-11-08
# [Signwave_Networking] Signwave Networking mailto:mail&signwave.co.uk
# Development Team
# [Silvano_Maffeis] Silvano Maffeis mailto:maffeis&softwired.ch
@@ -21039,6 +21130,7 @@
# [Stephen_Reid] Stephen Reid mailto:sreid&ti.com
# [Stephen_Tsun] Stephen Tsun mailto:stsun&jetstream.com
# [Stephen_Tsun_2] Stephen Tsun mailto:stsun&calient.net 2002-02
+# [Stephan_van_Tienen] Stephan van Tienen OCA Alliance mailto:stephan.vantienen&bosch.com 2012-10-11
# [Steve_Bannister] Steve Bannister mailto:sbannister&stratacache.com
# [Steve_Barton] Steve Barton mailto:steveb&pacom.com 2002-03
# [Steve_Beigel] Steve Beigel mailto:ublueb!steve&uunet.uu.net
@@ -21318,6 +21410,7 @@
# [Timothy_Wayper] Timothy Wayper mailto:timmy&wunderbear.com
# [TiVo_Inc] TiVo Inc. mailto:devsupport&tivo.com 2011-10-18
# [Tobias_Erichsen] Tobias Erichsen mailto:erichsen&te-systems.de
+# [Tobias_Hoffmann] Tobias Hoffmann mailto:th55&gmx.de 2012-10-09
# [Tobias_Wegner] Tobias Wegner mailto:wegner&novagate.de
# [Tobin_Schuster] Tobin Schuster mailto:tobin.j.schuster&jci.com
# [Toby_Hosterman] Toby Hosterman mailto:root&netspeak.com
@@ -21409,6 +21502,8 @@
# Development Team
# [Trevor_Bell] Trevor Bell mailto:Trevor&iguana.iosoftware.com
# [Trevor_Perkes] Trevor Perkes mailto:trevor.perkes&landesk.com 2010-02-01
+# [Tri_Tech_Computers_Ltd] Tri Tech Computers mailto:admins&tri-tech.com 2012-11-19
+# Ltd.
# [Tristan_Richardson] Tristan Richardson mailto:iana&realvnc.com 2006-03
# [Tristan_Seifert] Tristan Seifert mailto:admin&247server.net 2011-01-31
# [Tristan_Seifert_2] Tristan Seifert Squee! Application mailto:tristan&squee.co 2011-07-19
@@ -21507,6 +21602,7 @@
# [Voiko_Loukanov] Voiko Loukanov mailto:v.loukanov&dvelectronics.com 2003-10
# [Volker_Wiegand] Volker Wiegand mailto:volker.wiegand&t-online.de 2007-07-10
# [Von_Welch] Von Welch mailto:vwelch&ncsa.uiuc.edu
+# [VoxelStorm] VoxelStorm mailto:slowriot&voxelstorm.com 2012-11-08
# [VSN_International_Ltd] VSN International mailto:sean&vsni.co.uk 2011-09-28
# Ltd.
# [WAP_Forum] WAP Forum mailto:wap-feedback&mail.wapforum.org
@@ -21599,6 +21695,7 @@
# [Y_Y_Goland] Y. Y. Goland mailto:yarongµsoft.com
# [Yakov_Rekhter] Yakov Rekhter mailto:Yakov&ibm.com
# [Yanick_Pouffary] Yanick Pouffary mailto:pouffary&taec.enet.dec.com
+# [Yann_Kaiser] Yann Kaiser mailto:kaiser.yann&gmail.com 2012-11-02
# [Yannick_Fortin] Yannick Fortin mailto:fortiny&ca.objectiflune.com 2006-02
# [Yariv_Kaplan] Yariv Kaplan mailto:yarivk&gilat.com
# [Yasunari_Gon_Yamasit] Yasunari Gon Yamasita mailto:yamasita&omronsoft.co.jp
@@ -21648,6 +21745,7 @@
# [Zane_Bitter] Zane Bitter mailto:zbitter&redhat.com 2011-08-31
# [Zdenek_Kolba] Zdenek Kolba mailto:zdenek.kolba&id-karta.cz
# [Zenon_Fortuna] Zenon Fortuna mailto:zenon&mips.com 2007-02
+# [ZeroMQ.org] ZeroMQ.org mailto:ph&imatix.com 2012-11-01
# [Zhengli] Zhengli mailto:std&iwncomm.com 2010-06-28
# [Zhiming_Li] Zhiming Li 3GPP2 mailto:lizhiming&huawei.com 2012-01-11
# [Zhizhong_Zhuang] Zhizhong Zhuang mailto:ZZhuang&optellios.com 2006-12
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/svnversion.h
^
|
| @@ -1,2 +1,2 @@
-#define SVNVERSION "SVN Rev 45257"
+#define SVNVERSION "SVN Rev 46251"
#define SVNPATH "/trunk-1.6"
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/tools/ncp2222.py
^
|
| @@ -25,7 +25,7 @@
for a badly-formatted HTML version of the same PDF.
-$Id: ncp2222.py 35705 2011-01-30 21:01:07Z stig $
+$Id: ncp2222.py 46226 2012-11-27 17:08:10Z gerald $
Portions Copyright (c) 2000-2002 by Gilbert Ramirez <gram@alumni.rice.edu>.
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/tools/process-x11-fields.pl
^
|
| @@ -6,7 +6,7 @@
#
# Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
#
-# $Id: process-x11-fields.pl 29871 2009-09-12 23:02:34Z morriss $
+# $Id: process-x11-fields.pl 46226 2012-11-27 17:08:10Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/tools/process-x11-xcb.pl
^
|
| @@ -6,7 +6,7 @@
#
# Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
#
-# $Id: process-x11-xcb.pl 34230 2010-09-24 02:51:40Z morriss $
+# $Id: process-x11-xcb.pl 46226 2012-11-27 17:08:10Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/Makefile.am
^
|
| @@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 44531 2012-08-15 20:24:56Z gerald $
+# $Id: Makefile.am 45264 2012-10-02 19:46:57Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -29,7 +29,7 @@
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
-libwiretap_la_LDFLAGS = -version-info 1:11:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 1:12:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/Makefile.in
^
|
| @@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am 44531 2012-08-15 20:24:56Z gerald $
+# $Id: Makefile.am 45264 2012-10-02 19:46:57Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
@@ -599,7 +599,7 @@
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
-libwiretap_la_LDFLAGS = -version-info 1:11:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 1:12:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
@HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror
INCLUDES = -I$(srcdir)/..
CLEANFILES = \
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascend.c
^
|
| @@ -78,7 +78,7 @@
/* ascend.y
*
- * $Id: ascend.y 32009 2010-02-25 20:45:59Z guy $
+ * $Id: ascend.y 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascend.y
^
|
| @@ -1,7 +1,7 @@
%{
/* ascend.y
*
- * $Id: ascend.y 32009 2010-02-25 20:45:59Z guy $
+ * $Id: ascend.y 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascend_scanner.c
^
|
| @@ -1450,7 +1450,7 @@
#line 13 "ascend_scanner.l"
/* ascend_scanner.l
*
- * $Id: ascend_scanner.l 37979 2011-07-11 21:23:58Z gerald $
+ * $Id: ascend_scanner.l 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascend_scanner.l
^
|
| @@ -12,7 +12,7 @@
%{
/* ascend_scanner.l
*
- * $Id: ascend_scanner.l 37979 2011-07-11 21:23:58Z gerald $
+ * $Id: ascend_scanner.l 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascendtext.c
^
|
| @@ -1,6 +1,6 @@
/* ascendtext.c
*
- * $Id: ascendtext.c 37026 2011-05-09 08:12:26Z guy $
+ * $Id: ascendtext.c 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/ascendtext.h
^
|
| @@ -1,6 +1,6 @@
/* ascend.h
*
- * $Id: ascendtext.h 37572 2011-06-06 16:39:23Z gerald $
+ * $Id: ascendtext.h 46226 2012-11-27 17:08:10Z gerald $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
|
[-]
[+]
|
Changed |
wireshark-1.6.12.tar.bz2/wiretap/commview.c
^
|
| @@ -2,7 +2,7 @@
* Routines for opening CommView file format packet captures
* Copyright 2007, Stephen Fisher (see AUTHORS file)
*
- * $Id: commview.c 38869 2011-09-02 20:22:41Z gerald $
+ * $Id: commview.c 45512 2012-10-12 21:52:21Z guy $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
|
