Changes - j0ke.net Open Build Service

@@ -1,196 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_3_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-3.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,3.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - fclose (fopen ("conf.gtktest", "w")); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include <gtk/gtk.h> -#include <stdio.h> -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -])

@@ -3388,7 +3388,6 @@ Timo Metsala <timo.metsala [AT] gmail.com> Tomer Shani <thetour [AT] japan.com> Manu Pathak <mapathak [AT] cisco.com> -Kaul <mykaul [AT] gmail.com> John Sullivan <john [AT] kanargh.force9.co.uk> Martin André <andre [AT] clarinet.u-strasbg.fr> Andrei Emeltchenko <Andrei.Emeltchenko [AT] nokia.com>

@@ -1,645 +1,611 @@ ------------------------------------------------------------------------ -r41976 | cmaynard | 2012-04-06 22:30:48 -0700 (Fri, 06 Apr 2012) | 2 lines +r42785 | gerald | 2012-05-22 10:12:13 -0700 (Tue, 22 May 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 -Remove <listitem></listitem> added in r41940 by way of some sort of copy/paste gone wrong. +1.6.8 → 1.6.9. ------------------------------------------------------------------------ -r41982 | gerald | 2012-04-08 07:33:50 -0700 (Sun, 08 Apr 2012) | 1 line +r42788 | gerald | 2012-05-22 11:47:19 -0700 (Tue, 22 May 2012) | 2 lines Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf + M /trunk-1.6/epan/Makefile.am + A /trunk-1.6/tools/git-compare-abis.sh + M /trunk-1.6/wiretap/Makefile.am + +Copy over ABI checking code from the trunk. -[Automatic manuf, services and enterprise-numbers update for 2012-04-08] ------------------------------------------------------------------------ -r41995 | cmaynard | 2012-04-09 11:22:05 -0700 (Mon, 09 Apr 2012) | 2 lines +r42789 | gerald | 2012-05-22 13:26:16 -0700 (Tue, 22 May 2012) | 2 lines Changed paths: - M /trunk-1.6/epan/dissectors/packet-ip.c + M /trunk-1.6/abi-descriptor.template -Set the minimum length of the Internet Timestamp option to 4 bytes instead of 5. RFC 791 only states that the smallest legal value of the pointer is 5, not the smallest size for the option itself. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7043 +More ABI check backporting. ------------------------------------------------------------------------ -r42003 | pascal | 2012-04-10 01:18:54 -0700 (Tue, 10 Apr 2012) | 6 lines +r42815 | pascal | 2012-05-23 14:54:53 -0700 (Wed, 23 May 2012) | 11 lines Changed paths: - M /trunk-1.6/epan/dissectors/packet-bootp.c + M /trunk-1.6/plugins/wimax/msg_dlmap.c + M /trunk-1.6/plugins/wimax/msg_ulmap.c + +Backported from trunk: -From Michael Mann: -use suboption length instead of option length to terminate option 82 dissection in BOOTP +------------------------------------------------------------------------ +r37890 | etxrab | 2011-07-04 16:57:12 +0200 (lun. 04 juil. 2011) | 4 lignes -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7047 +From Kluchnikov Ivan: +Wrong length of items in wimax Compressed DL-MAP and UL-MAP. +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6067 +------------------------------------------------------------------------ ------------------------------------------------------------------------ -r42058 | guy | 2012-04-13 17:13:50 -0700 (Fri, 13 Apr 2012) | 7 lines +r42852 | morriss | 2012-05-25 08:54:19 -0700 (Fri, 25 May 2012) | 7 lines Changed paths: - M /trunk-1.6/gtk/capture_dlg.c + M /trunk-1.6/aclocal-fallback/gtk-2.0.m4 + M /trunk-1.6/configure.in -The combo box for the interface name is *NOT* a combo box that only -allows you to select one of the items in the list, so it is *NOT* an -error if there's no entry selected. Just skip the capture filter check -in that case. +Don't allow users to try to use GTK3 in the 1.6 trunk. -Fixes bug 7049. +Also tell users that we're looking for GTK+ versions < 3.0 (backport of +r39699) + +Based on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7280 ------------------------------------------------------------------------ -r42068 | guy | 2012-04-14 10:31:02 -0700 (Sat, 14 Apr 2012) | 15 lines +r42858 | gerald | 2012-05-25 16:09:58 -0700 (Fri, 25 May 2012) | 2 lines Changed paths: - M /trunk-1.6/wiretap/k12.c + M /trunk-1.6/Makefile.nmake + M /trunk-1.6/config.nmake + M /trunk-1.6/packaging/nsis/Makefile.nmake + M /trunk-1.6/packaging/nsis/wireshark.nsi + M /trunk-1.6/tools/win32-setup.sh + M /trunk-1.6/tools/win64-setup.sh -Backported from the trunk: +Use the OBS GTK+ bundle. ------------------------------------------------------------------------ -r42067 | guy | 2012-04-14 10:20:22 -0700 (Sat, 14 Apr 2012) | 4 lines +r42863 | gerald | 2012-05-27 07:34:01 -0700 (Sun, 27 May 2012) | 1 line +Changed paths: + M /trunk-1.6/epan/enterprise-numbers + M /trunk-1.6/manuf + M /trunk-1.6/services -More double-free fixes - destroy_k12_file_data() frees its argument, so -calling g_free() on that argument after calling destroy_k12_file_data() -is always an error. +[Automatic manuf, services and enterprise-numbers update for 2012-05-27] ------------------------------------------------------------------------ -r42062 | etxrab | 2012-04-14 00:53:22 -0700 (Sat, 14 Apr 2012) | 1 line +r42931 | gerald | 2012-05-30 14:50:57 -0700 (Wed, 30 May 2012) | 20 lines +Changed paths: + M /trunk-1.6/epan/prefs.c -From From Evan Huus: Potential double-free while importing k12xx *.rf5 -files https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7084 ------------------------------------------------------------------------- +Copy over the prefs.c portion of r42930 so that the recently updated +GLib won't trigger bug 7265. ------------------------------------------------------------------------- -r42071 | guy | 2012-04-14 10:46:08 -0700 (Sat, 14 Apr 2012) | 7 lines -Changed paths: - M /trunk-1.6/dumpcap.c + ------------------------------------------------------------------------ + r42930 | gerald | 2012-05-30 14:42:24 -0700 (Wed, 30 May 2012) | 10 lines + Changed paths: + M /trunk/epan/prefs.c + M /trunk/test/suite-capture.sh -Copied from the trunk: + In recent versions of GLib (test with 2.32) g_log_default_handler + helpfully ignores G_LOG_LEVEL_INFO and G_LOG_LEVEL_DEBUG messages by + default. If the console_log_level preference includes either of those + two levels set the G_MESSAGES_DEBUG environment variable so that those + messages are printed. ------------------------------------------------------------------------- -r42070 | guy | 2012-04-14 10:45:03 -0700 (Sat, 14 Apr 2012) | 2 lines + Add checks for various console log messages to the stdin capture suite. -From Evan Huus: add a missing free. Fixes bug 7092. + Fixes bug 7265. + ------------------------------------------------------------------------ ------------------------------------------------------------------------ -r42075 | guy | 2012-04-14 14:55:52 -0700 (Sat, 14 Apr 2012) | 11 lines +r42934 | gerald | 2012-05-30 16:10:52 -0700 (Wed, 30 May 2012) | 3 lines Changed paths: - M /trunk-1.6/gtk/capture_dlg.c + M /trunk-1.6/epan/prefs.c -Get the filter text box before we even look at the link-layer header -types, and bail if we dn't have one. +Add some needed parenthesis as pointed out by Jakub and the OS X +builders. -Fix the comment for the "selected link-layer header type is unsupported" -case, and colorize the text box as empty in that case. +------------------------------------------------------------------------ +r42954 | gerald | 2012-05-31 16:34:40 -0700 (Thu, 31 May 2012) | 2 lines +Changed paths: + M /trunk-1.6/docbook/release-notes.xml -Use "Unknown" rather than "not supported" for the dummy link-layer -header type entry we add if we don't have a list of link-layer header -types; at least for pipes, we don't, and *can't*, know what link-layer -header type we'll see. +Mention that you can get certification. ------------------------------------------------------------------------ -r42084 | gerald | 2012-04-15 07:34:00 -0700 (Sun, 15 Apr 2012) | 1 line +r43021 | gerald | 2012-06-03 07:34:06 -0700 (Sun, 03 Jun 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-04-15] +[Automatic manuf, services and enterprise-numbers update for 2012-06-03] ------------------------------------------------------------------------ -r42106 | pascal | 2012-04-17 04:49:04 -0700 (Tue, 17 Apr 2012) | 3 lines +r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines Changed paths: - M /trunk-1.6/config.nmake - M /trunk-1.6/epan/dissectors/packet-nfs.c + M /trunk-1.6/epan/Makefile.am + M /trunk-1.6/wiretap/Makefile.am + M /trunk-1.6/wsutil/Makefile.am -Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7127 : -Remove an extra entry in nfsv4_operation_ett array +Use separate commands in the dumpabi recipes instead a big huge long +chain. If abi-compliance-checker fails print the contents of its +log file. ------------------------------------------------------------------------ -r42107 | pascal | 2012-04-17 04:53:04 -0700 (Tue, 17 Apr 2012) | 2 lines +r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines Changed paths: - M /trunk-1.6/config.nmake + M /trunk-1.6/epan/Makefile.am + M /trunk-1.6/wiretap/Makefile.am + M /trunk-1.6/wsutil/Makefile.am -Revert file committed by error +Make sure ln happens in the right directory. ------------------------------------------------------------------------ -r42120 | guy | 2012-04-17 19:49:37 -0700 (Tue, 17 Apr 2012) | 11 lines +r43260 | wmeier | 2012-06-14 11:20:13 -0700 (Thu, 14 Jun 2012) | 33 lines Changed paths: - M /trunk-1.6/doc/wireshark.pod.template - M /trunk-1.6/wiretap/5views.c - M /trunk-1.6/wiretap/file_access.c + M /trunk-1.6/epan/proto.c -Pick up changes from the trunk: +Copy SVN #43150, #43184, #43186 (with some manual intervention) to 1.6 branch ------------------------------------------------------------------------ -r42119 | guy | 2012-04-17 19:48:23 -0700 (Tue, 17 Apr 2012) | 6 lines - -If we see a 5View time-stamped header with a bad key, make sure we -return the right error code and information string. - -InfoVista bought Accellent Group, and, at least according to the -InfoVista Web site, it's "5View", not "5Views". +r43150 | wmeier | 2012-06-07 17:10:02 -0400 (Thu, 07 Jun 2012) | 11 lines ------------------------------------------------------------------------- -r42193 | gerald | 2012-04-22 07:33:58 -0700 (Sun, 22 Apr 2012) | 1 line -Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services +Don't crash in 'proto_registrar_dump_values' if BASE_EXT_STRING and no extended string. +Note: this shows up when doing 'tshark -G values'. -[Automatic manuf, services and enterprise-numbers update for 2012-04-22] ------------------------------------------------------------------------- -r42331 | guy | 2012-04-28 20:39:11 -0700 (Sat, 28 Apr 2012) | 13 lines -Changed paths: - M /trunk-1.6/packaging/macosx/Info.plist.in +BASE_EXT_STRING with a missing extended string does *not* cause issues +with the normal display code: -Copy over revisions from the trunk: +ToDo (eventually): Add some code to enforce requirement that hf[] entries with BASE_EXT_STRING +(or BASE_RANGE_STRING) set must also have a 'strings' value. - ------------------------------------------------------------------------ - r42328 | guy | 2012-04-28 19:27:08 -0700 (Sat, 28 Apr 2012) | 8 lines - Make the extension lower case. - Say "Pcap" rather than "Libpcap" - pcap format is used by WinPcap as - well (and it's also read and written by this library called Wiretap - :-)). +------------------------------------------------------------------------ +r43184 | wmeier | 2012-06-10 11:10:11 -0400 (Sun, 10 Jun 2012) | 5 lines - Add an additional entry for pcap-NG. +Fix bug wherein values in a custom column aren't displayed as a value_string (when appropriate). +Essentially: BASE_CUSTOM is "base_display_e value" (like BASE_DEC) *not* a bit-mask + (like BASE_EXT_STRING). +Bug introduced in SVN #39902 ------------------------------------------------------------------------ -r42332 | guy | 2012-04-28 20:40:30 -0700 (Sat, 28 Apr 2012) | 9 lines -Changed paths: - M /trunk-1.6/packaging/nsis/wireshark.nsi +r43186 | wmeier | 2012-06-10 15:23:50 -0400 (Sun, 10 Jun 2012) | 3 lines -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r42329 | guy | 2012-04-28 19:38:55 -0700 (Sat, 28 Apr 2012) | 4 lines +Fix "BASE_CUSTOM field is incorrectly formatted when applied as a column". +Resolves Bug #6671 - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6671 - Add .ntar as a suffix (some pcap-ng files use it). +------------------------------------------------------------------------ - Sort the suffixes alphabetically. ------------------------------------------------------------------------ -r42334 | gerald | 2012-04-29 07:33:59 -0700 (Sun, 29 Apr 2012) | 1 line +r43309 | gerald | 2012-06-17 07:34:03 -0700 (Sun, 17 Jun 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-04-29] +[Automatic manuf, services and enterprise-numbers update for 2012-06-17] ------------------------------------------------------------------------ -r42336 | guy | 2012-04-29 10:33:03 -0700 (Sun, 29 Apr 2012) | 8 lines +r43310 | gerald | 2012-06-17 08:04:26 -0700 (Sun, 17 Jun 2012) | 1 line Changed paths: - M /trunk-1.6/wiretap/file_access.c - -Copy over revisions from the trunk, with manual intervention: - - ------------------------------------------------------------------------ - r42330 | guy | 2012-04-28 19:49:17 -0700 (Sat, 28 Apr 2012) | 3 lines + M /trunk-1.6/services - Add ".dmp" as a suffix for pcap files of various flavors. Add ".ntar" - as a suffix for pcap-ng files. +[Automatic manuf, services and enterprise-numbers update for 2012-06-17] +------------------------------------------------------------------------ +r43454 | gerald | 2012-06-24 08:04:28 -0700 (Sun, 24 Jun 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-06-24] ------------------------------------------------------------------------ -r42369 | guy | 2012-04-30 17:11:40 -0700 (Mon, 30 Apr 2012) | 15 lines +r43503 | guy | 2012-06-26 22:22:55 -0700 (Tue, 26 Jun 2012) | 12 lines Changed paths: - M /trunk-1.6/epan/dissectors/packet-diameter.c + M /trunk-1.6/dumpcap.c -Copy over revisions from the trunk: +Copy over r43501 from the trunk: ------------------------------------------------------------------------ - r42200 | wmeier | 2012-04-22 18:36:57 -0700 (Sun, 22 Apr 2012) | 7 lines + r43501 | guy | 2012-06-26 22:13:06 -0700 (Tue, 26 Jun 2012) | 7 lines - It's not kosher to alloc and init a GArray ourselves instead of calling - g_array_new(). + Don't supply a fallback error message for pcap_open() unless it actually + fails. - Fixes Bug #7138 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7138) + This may clear up the problem most recently reported in bug 7021 after + the crash was fixed, where the capture starts successfully but an error + dialog pops up. - A puzzle: why did the buildbot fuzz-testing only start failing on this on 04/18/2012 - since the bug has existed for quite some time ? +------------------------------------------------------------------------ +r43513 | wmeier | 2012-06-27 11:11:41 -0700 (Wed, 27 Jun 2012) | 17 lines +Changed paths: + M /trunk-1.6/gtk/dfilter_expr_dlg.c -(This should fix the crashes we're seeing in the 1.6 buildbot.) +Copy r42301 & r43507 from trunk: ------------------------------------------------------------------------ -r42374 | guy | 2012-05-01 01:27:24 -0700 (Tue, 01 May 2012) | 13 lines -Changed paths: - M /trunk-1.6/epan/dissectors/packet-ansi_a.c +r42301 | darkjames | 2012-04-27 16:35:17 -0400 (Fri, 27 Apr 2012) | 2 lines -Copy over revisions from the trunk: +Fix sigsegv in filter expression dialog when user clicked on some BASE_CUSTOM field. - ------------------------------------------------------------------------ - r42129 | etxrab | 2012-04-18 04:12:15 -0700 (Wed, 18 Apr 2012) | 4 lines +------------------------------------------------------------------------ +r43507 | wmeier | 2012-06-27 09:57:39 -0400 (Wed, 27 Jun 2012) | 7 lines - Fix Bug 7119 ANSI MAP infinite loop. - Make conumed a guint16 to avoid wrapping add expert items. +Fix for "predefined values sometimes missing in Display Filter Expression window. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7119 +See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7413 -(in the hopes that it'll fix the latest 1.6 buildbot crashes; it was -already scheduled for backporting). +Essentially: BASE_CUSTOM was being used as a mask rather than a field value. +------------------------------------------------------------------------ ------------------------------------------------------------------------ -r42449 | gerald | 2012-05-06 07:33:58 -0700 (Sun, 06 May 2012) | 1 line +r43553 | gerald | 2012-07-01 08:04:29 -0700 (Sun, 01 Jul 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-05-06] +[Automatic manuf, services and enterprise-numbers update for 2012-07-01] ------------------------------------------------------------------------ -r42451 | guy | 2012-05-06 10:12:49 -0700 (Sun, 06 May 2012) | 20 lines +r43613 | gerald | 2012-07-08 08:04:26 -0700 (Sun, 08 Jul 2012) | 1 line Changed paths: - M /trunk-1.6/epan/dissectors/packet-bthci_evt.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r42116 | guy | 2012-04-17 16:08:23 -0700 (Tue, 17 Apr 2012) | 4 lines - - Might as well make the loop indices just guint; the generated code's - unlikely to be worse, and could be better on the 32-bit-and-bigger - machines on which Wireshark runs. - - ------------------------------------------------------------------------ - r42114 | etxrab | 2012-04-17 14:09:10 -0700 (Tue, 17 Apr 2012) | 1 line - - From Evan Huus: We were using guint8s as loop counters based on field - lengths, and they were overflowing/wrapping falsely. Making them - guint16s fixes the problem. Bug 7122 -HCIEVT infinite loop - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7122 - -This should fix the fuzz failures that started showing up on the 1.6 -buildbot. + 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-07-08] ------------------------------------------------------------------------ -r42613 | gerald | 2012-05-13 07:33:58 -0700 (Sun, 13 May 2012) | 1 line +r43723 | gerald | 2012-07-15 08:04:31 -0700 (Sun, 15 Jul 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-05-13] +[Automatic manuf, services and enterprise-numbers update for 2012-07-15] ------------------------------------------------------------------------ -r42665 | gerald | 2012-05-16 14:27:25 -0700 (Wed, 16 May 2012) | 17 lines +r43843 | gerald | 2012-07-19 17:58:16 -0700 (Thu, 19 Jul 2012) | 17 lines Changed paths: - M /trunk-1.6/ChangeLog M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-slowprotocols.c + M /trunk-1.6/epan/dissectors/packet-ppp.c -Copy over r41741 from the trunk: +Copy over r43784 from the trunk: ------------------------------------------------------------------------ - r41741 | morriss | 2012-03-22 17:53:58 -0700 (Thu, 22 Mar 2012) | 9 lines + r43784 | rbalint | 2012-07-18 08:14:45 -0700 (Wed, 18 Jul 2012) | 6 lines Changed paths: - M /trunk/epan/dissectors/packet-slowprotocols.c + M /trunk/epan/dissectors/packet-ppp.c - From Elliot Parsons via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6983 : + Fix crash in PPP dissector - In the packet-slowprotocols dissector, there is a bug in the event notification - dissector. The code uses the incorrect value to skip past the data of a vendor - specific notification. - - The attached patch file sets the offset to increment by raw_octet, which - corrects the issue. + Make sure that there is enough space allocated for PPP encapsulated CRTP + packet's header. + The bug can be triggered on an x86_64 system using the cpature file attached to + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056 ------------------------------------------------------------------------ +Update the release notes. + ------------------------------------------------------------------------ -r42666 | gerald | 2012-05-16 14:30:10 -0700 (Wed, 16 May 2012) | 12 lines +r43867 | gerald | 2012-07-20 11:52:56 -0700 (Fri, 20 Jul 2012) | 134 lines Changed paths: + M /trunk-1.6/AUTHORS + M /trunk-1.6/asn1/snmp/packet-snmp-template.c + M /trunk-1.6/capture_sync.c M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-ltp.c + M /trunk-1.6/epan/dissectors/packet-diameter.c + M /trunk-1.6/epan/dissectors/packet-ieee80211.c + M /trunk-1.6/epan/dissectors/packet-mndp.c + M /trunk-1.6/epan/dissectors/packet-radius.c + M /trunk-1.6/epan/dissectors/packet-snmp.c + M /trunk-1.6/epan/dissectors/packet-syslog.c + M /trunk-1.6/epan/dissectors/packet-udp.c + M /trunk-1.6/epan/dissectors/packet-vmlab.c + M /trunk-1.6/epan/filesystem.c + M /trunk-1.6/file.c + M /trunk-1.6/file.h + M /trunk-1.6/gtk/main.c + M /trunk-1.6/gtk/main_statusbar.c + M /trunk-1.6/radius/dictionary.3gpp + M /trunk-1.6/rawshark.c + M /trunk-1.6/wiretap/netscreen.c Copy over revisions from the trunk: ------------------------------------------------------------------------ - r42121 | etxrab | 2012-04-17 22:24:32 -0700 (Tue, 17 Apr 2012) | 1 line + r42899 | darkjames | 2012-05-29 13:01:25 -0700 (Tue, 29 May 2012) | 5 lines Changed paths: - M /trunk/epan/dissectors/packet-ltp.c - - From Evan Huus: Catch impossible sub-field counts. Fixes LTP infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7124 - ------------------------------------------------------------------------ - -Update the release notes. - ------------------------------------------------------------------------- -r42667 | gerald | 2012-05-16 14:37:18 -0700 (Wed, 16 May 2012) | 12 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-assa_r3.c + M /trunk/epan/dissectors/packet-radius.c -Copy over with manual intervention: + Fix bug #5735 + dissect_attribute_value_pairs() should be also called with NULL tree. + Broken from r29964. ------------------------------------------------------------------------ - r42122 | etxrab | 2012-04-17 22:29:02 -0700 (Tue, 17 Apr 2012) | 1 line + r43050 | wmeier | 2012-06-03 18:09:56 -0700 (Sun, 03 Jun 2012) | 17 lines Changed paths: - M /trunk/epan/dissectors/packet-assa_r3.c + M /trunk/radius/dictionary.3gpp - From Evan Huus: There were two cases where we could underflow an unsigned subtraction, leading to huge values and near-infinite loops. Catch them and add an expert_info warning that the packet is bad. Also fix some other expert_info messages to hang off of the right dissection tree. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7125 - ------------------------------------------------------------------------ + From René Scheibe: -Update the release notes. + " + I just noticed when upgrading from 1.2.15 to 1.6.8 that the file + dictionary.3gpp now contains an invalid entry. There is a typo (3GGP + instead of 3GPP) and the decoding is incorrect too. ------------------------------------------------------------------------- -r42669 | gerald | 2012-05-16 15:42:28 -0700 (Wed, 16 May 2012) | 60 lines -Changed paths: - M /trunk-1.6/configure.in - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-icmp.c - M /trunk-1.6/epan/dissectors/packet-icmp.h - M /trunk-1.6/epan/dissectors/packet-icmpv6.c - M /trunk-1.6/epan/emem.c - M /trunk-1.6/epan/emem.h - M /trunk-1.6/tap-icmpstat.c - M /trunk-1.6/tap-icmpv6stat.c + wireshark: + ATTRIBUTE 3GGP-IMEISV 20 octets -Copy over revisions from the trunk: + freeradius: + ATTRIBUTE 3GPP-IMEISV 20 string + " + http://www.wireshark.org/lists/wireshark-dev/201206/msg00021.html ------------------------------------------------------------------------ - r42407 | morriss | 2012-05-03 18:33:58 -0700 (Thu, 03 May 2012) | 14 lines + r43139 | darkjames | 2012-06-06 12:59:55 -0700 (Wed, 06 Jun 2012) | 4 lines Changed paths: - M /trunk/epan/emem.c + M /trunk/wiretap/netscreen.c - Partial fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221 - (emem alignment problems on SPARC) : + Fix bug #7340 - Add the room for the pointer to the next (from r31577) *before* calculating - the canary+pad: that way the complete allocation - (allocation+canary_ptr+canary+pad) will end on an 8-byte boundary (as was the - case before r31577). - - This only solves the alignment problem when using canaries (i.e., not, by - default, se_ allocations). - - (And, yes, this is ignoring the 16-byte alignment requirements of long - doubles.) + interface name can also contain hyphen (v1-untrust, v1-trust). ------------------------------------------------------------------------ - r42431 | morriss | 2012-05-04 14:56:32 -0700 (Fri, 04 May 2012) | 15 lines + r43166 | morriss | 2012-06-08 15:23:11 -0700 (Fri, 08 Jun 2012) | 10 lines Changed paths: - M /trunk/configure.in - M /trunk/epan/emem.c - M /trunk/epan/emem.h - - The rest of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221 - (emem alignment problems on SPARC) : + M /trunk/epan/dissectors/packet-diameter.c - Have emem use 8-byte alignment when we need it. + Don't register 3 (IPAddress) hf's with the same abbreviation but with 3 + different types; instead use different abbreviations (filters). - Since I can't seem to write code that which reliably (across GCC versions and - optimization levels) determines if 8-byte alignment is needed for doubles, - "when" is defined as "if we're compiling for a CPU other than i386." + This is in order to prevent running into - Windows doesn't need a check because it's either i386 or 64-bit (x86_64 or - maybe ia64--both of which get 8-byte alignment from G_MEM_ALIGN). + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 - (And, yes, all of this is ignoring the 16-byte alignment requirements of long - doubles.) + and seg-faulting when someone applies a filter of, for example, + diameter.Framed-IP-Address . ------------------------------------------------------------------------ + r43174 | cmaynard | 2012-06-09 08:43:08 -0700 (Sat, 09 Jun 2012) | 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-syslog.c - -Copy over with manual intervention: - + Allow syslog to work with "Decode As" for TCP. + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5241 ------------------------------------------------------------------------ - r42393 | cmaynard | 2012-05-02 18:48:59 -0700 (Wed, 02 May 2012) | 2 lines + r43176 | cmaynard | 2012-06-09 10:08:46 -0700 (Sat, 09 Jun 2012) | 3 lines Changed paths: - M /trunk/epan/dissectors/packet-icmp.c - M /trunk/epan/dissectors/packet-icmp.h - M /trunk/epan/dissectors/packet-icmpv6.c - M /trunk/ui/cli/tap-icmpstat.c - M /trunk/ui/cli/tap-icmpv6stat.c + M /trunk/epan/dissectors/packet-ieee80211.c - From Klaus Heckelmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221: Avoid wireshark crash on platforms where an 8 byte alignment is required by changing the resp_time field in the icmp_transaction_t from a double to an nstime_t. + Do not use BASE_NONE for FT_UINT8 types. + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7333 (I think). ------------------------------------------------------------------------ + r43178 | cmaynard | 2012-06-09 10:51:30 -0700 (Sat, 09 Jun 2012) | 2 lines + Changed paths: + M /trunk/epan/dissectors/packet-mndp.c -Update the release notes. - ------------------------------------------------------------------------- -r42670 | gerald | 2012-05-16 16:17:25 -0700 (Wed, 16 May 2012) | 41 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-dns.c - M /trunk-1.6/epan/dissectors/packet-gtp.c - M /trunk-1.6/epan/dissectors/packet-mpls.c - M /trunk-1.6/epan/dissectors/packet-pw-eth.c - -Copy over revisions from the trunk: - + Do not use BASE_NONE for FT_*INT* types. ------------------------------------------------------------------------ - r41979 | pascal | 2012-04-08 06:10:45 -0700 (Sun, 08 Apr 2012) | 3 lines + r43179 | cmaynard | 2012-06-09 10:56:08 -0700 (Sat, 09 Jun 2012) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c + M /trunk/asn1/snmp/packet-snmp-template.c + M /trunk/epan/dissectors/packet-diameter.c + M /trunk/epan/dissectors/packet-snmp.c + M /trunk/epan/dissectors/packet-vmlab.c - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7042 : - Handle properly filler and do not remove last digit + Do not use BASE_NONE for FT_*INT* types. ------------------------------------------------------------------------ - r41984 | pascal | 2012-04-08 09:03:21 -0700 (Sun, 08 Apr 2012) | 2 lines + r43187 | cmaynard | 2012-06-10 12:43:40 -0700 (Sun, 10 Jun 2012) | 3 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c + M /trunk/epan/dissectors/packet-udp.c - As suggested by Jakub, always update the digit value when the nibble is outside [0;9] range + Fix UDP-Lite checksum verification bug introduced with r40387 and reported by "answer" via http://ask.wireshark.org/questions/11798/is-udp-lite-checksum-correct-ipv6 + There is a difference between the UDP and UDP-Lite pseudo header that wasn't realized when r40387 was committed. Details of the difference in http://tools.ietf.org/html/rfc3828#section-3.2 ------------------------------------------------------------------------ - r42108 | pascal | 2012-04-17 05:44:04 -0700 (Tue, 17 Apr 2012) | 5 lines + r43191 | cmaynard | 2012-06-10 17:53:23 -0700 (Sun, 10 Jun 2012) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-dns.c + M /trunk/AUTHORS - From Bertho Stultiens: - Use certificate values from RFC 4398 - From me: rename fields according to RFC and update references to RFC - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7130 + Remove duplicate entry. ------------------------------------------------------------------------ Copy over with manual intervention: ------------------------------------------------------------------------ - r42112 | etxrab | 2012-04-17 13:49:56 -0700 (Tue, 17 Apr 2012) | 1 line + r42764 | guy | 2012-05-21 20:52:12 -0700 (Mon, 21 May 2012) | 12 lines Changed paths: - M /trunk/epan/dissectors/packet-mpls.c - M /trunk/epan/dissectors/packet-pw-eth.c - - From Francesco Fondelli: fixes up issue 1) and 3) described in the bug report https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7089 - ------------------------------------------------------------------------ - - -Update the release notes. + M /trunk/file.c + M /trunk/file.h + M /trunk/ui/gtk/main.c + M /trunk/ui/gtk/main_statusbar.c + M /trunk/ui/qt/wireshark_application.cpp ------------------------------------------------------------------------- -r42671 | gerald | 2012-05-16 16:22:35 -0700 (Wed, 16 May 2012) | 21 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-asf.c + The GUI's state machine requires that, when reloading a capture after a + save, we post capture file callback events similar to the ones posted + when reading a capture - otherwise, the reload will leave the welcome + screen up. -Copy over r42113 and r42115 with manual intervention: + Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished, + add a cf_cb_file_reload_started callback, have them work similarly to + read_finished and read_started except that the reload uses "Reloading" + in the progress bar and status bar. + Clean up some indentation while we're at it. ------------------------------------------------------------------------ - r42113 | etxrab | 2012-04-17 14:00:56 -0700 (Tue, 17 Apr 2012) | 1 line - Changed paths: - M /trunk/epan/dissectors/packet-asf.c - - From Evan Huus: Break from the loop if the length is zero. Fix [Bug 7120] ASF infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7120 ------------------------------------------------------------------------ - r42115 | guy | 2012-04-17 15:36:50 -0700 (Tue, 17 Apr 2012) | 4 lines + r43172 | cmaynard | 2012-06-08 20:41:23 -0700 (Fri, 08 Jun 2012) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-asf.c + M /trunk/capture_sync.c + M /trunk/epan/filesystem.c + M /trunk/rawshark.c - Flag too-short TLVs with an expert info item - and treat any TLV length - less than 4 as "too short", as the TLV length includes the type and - length fields. + Be sure to specify FORMAT_MESSAGE_IGNORE_INSERTS in the dwFlags arg to all FormatMessage() calls where FORMAT_MESSAGE_FROM_SYSTEM is also specified. (Ref: http://blogs.msdn.com/b/oldnewthing/archive/2007/11/28/6564257.aspx) ------------------------------------------------------------------------ Update the release notes. ------------------------------------------------------------------------ -r42672 | gerald | 2012-05-16 16:57:14 -0700 (Wed, 16 May 2012) | 60 lines +r43869 | gerald | 2012-07-20 12:31:41 -0700 (Fri, 20 Jul 2012) | 110 lines Changed paths: + M /trunk-1.6/Makefile.am + M /trunk-1.6/asn1/snmp/packet-snmp-template.c + M /trunk-1.6/doc/README.developer M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-megaco.c - M /trunk-1.6/epan/dissectors/packet-radius.c - M /trunk-1.6/plugins/opcua/opcua_simpletypes.c - M /trunk-1.6/wiretap/csids.c - M /trunk-1.6/wiretap/wtap.h + M /trunk-1.6/epan/dissectors/packet-ethertype.c + M /trunk-1.6/epan/dissectors/packet-gsm_a_bssmap.c + M /trunk-1.6/epan/dissectors/packet-ieee80211.c + M /trunk-1.6/epan/dissectors/packet-nfs.c + M /trunk-1.6/epan/dissectors/packet-per.c + M /trunk-1.6/epan/dissectors/packet-snmp.c + M /trunk-1.6/epan/etypes.h + M /trunk-1.6/epan/ftypes/ftype-double.c + M /trunk-1.6/gtk/main_proto_draw.c Copy over revisions from the trunk: ------------------------------------------------------------------------ - r42123 | alagoutte | 2012-04-18 00:22:12 -0700 (Wed, 18 Apr 2012) | 14 lines + r43203 | pascal | 2012-06-11 06:54:06 -0700 (Mon, 11 Jun 2012) | 3 lines Changed paths: - M /trunk/wiretap/wtap.h + M /trunk/epan/dissectors/packet-per.c - From Colus Tang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7134 - Unable to display the correct IEEE802.11 MCS data rates due to header definition + Use restricted character string decoding for IA5String type + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6246 + ------------------------------------------------------------------------ + r43212 | darkjames | 2012-06-11 12:27:57 -0700 (Mon, 11 Jun 2012) | 4 lines + Changed paths: + M /trunk/epan/ftypes/ftype-double.c - The problem is due to the ieee_802_11_phdr.data_rate is defined as guint8, - since this variable is counting number of 0.5Mbps units, any datarates which is - higher than 255Mbps would get wrapped up. In the above example, only the lower - 8bit value will be put into the ieee_802_11_phdr which is 0x04 and result in - the incorrect 2Mbps display. + Fix bug 6917 - There are 802.11n WLAN product is capable to transmit @450Mbps, we should fix - this data_rate from guint8 to guint16. + strtod() is locale-aware, change it to g_ascii_strtod() + ------------------------------------------------------------------------ + r43214 | pascal | 2012-06-11 13:12:17 -0700 (Mon, 11 Jun 2012) | 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-gsm_a_bssmap.c - #BACKPORT + From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7360 : + Service handover IE is not correctly dissected ------------------------------------------------------------------------ - r42144 | guy | 2012-04-19 16:19:10 -0700 (Thu, 19 Apr 2012) | 2 lines + r43224 | wmeier | 2012-06-12 06:03:05 -0700 (Tue, 12 Jun 2012) | 2 lines Changed paths: - M /trunk/wiretap/csids.c + M /trunk/doc/README.developer - Don't byte-swap bytes that aren't there. + Note that calls to "expert" functions should not be under 'if (tree)'. ------------------------------------------------------------------------ - r42388 | cmaynard | 2012-05-02 13:37:59 -0700 (Wed, 02 May 2012) | 4 lines + r43576 | darkjames | 2012-07-05 14:09:34 -0700 (Thu, 05 Jul 2012) | 6 lines Changed paths: - M /trunk/epan/dissectors/packet-radius.c + M /trunk/epan/dissectors/packet-nfs.c - Properly decrypt user-password according to http://tools.ietf.org/html/rfc2865#section-5.2 - This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6779 - #BACKPORT + Fix bug #7436 + + offset returned from dissect_nfs_open_claim4, dissect_nfs_openflag4 were different + when we were building tree and where we didn't. + Fix other similar cases. ------------------------------------------------------------------------ + Copy over with manual intervention: ------------------------------------------------------------------------ - r42258 | etxrab | 2012-04-26 06:22:40 -0700 (Thu, 26 Apr 2012) | 4 lines + r43277 | darkjames | 2012-06-15 16:04:59 -0700 (Fri, 15 Jun 2012) | 5 lines Changed paths: - M /trunk/epan/dissectors/packet-megaco.c + M /trunk/ui/gtk/main_proto_draw.c - From Bodo Petermann: - Megaco parser problem with LF in header. + highlight_field: use passed GtkTreeView for proto_tree_draw. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7198 + highlight_field() is also called when we open packet in new window and we click some bytes, + it caused redrawing packet details in *main window* but with protocol tree from (possibly) another frame. ------------------------------------------------------------------------ - r42437 | pascal | 2012-05-04 21:57:40 -0700 (Fri, 04 May 2012) | 4 lines + r43556 | alagoutte | 2012-07-03 05:28:06 -0700 (Tue, 03 Jul 2012) | 10 lines Changed paths: - M /trunk/plugins/opcua/opcua_simpletypes.c - - From Nhi Nguyen: - OPC UA bytestring node id decoding is wrong - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7226 - ------------------------------------------------------------------------ - + M /trunk/epan/dissectors/packet-ieee80211.c -Update the release notes. + From report of Dennis Mendoza via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429 + Wireshark > 1.4 does not correctly read Association ID for PS Poll packets ------------------------------------------------------------------------- -r42673 | gerald | 2012-05-16 17:16:07 -0700 (Wed, 16 May 2012) | 20 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-ieee80211.c + Wireless Frame with subtype 0x1a don't interpret the Association ID (always 0). -Copy over with manual intervention: + Fix : + proto_tree_add_uint() wasn't changed to proto_tree_add_item() + #BACKPORT ------------------------------------------------------------------------ - r42631 | gerald | 2012-05-15 12:13:10 -0700 (Tue, 15 May 2012) | 10 lines + r43561 | guy | 2012-07-03 13:12:50 -0700 (Tue, 03 Jul 2012) | 18 lines Changed paths: - M /trunk/epan/dissectors/packet-ieee80211.c + M /trunk/Makefile.am + + As per Gentoo bug 423743 + + https://bugs.gentoo.org/show_bug.cgi?id=423743 - From Evan Huus via bug 6805: + "The Makefile.am claims including GLIB_LIBS when linking wireshark is + unnecessary, because wireshark links to GTK_LIBS which is a superset. + It is not actually a superset: gmodule is included in GLIB_LIBS but + not in GTK_LIBS (unless accidentally on older glibs/gtks)." - Look before we loop + so we must explicitly link with GLIB_LIBS. - Check the value of various key count parameters against the size of their - parent tag *before* we start looping on them. + Update the comment to reflect that - and to reflect that GTK+ doesn't + necessarily run atop X11 - while we're at it. - Stick an expert error on the field and bound the loop at a sane point if the - count is bogus. + Fixes bug 7427. + + #BACKPORT ------------------------------------------------------------------------ + r43648 | pascal | 2012-07-10 08:43:03 -0700 (Tue, 10 Jul 2012) | 3 lines + Changed paths: + M /trunk/asn1/snmp/packet-snmp-template.c + M /trunk/epan/dissectors/packet-snmp.c -Update the release notes. + Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 : + Do not call tvb_ensure_length_remaining on an empty tvb + ------------------------------------------------------------------------ + r43850 | jake | 2012-07-19 23:26:35 -0700 (Thu, 19 Jul 2012) | 2 lines + Changed paths: + M /trunk/epan/dissectors/packet-ethertype.c + M /trunk/epan/etypes.h ------------------------------------------------------------------------- -r42674 | gerald | 2012-05-16 17:32:11 -0700 (Wed, 16 May 2012) | 5 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-bacapp.c + Add some relevant ethertypes. + ------------------------------------------------------------------------ -Copy over packet-bacapp.c r42323 from the trunk. This includes r42053 (which -fixes bug 7121) along with a bunch of other changes. Update the release notes. ------------------------------------------------------------------------ -r42680 | gerald | 2012-05-17 10:42:49 -0700 (Thu, 17 May 2012) | 1 line +r43886 | pascal | 2012-07-21 03:13:58 -0700 (Sat, 21 Jul 2012) | 10 lines Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-ieee80211.c + M /trunk-1.6/asn1/snmp/snmp.cnf + M /trunk-1.6/epan/dissectors/packet-snmp.c + +Copy over r43883 from trunk: -Add a missing chunk from r42631. ------------------------------------------------------------------------ -r42701 | gerald | 2012-05-17 15:55:15 -0700 (Thu, 17 May 2012) | 2 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml +r43883 | pascal | 2012-07-21 10:50:32 +0200 (sam. 21 juil. 2012) | 3 lignes -Update the release notes. +Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7508 : +Display snmp.contextName as FT_STRING + +------------------------------------------------------------------------ ------------------------------------------------------------------------ -r42725 | gerald | 2012-05-20 07:34:01 -0700 (Sun, 20 May 2012) | 1 line +r43913 | gerald | 2012-07-22 08:04:40 -0700 (Sun, 22 Jul 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-05-20] +[Automatic manuf, services and enterprise-numbers update for 2012-07-22] ------------------------------------------------------------------------ -r42749 | gerald | 2012-05-21 09:14:46 -0700 (Mon, 21 May 2012) | 2 lines +r43933 | gerald | 2012-07-23 09:23:47 -0700 (Mon, 23 Jul 2012) | 2 lines Changed paths: - M /trunk-1.6/plugins/mate/mate.h - M /trunk-1.6/plugins/mate/mate_runtime.c - M /trunk-1.6/plugins/mate/mate_util.c - M /trunk-1.6/plugins/mate/mate_util.h - -Revert r40547 which increased the minimum version of GLib. - ------------------------------------------------------------------------- -r42750 | gerald | 2012-05-21 09:15:40 -0700 (Mon, 21 May 2012) | 16 lines -Changed paths: - M /trunk-1.6/wiretap/file_wrappers.c - -Copy over r42714 from the trunk: - - ------------------------------------------------------------------------ - r42714 | darkjames | 2012-05-19 06:27:43 -0700 (Sat, 19 May 2012) | 7 lines - Changed paths: - M /trunk/wiretap/file_wrappers.c - - Z_BLOCK was added in zlib-1.2.0.5 - - Pass Z_NO_FLUSH to inflate() when Z_BLOCK is not defined, - just in case also disable fast seeking when it's not defined. - - References: http://www.wireshark.org/lists/wireshark-dev/201205/msg00145.html - ------------------------------------------------------------------------ + M /trunk-1.6/docbook/release-notes.xml +Update the release notes. ------------------------------------------------------------------------

@@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 41854 2012-03-30 17:53:59Z gerald $ +# $Id: Makefile.am 43869 2012-07-20 19:31:41Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -317,11 +317,23 @@ # Libraries and plugin flags with which to link wireshark. # -# Note that Wireshark doesn't have to be linked with @GLIB_LIBS@, as -# they are included in @GTK_LIBS@, and doesn't have to be linked with -# @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in -# @GTK_LIBS@ (as those are also needed for X applications, and GTK+ -# applications are X applications). +# Note that Wireshark, when built with a version of GTK+ that runs +# atop X11, doesn't have to be linked with @SOCKET_LIBS@ or @NSL_LIBS@, +# as those should also be included in @GTK_LIBS@ (as those are also +# needed for X applications, and GTK+ applications are X applications +# if the version of GTK+ they're built with runs atop X11). +# +# However, it *does* have to be linked with @GLIB_LIBS@; not all of +# the necessary GLib libraries are included in @GTK_LIBS@. To quote +# Gentoo bug 423743 at +# +# https://bugs.gentoo.org/show_bug.cgi?id=423743 +# +# "The Makefile.am claims including GLIB_LIBS when linking wireshark is +# unnecessary, because wireshark links to GTK_LIBS which is a superset. +# It is not actually a superset: gmodule is included in GLIB_LIBS but +# not in GTK_LIBS (unless accidentally on older glibs/gtks)." +# wireshark_LDADD = \ gtk/libui.a \ gtk/libui_dirty.a \ @@ -333,7 +345,9 @@ $(plugin_ldadd) \ @PCRE_LIBS@ \ @PCAP_LIBS@ \ - @GTK_LIBS@ -lm \ + @GTK_LIBS@ \ + @GLIB_LIBS@ \ + -lm \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \

@@ -17,7 +17,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 41854 2012-03-30 17:53:59Z gerald $ +# $Id: Makefile.am 43869 2012-07-20 19:31:41Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -105,7 +105,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in @@ -1117,11 +1116,23 @@ # Libraries and plugin flags with which to link wireshark. # -# Note that Wireshark doesn't have to be linked with @GLIB_LIBS@, as -# they are included in @GTK_LIBS@, and doesn't have to be linked with -# @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in -# @GTK_LIBS@ (as those are also needed for X applications, and GTK+ -# applications are X applications). +# Note that Wireshark, when built with a version of GTK+ that runs +# atop X11, doesn't have to be linked with @SOCKET_LIBS@ or @NSL_LIBS@, +# as those should also be included in @GTK_LIBS@ (as those are also +# needed for X applications, and GTK+ applications are X applications +# if the version of GTK+ they're built with runs atop X11). +# +# However, it *does* have to be linked with @GLIB_LIBS@; not all of +# the necessary GLib libraries are included in @GTK_LIBS@. To quote +# Gentoo bug 423743 at +# +# https://bugs.gentoo.org/show_bug.cgi?id=423743 +# +# "The Makefile.am claims including GLIB_LIBS when linking wireshark is +# unnecessary, because wireshark links to GTK_LIBS which is a superset. +# It is not actually a superset: gmodule is included in GLIB_LIBS but +# not in GTK_LIBS (unless accidentally on older glibs/gtks)." +# wireshark_LDADD = \ gtk/libui.a \ gtk/libui_dirty.a \ @@ -1133,7 +1144,9 @@ $(plugin_ldadd) \ @PCRE_LIBS@ \ @PCAP_LIBS@ \ - @GTK_LIBS@ -lm \ + @GTK_LIBS@ \ + @GLIB_LIBS@ \ + -lm \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \

@@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 40402 2012-01-06 20:57:11Z gerald $ +# $Id: Makefile.nmake 42858 2012-05-25 23:09:58Z gerald $ # We "Deploy using XCopy," which is described at # http://msdn.microsoft.com/en-us/library/ms235291.aspx @@ -782,7 +782,7 @@ @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) !IFDEF GTK_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip + gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF !IFDEF KFW_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -1036,28 +1036,43 @@ if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d xcopy $(GTK_DIR)\lib\gtk-2.0\modules\libgail.dll $(INSTALL_DIR)\lib\gtk-2.0\modules /d xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines /d -!IFDEF NEED_LIBPNG_DLL - xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_LIBTIFF_DLL - xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_LIBJPEG_DLL - xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d -!ENDIF !IFDEF NEED_CAIRO_DLL xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL_DIR) /d !ENDIF +!IFDEF NEED_EXPAT_DLL + xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_FFI_DLL + xcopy $(GTK_DIR)\bin\$(FFI_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_FONTCONFIG_DLL + xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d +!ENDIF !IFDEF NEED_FREETYPE_DLL xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d !ENDIF -!IFDEF NEED_FONTCONFIG_DLL - xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d +!IFDEF NEED_JASPER_DLL + xcopy $(GTK_DIR)\bin\$(JASPER_DLL) $(INSTALL_DIR) /d !ENDIF -!IFDEF NEED_EXPAT_DLL - xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d +!IFDEF NEED_JPEG_DLL + xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_LZMA_DLL + xcopy $(GTK_DIR)\bin\$(LZMA_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_PIXMAN_DLL + xcopy $(GTK_DIR)\bin\$(PIXMAN_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_PNG_DLL + xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_TIFF_DLL + xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_XML_DLL + xcopy $(GTK_DIR)\bin\$(XML_DLL) $(INSTALL_DIR) /d !ENDIF if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d

@@ -0,0 +1,146 @@ +Wireshark 1.6.9 Release Notes + + ------------------------------------------------------------------ + +What is Wireshark? + + Wireshark is the world's most popular network protocol analyzer. + It is used for troubleshooting, analysis, development and + education. + +What's New + + Bug Fixes + + The following vulnerabilities have been fixed. + + o wnpa-sec-2012-11 + + The PPP dissector could crash. (Debian bug 680056) --> + + Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0. + + o wnpa-sec-2012-12 + + The NFS dissector could use excessive amounts of CPU. (Bug + 7436) + + Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0. + + The following bugs have been fixed: + + o Cannot run tshark under TCP using decode-as format for syslog. + (Bug 5241) + + o Unable to reassemble EAP-TLS fragments across multiple RADIUS + packets (works on 1.2.15). (Bug 5735) + + o Rearranging columns in preferences doesn't work on 64-bit + Windows. (Bug 6077) + + o Incorrect PER UNALIGNED decoding of IA5String. (Bug 6246) + + o After fix for Bug 3046, after save-as then open you cannot see + the packet list. (Bug 6640) + + o Problem with Floating point (double-precision). (Bug 6917) + + o Unhandled exception ( group=1, code=4) occurs when trying to + capture in pdml file. (Bug 7333) + + o Netscreen - Can't parse packet-header. (Bug 7340) + + o Assignment Request message is not decoded after Service + handover parameter. (Bug 7360) + + o Wireshark fails to link because of missing @GLIB_LIBS@ + reference in Makefile.am. (Bug 7427) + + o Wireshark > 1.4 does not correctly read Association ID for PS + Poll packets. (Bug 7429) + + o SNMP incorrectly marks SNMPv3 "discovery" packet as malformed. + (Bug 7438) + + New and Updated Features + + There are no new features in this release. + + New Protocol Support + + There are no new protocols in this release. + + Updated Protocol Support + + ASN.1 PER, DIAMETER, GSM BSSMAP, IEEE 802.11, MNDP, NFS, PPP, + RADIUS, SNMP, Syslog, UDP-Lite, VMLAB, WiMax DL-MAP, WiMax UL-MAP + + New and Updated Capture File Support + + Juniper NetScreen + +Getting Wireshark + + Wireshark source code and installation packages are available from + http://www.wireshark.org/download.html. + + Vendor-supplied Packages + + Most Linux and Unix vendors supply their own Wireshark packages. + You can usually install or upgrade Wireshark using the package + management system specific to that platform. A list of third-party + packages can be found on the download page on the Wireshark web + site. + +File Locations + + Wireshark and TShark look in several different locations for + preference files, plugins, SNMP MIBS, and RADIUS dictionaries. + These locations vary from platform to platform. You can use + About→Folders to find the default locations on your system. + +Known Problems + + Wireshark might make your system disassociate from a wireless + network on OS X 10.4. (Bug 1315) + + Dumpcap might not quit if Wireshark or TShark crashes. (Bug 1419) + + The BER dissector might infinitely loop. (Bug 1516) + + Capture filters aren't applied when capturing from named pipes. + (Bug 1814) + + Filtering tshark captures with display filters (-R) no longer + works. (Bug 2234) + + The 64-bit Windows installer does not ship with libsmi. (Win64 + development page) + + "Closing File!" Dialog Hangs. (Bug 3046) + + Application crash when changing real-time option. (Bug 4035) + + Hex pane display issue after startup. (Bug 4056) + + Packet list rows are oversized. (Bug 4357) + + Summary pane selected frame highlighting not maintained. (Bug + 4445) + + Wireshark and TShark will display incorrect delta times when + displayed as a custom column. (Bug 4985) + +Getting Help + + Community support is available on Wireshark's Q&A site and on the + wireshark-users mailing list. Subscription information and + archives for all of Wireshark's mailing lists can be found on the + web site. + + Official Wireshark training and certification are available from + Wireshark University. + +Frequently Asked Questions + + A complete FAQ is available on the Wireshark web site.

@@ -11,4 +11,10 @@ </libs> <include_paths>INCLUDE_DIRS </include_paths> +<gcc_options> + -D_U_="__attribute((unused))" +</gcc_options> +<include_preamble> + config.h +</include_preamble> </descriptor>

@@ -39,7 +39,7 @@ fi min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) + AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version and < 3.0) if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs

@@ -9694,7 +9694,6 @@ m4_include([aclocal-fallback/glib-2.0.m4]) m4_include([aclocal-fallback/gtk-2.0.m4]) -m4_include([aclocal-fallback/gtk-3.0.m4]) m4_include([aclocal-fallback/libgcrypt.m4]) m4_include([aclocal-fallback/libsmi.m4]) m4_include([acinclude.m4])

@@ -131,7 +131,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -64,7 +64,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -131,7 +131,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -17,7 +17,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: packet-snmp-template.c 39927 2011-11-18 01:36:07Z gerald $ + * $Id: packet-snmp-template.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1216,10 +1216,11 @@ if (! ( user_tvb && engine_tvb ) ) return NULL; - given_username_len = tvb_ensure_length_remaining(user_tvb,0); - given_username = ep_tvb_memdup(user_tvb,0,-1); - given_engine_len = tvb_ensure_length_remaining(engine_tvb,0); - given_engine = ep_tvb_memdup(engine_tvb,0,-1); + given_username_len = tvb_length(user_tvb); + given_engine_len = tvb_length(engine_tvb); + if (! ( given_engine_len && given_username_len ) ) return NULL; + given_username = (guint8*)ep_tvb_memdup(user_tvb,0,-1); + given_engine = (guint8*)ep_tvb_memdup(engine_tvb,0,-1); for (a = localized_ues; a; a = a->next) { if ( localized_match(a, given_username, given_username_len, given_engine, given_engine_len) ) { @@ -2100,7 +2101,7 @@ "Engine ID Data: IPv6 address", "snmp.engineid.ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_cisco_type, { - "Engine ID Data: Cisco type", "snmp.engineid.cisco.type", FT_UINT8, BASE_NONE, + "Engine ID Data: Cisco type", "snmp.engineid.cisco.type", FT_UINT8, BASE_HEX, VALS(snmp_engineid_cisco_type_vals), 0, NULL, HFILL }}, { &hf_snmp_engineid_mac, { "Engine ID Data: MAC address", "snmp.engineid.mac", FT_ETHER, BASE_NONE,

@@ -1,7 +1,7 @@ # snmp.cnf # snmp conformation file -# $Id: snmp.cnf 30798 2009-11-01 19:16:57Z stig $ +# $Id: snmp.cnf 43886 2012-07-21 10:13:58Z pascal $ #.PDU @@ -245,4 +245,5 @@ Message/community TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL HeaderData/msgSecurityModel TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(sec_models) UsmSecurityParameters/msgUserName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL +ScopedPDU/contextName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL #.END

@@ -131,7 +131,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,7 +1,7 @@ /* capture_sync.c * Synchronisation between Wireshark capture parent and child instances * - * $Id: capture_sync.c 37984 2011-07-11 23:13:44Z gerald $ + * $Id: capture_sync.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -224,8 +224,8 @@ size_t errlen; char *p; - FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, errbuf, - ERRBUF_SIZE, NULL); + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, error, 0, errbuf, ERRBUF_SIZE, NULL); /* * "FormatMessage()" "helpfully" sticks CR/LF at the end of the

@@ -65,7 +65,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,4 +1,4 @@ -# $Id: config.nmake 42107 2012-04-17 11:53:04Z pascal $ +# $Id: config.nmake 42858 2012-05-25 23:09:58Z 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=42761 +SVN_REVISION=43938 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=6 -VERSION_MICRO=8 +VERSION_MICRO=9 VERSION_BUILD=$(SVN_REVISION) # Local build information. Recommended: Unique string for your @@ -238,15 +238,25 @@ # directory in which the "include" and "lib" directories reside. # GTK_DIR=$(WIRESHARK_LIBS)\gtk2 + # These macros are used by the nsis installer script and by the install target. -PNG_DLL=libpng14-14.dll -FREETYPE_DLL=freetype6.dll +#EXPAT_DLL=libexpat-1.dll +FFI_DLL=libffi-5.dll FONTCONFIG_DLL=libfontconfig-1.dll -EXPAT_DLL=libexpat-1.dll -INTL_DLL=intl.dll +FREETYPE_DLL=libfreetype-6.dll +INTL_DLL=libintl-8.dll +JASPER_DLL=libjasper-1.dll +JPEG_DLL=libjpeg-8.dll +LZMA_DLL=liblzma-5.dll +PIXMAN_DLL=libpixman-1-0.dll +PNG_DLL=libpng15-15.dll +TIFF_DLL=libtiff-5.dll +XML_DLL=libxml2-2.dll + # This macro is used by the setup target. #GTK_PKG=2.22.1-20101227 -GTK_PKG=2.24.10-20120208 +#GTK_PKG=2.24.10-20120208 +GTK_PKG=2.24.10-2.7 # # Mandatory: Version numbers of GTK and pango. @@ -444,17 +454,23 @@ # GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # These macros are used by the nsis installer script and by the install target. -PNG_DLL=libpng14-14.dll -#TIFF_DLL=libtiff-3.dll -#JPEG_DLL=libjpeg-7.dll -FREETYPE_DLL=libfreetype-6.dll +#EXPAT_DLL=libexpat-1.dll +FFI_DLL=libffi-5.dll FONTCONFIG_DLL=libfontconfig-1.dll -EXPAT_DLL=libexpat-1.dll +FREETYPE_DLL=libfreetype-6.dll INTL_DLL=libintl-8.dll +JASPER_DLL=libjasper-1.dll +JPEG_DLL=libjpeg-8.dll +LZMA_DLL=liblzma-5.dll +PIXMAN_DLL=libpixman-1-0.dll +PNG_DLL=libpng15-15.dll +TIFF_DLL=libtiff-5.dll +XML_DLL=libxml2-2.dll # These macros are used by the setup target. #GTK_PKG=2.16.6-20100912 -GTK_PKG=2.22.1-20101229 +#GTK_PKG=2.22.1-20101229 +GTK_PKG=2.24.10-2.7 # # Mandatory: Version numbers of GTK and pango. @@ -463,7 +479,7 @@ # These macros are used by the nsis installer script and by the setup target. # #GTK_INST_VERSION=2.16 -GTK_INST_VERSION=2.22 +GTK_INST_VERSION=2.24 # # Optional: WinPcap developer's pack to capture network traffic. @@ -1067,19 +1083,26 @@ GTK_LIB_DIR=2.10.0 !IFDEF PNG_DLL -NEED_LIBPNG_DLL=USE +NEED_PNG_DLL=USE !ENDIF !IFDEF JPEG_DLL -NEED_LIBJPEG_DLL=USE +NEED_JPEG_DLL=USE !ENDIF !IFDEF TIFF_DLL -NEED_LIBTIFF_DLL=USE +NEED_TIFF_DLL=USE !ENDIF NEED_CAIRO_DLL=USE # Pango >=1.24.5 Needs these: NEED_FREETYPE_DLL=USE NEED_FONTCONFIG_DLL=USE -NEED_EXPAT_DLL=USE +#NEED_EXPAT_DLL=USE +NEED_XML_DLL=USE +NEED_PIXMAN_DLL=USE +NEED_FFI_DLL=USE +NEED_JASPER_DLL=USE +NEED_JPEG_DLL=USE +NEED_TIFF_DLL=USE +NEED_LZMA_DLL=USE GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines

@@ -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.8. +# Generated by GNU Autoconf 2.68 for wireshark 1.6.9. # # # 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.8' -PACKAGE_STRING='wireshark 1.6.8' +PACKAGE_VERSION='1.6.9' +PACKAGE_STRING='wireshark 1.6.9' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -902,7 +902,6 @@ with_gnutls with_gcrypt with_libgcrypt_prefix -with_gtk3 with_libsmi enable_extra_gcc_checks enable_warnings_as_errors @@ -1506,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.8 to adapt to many kinds of systems. +\`configure' configures wireshark 1.6.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1576,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.6.8:";; + short | recursive ) echo "Configuration of wireshark 1.6.9:";; esac cat <<\_ACEOF @@ -1637,7 +1636,6 @@ --with-gcrypt=[yes/no] use gcrypt library [default=yes] --with-libgcrypt-prefix=PFX prefix where LIBGCRYPT is installed (optional) - --with-gtk3=[yes/no] use GTK+ 3.0 instead of 2.0 [default=no] --with-libsmi=[DIR] use libsmi MIB/PIB library [default=yes], optionally specify the prefix for libsmi --with-osx-integration use OS X integration functions ([default=yes, if @@ -1771,7 +1769,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.6.8 +wireshark configure 1.6.9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2311,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.8, which was +It was created by wireshark $as_me 1.6.9, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3090,7 +3088,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.6.8' + VERSION='1.6.9' cat >>confdefs.h <<_ACEOF @@ -16843,16 +16841,6 @@ fi - -# Check whether --with-gtk3 was given. -if test "${with_gtk3+set}" = set; then : - withval=$with_gtk3; with_gtk3="$withval" -else - with_gtk="no" -fi - - - # libsmi # FIXME: currently the path argument to with-libsmi is being ignored @@ -19639,274 +19627,6 @@ # programs to be built with GTK+. # if test "x$enable_wireshark" = "xyes"; then -if test "x$with_gtk3" = "xyes"; then - # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : - enableval=$enable_gtktest; -else - enable_gtktest=yes -fi - - - pkg_config_args=gtk+-3.0 - for module in . gthread - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=3.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then : - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - fclose (fopen ("conf.gtktest", "w")); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - no_gtk=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } - - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - -$as_echo "#define HAVE_GTK 1" >>confdefs.h - - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <gtk/gtk.h> -#include <stdio.h> - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - GTK_OK=no - fi - - - rm -f conf.gtktest - - -else # Check whether --enable-gtktest was given. if test "${enable_gtktest+set}" = set; then : enableval=$enable_gtktest; @@ -19982,8 +19702,8 @@ fi min_gtk_version=2.4.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version and < 3.0" >&5 +$as_echo_n "checking for GTK+ - version >= $min_gtk_version and < 3.0... " >&6; } if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -20172,7 +19892,6 @@ rm -f conf.gtktest -fi else GTK_OK=no fi @@ -26368,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.8, which was +This file was extended by wireshark $as_me 1.6.9, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26434,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.8 +wireshark config.status 1.6.9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"

@@ -1,8 +1,8 @@ -# $Id: configure.in 42669 2012-05-16 22:42:28Z gerald $ +# $Id: configure.in 42852 2012-05-25 15:54:19Z morriss $ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.6.8) +AC_INIT(wireshark, 1.6.9) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or @@ -222,12 +222,6 @@ ) fi -AC_ARG_WITH([gtk3], - AC_HELP_STRING( [--with-gtk3=@<:@yes/no@:>@], - [use GTK+ 3.0 instead of 2.0 @<:@default=no@:>@]), - with_gtk3="$withval", with_gtk="no") - - # libsmi # FIXME: currently the path argument to with-libsmi is being ignored AX_LIBSMI @@ -781,22 +775,12 @@ # programs to be built with GTK+. # if test "x$enable_wireshark" = "xyes"; then -if test "x$with_gtk3" = "xyes"; then - AM_PATH_GTK_3_0(3.0.0, - [ - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - AC_DEFINE(HAVE_GTK, 1, [Define to 1 if compiling with GTK]) - ], GTK_OK=no, gthread) - -else AM_PATH_GTK_2_0(2.4.0, [ CFLAGS="$CFLAGS $GTK_CFLAGS" CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" AC_DEFINE(HAVE_GTK, 1, [Define to 1 if compiling with GTK]) ], GTK_OK=no, gthread) -fi else GTK_OK=no fi

@@ -1,4 +1,4 @@ -wireshark (1.6.8) unstable; urgency=low +wireshark (1.6.9) unstable; urgency=low * Self-made package

@@ -5,9 +5,9 @@ /usr/bin/text2pcap /usr/bin/rawshark /usr/lib/wireshark/libwireshark.so.1 -/usr/lib/wireshark/libwireshark.so.1.1.8 +/usr/lib/wireshark/libwireshark.so.1.1.9 /usr/lib/wireshark/libwiretap.so.1 -/usr/lib/wireshark/libwiretap.so.1.0.8 +/usr/lib/wireshark/libwiretap.so.1.0.9 /usr/lib/wireshark/libwsutil.so.1 /usr/lib/wireshark/libwsutil.so.1.0.0 /usr/lib/wireshark/plugins/*

@@ -68,7 +68,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,6 +1,6 @@ -$Revision: 37015 $ -$Date: 2011-05-08 03:23:53 -0700 (Sun, 08 May 2011) $ -$Author: alagoutte $ +$Revision: 43869 $ +$Date: 2012-07-20 12:31:41 -0700 (Fri, 20 Jul 2012) $ +$Author: gerald $ Tabsize: 4 This file is a HOWTO for Wireshark developers. It describes how to start coding @@ -907,20 +907,22 @@ data needed only if you're building the protocol tree, if possible. Note, however, that you must fill in column information, create - conversations, reassemble packets, build any other persistent state - needed for dissection, and call subdissectors regardless of whether - "tree" is NULL or not. This might be inconvenient to do without - doing most of the dissection work; the routines for adding items to - the protocol tree can be passed a null protocol tree pointer, in - which case they'll return a null item pointer, and - "proto_item_add_subtree()" returns a null tree pointer if passed a - null item pointer, so, if you're careful not to dereference any null - tree or item pointers, you can accomplish this by doing all the - dissection work. This might not be as efficient as skipping that - work if you're not building a protocol tree, but if the code would - have a lot of tests whether "tree" is null if you skipped that work, - you might still be better off just doing all that work regardless of - whether "tree" is null or not. + conversations, reassemble packets, do calls to "expert" functions, + build any other persistent state needed for dissection, and call + subdissectors regardless of whether "tree" is NULL or not. + + This might be inconvenient to do without doing most of the + dissection work; the routines for adding items to the protocol tree + can be passed a null protocol tree pointer, in which case they'll + return a null item pointer, and "proto_item_add_subtree()" returns + a null tree pointer if passed a null item pointer, so, if you're + careful not to dereference any null tree or item pointers, you can + accomplish this by doing all the dissection work. This might not + be as efficient as skipping that work if you're not building a + protocol tree, but if the code would have a lot of tests whether + "tree" is null if you skipped that work, you might still be better + off just doing all that work regardless of whether "tree" is null + or not. Note also that there is no guarantee, the first time the dissector is called, whether "tree" will be null or not; your dissector must work

@@ -50,7 +50,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -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" [ - +  -<!ENTITY WiresharkCurrentVersion "1.6.8"> +<!ENTITY WiresharkCurrentVersion "1.6.9"> ]> @@ -36,51 +36,20 @@ <listitem> <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-08.html">wnpa-sec-2012-08</ulink> + <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-11.html">wnpa-sec-2012-11</ulink> </para> <para> - Infinite and large loops in the ANSI MAP, ASF, BACapp, Bluetooth HCI, IEEE 802.11, IEEE 802.3, LTP, and R3 - dissectors have been fixed. Discovered by Laurent Butti. -  -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  - - (Bugs - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6805">6805</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7118">7118</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7119">7119</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7120">7120</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7121">7121</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7122">7122</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7124">7124</ulink>, - <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7125">7125</ulink>) + The PPP dissector could crash. +  +  +  +  +  + (<ulink url="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056">Debian bug + 680056</ulink>) --> </para> - <para>Versions affected: 1.4.0 to 1.4.12, 1.6.0 to 1.6.7.</para> + <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>  @@ -88,35 +57,18 @@ <listitem> <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-09.html">wnpa-sec-2012-09</ulink> + <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-12.html">wnpa-sec-2012-12</ulink> </para> <para> - The DIAMETER dissector could try to allocate memory improperly and crash. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7138">Bug - 7138</ulink>) + The NFS dissector could use excessive amounts of CPU. +  +  +  +  + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7436">Bug + 7436</ulink>) </para> - <para>Versions affected: 1.4.0 to 1.4.12, 1.6.0 to 1.6.7.</para> -  - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-10.html">wnpa-sec-2012-10</ulink> - </para> - <para> - Wireshark could crash on SPARC processors due to misaligned memory. Discovered by Klaus Heckelmann. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221">Bug - 7221</ulink>) - </para> - <para>Versions affected: 1.4.0 to 1.4.12, 1.6.0 to 1.6.7.</para> + <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>  @@ -143,75 +95,75 @@ --> <listitem><para> - User-Password - PAP decoding passwords longer than 16 bytes. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6779">Bug - 6779</ulink>) + Cannot run tshark under TCP using decode-as format for syslog. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5241">Bug + 5241</ulink>) </para></listitem> <listitem><para> - The MSISDN is not seen correctly in GTP packet. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7042">Bug - 7042</ulink>) + Unable to reassemble EAP-TLS fragments across multiple RADIUS packets (works on 1.2.15). + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5735">Bug + 5735</ulink>) </para></listitem> - <listitem><para> - Wireshark doesn't calculate the right IPv4 destination using source routing options when bad options precede them. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7043">Bug - 7043</ulink>) - </para></listitem> + <listitem><para> + Rearranging columns in preferences doesn't work on 64-bit Windows. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6077">Bug + 6077</ulink>) + </para></listitem> <listitem><para> - BOOTP dissector issue with DHCP option 82 - suboption 9. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7047">Bug - 7047</ulink>) + Incorrect PER UNALIGNED decoding of IA5String. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6246">Bug + 6246</ulink>) </para></listitem> <listitem><para> - MPLS dissector in 1.6.7 and 1.7.1 misdecodes some MPLS CW packets. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7089">Bug - 7089</ulink>) + After fix for Bug 3046, after save-as then open you cannot see the packet list. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6640">Bug + 6640</ulink>) </para></listitem> <listitem><para> - ANSI MAP infinite loop. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7119">Bug - 7119</ulink>) + Problem with Floating point (double-precision). + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6917">Bug + 6917</ulink>) </para></listitem> <listitem><para> - HCIEVT infinite loop. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7122">Bug - 7122</ulink>) + Unhandled exception ( group=1, code=4) occurs when trying to capture in pdml file. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7333">Bug + 7333</ulink>) </para></listitem> <listitem><para> - Wireshark doesn't decode NFSv4.1 operations. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7127">Bug - 7127</ulink>) + Netscreen - Can't parse packet-header. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7340">Bug + 7340</ulink>) </para></listitem> <listitem><para> - LTP infinite loop. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7124">Bug - 7124</ulink>) + Assignment Request message is not decoded after Service handover parameter. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7360">Bug + 7360</ulink>) </para></listitem> <listitem><para> - Wrong values in DNS CERT RR. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7130">Bug - 7130</ulink>) + Wireshark fails to link because of missing @GLIB_LIBS@ reference in Makefile.am. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7427">Bug + 7427</ulink>) </para></listitem> <listitem><para> - Megaco parser problem with LF in header. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7198">Bug - 7198</ulink>) + Wireshark > 1.4 does not correctly read Association ID for PS Poll packets. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429">Bug + 7429</ulink>) </para></listitem> <listitem><para> - OPC UA bytestring node id decoding is wrong. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7226">Bug - 7226</ulink>) + SNMP incorrectly marks SNMPv3 "discovery" packet as malformed. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438">Bug + 7438</ulink>) </para></listitem> </itemizedlist> @@ -240,23 +192,20 @@  -ANSI MAP, -ASF, -BACapp, -Bluetooth HCI, -DHCP, +ASN.1 PER, DIAMETER, -DNS, -GTP, +GSM BSSMAP, IEEE 802.11, -IEEE 802.3, -IPv4, -LTP, -Megaco, -MPLS, +MNDP, NFS, -OPC UA, -RADIUS +PPP, +RADIUS, +SNMP, +Syslog, +UDP-Lite, +VMLAB, +WiMax DL-MAP, +WiMax UL-MAP </para> </section> @@ -264,7 +213,7 @@ <section id="NewCapture"><title>New and Updated Capture File Support</title> <para> -5View, CSIDS, pcap, pcap-ng +Juniper NetScreen </para> </section> @@ -394,7 +343,7 @@ web site</ulink>. </para> <para> - Training is available from + Official Wireshark training and certification are available from <ulink url="http://www.wiresharktraining.com/">Wireshark University</ulink>. </para> </section>

@@ -1,6 +1,6 @@ /* dumpcap.c * - * $Id: dumpcap.c 42071 2012-04-14 17:46:08Z guy $ + * $Id: dumpcap.c 43503 2012-06-27 05:22:55Z guy $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -553,12 +553,15 @@ (capture_opts->datatx_udp ? PCAP_OPENFLAG_DATATX_UDP : 0) | (capture_opts->nocap_rpcap ? PCAP_OPENFLAG_NOCAPTURE_RPCAP : 0), CAP_READ_TIMEOUT, &auth, *open_err_str); - if ((*open_err_str)[0] == '\0') { - /* Work around known WinPcap bug wherein no error message is - filled in on a failure to open an rpcap: URL. */ - g_strlcpy(*open_err_str, - "Unknown error (pcap bug; actual error cause not reported)", - sizeof *open_err_str); + if (pcap_h == NULL) { + /* Error - did pcap actually supply an error message? */ + if ((*open_err_str)[0] == '\0') { + /* Work around known WinPcap bug wherein no error message is + filled in on a failure to open an rpcap: URL. */ + g_strlcpy(*open_err_str, + "Unknown error (pcap bug; actual error cause not reported)", + sizeof *open_err_str); + } } } else #endif /* HAVE_PCAP_OPEN */

@@ -2,7 +2,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am 41975 2012-04-06 20:03:55Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z 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:8:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:9:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -308,16 +308,29 @@ # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz - mkdir abi-check-headers; cp ../color.h ../config.h ../register.h abi-check-headers/; \ - mkdir abi-check-headers/epan; cp *.h abi-check-headers/epan; \ - mkdir abi-check-headers/crypt; cp crypt/*.h abi-check-headers/crypt; \ - mkdir abi-check-headers/dfilter; cp dfilter/*.h abi-check-headers/dfilter; \ - mkdir abi-check-headers/dissectors; cp dissectors/*.h abi-check-headers/dissectors; \ - mkdir abi-check-headers/ftypes; cp ftypes/*.h abi-check-headers/ftypes; \ + mkdir abi-check-headers + cp ../color.h ../config.h ../register.h abi-check-headers/ + mkdir abi-check-headers/epan + cp *.h abi-check-headers/epan + mkdir abi-check-headers/crypt + cp crypt/*.h abi-check-headers/crypt + mkdir abi-check-headers/dfilter + cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter + mkdir abi-check-headers/dissectors + cp dissectors/*.h abi-check-headers/dissectors + rm \ + abi-check-headers/dissectors/x11-extension-implementation.h \ + abi-check-headers/dissectors/packet-rtps2.h \ + abi-check-headers/dissectors/x11-glx-render-enum.h \ + abi-check-headers/dissectors/x11-register-info.h \ + abi-check-headers/dissectors/packet-idmp.h + mkdir abi-check-headers/ftypes + cp ftypes/*.h abi-check-headers/ftypes abi-compliance-checker -l libwireshark -v1 `ls .libs/libwireshark.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml ; \ - cp -f abi_dumps/libwireshark/libwireshark_* .libs/; \ - cd .libs; ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwireshark/[0-9]*/log.txt + cp -f abi_dumps/libwireshark/libwireshark_* .libs/ + cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)

@@ -18,7 +18,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am 41975 2012-04-06 20:03:55Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -120,7 +120,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in @@ -521,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:8:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:9:1 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ @@ -1985,16 +1984,29 @@ # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz - mkdir abi-check-headers; cp ../color.h ../config.h ../register.h abi-check-headers/; \ - mkdir abi-check-headers/epan; cp *.h abi-check-headers/epan; \ - mkdir abi-check-headers/crypt; cp crypt/*.h abi-check-headers/crypt; \ - mkdir abi-check-headers/dfilter; cp dfilter/*.h abi-check-headers/dfilter; \ - mkdir abi-check-headers/dissectors; cp dissectors/*.h abi-check-headers/dissectors; \ - mkdir abi-check-headers/ftypes; cp ftypes/*.h abi-check-headers/ftypes; \ + mkdir abi-check-headers + cp ../color.h ../config.h ../register.h abi-check-headers/ + mkdir abi-check-headers/epan + cp *.h abi-check-headers/epan + mkdir abi-check-headers/crypt + cp crypt/*.h abi-check-headers/crypt + mkdir abi-check-headers/dfilter + cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter + mkdir abi-check-headers/dissectors + cp dissectors/*.h abi-check-headers/dissectors + rm \ + abi-check-headers/dissectors/x11-extension-implementation.h \ + abi-check-headers/dissectors/packet-rtps2.h \ + abi-check-headers/dissectors/x11-glx-render-enum.h \ + abi-check-headers/dissectors/x11-register-info.h \ + abi-check-headers/dissectors/packet-idmp.h + mkdir abi-check-headers/ftypes + cp ftypes/*.h abi-check-headers/ftypes abi-compliance-checker -l libwireshark -v1 `ls .libs/libwireshark.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml ; \ - cp -f abi_dumps/libwireshark/libwireshark_* .libs/; \ - cd .libs; ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwireshark/[0-9]*/log.txt + cp -f abi_dumps/libwireshark/libwireshark_* .libs/ + cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)

@@ -94,7 +94,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -91,7 +91,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -114,7 +114,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -92,7 +92,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -65,7 +65,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,7 +1,7 @@ /* packet-diameter.c * Routines for Diameter packet disassembly * - * $Id: packet-diameter.c 42369 2012-05-01 00:11:40Z guy $ + * $Id: packet-diameter.c 43867 2012-07-20 18:52:56Z gerald $ * * Copyright (c) 2001 by David Frascone <dave@frascone.com> * Copyright (c) 2007 by Luis E. Garcia Ontanon <luis@ontanon.org> @@ -1188,15 +1188,15 @@ NULL, FT_UINT16, BASE_DEC|BASE_EXT_STRING, &diameter_avp_data_addrfamily_vals_ext, 0); reginfo(&(t->hf_ipv4), ep_strdup_printf("%s Address",name), - alnumerize(ep_strdup_printf("diameter.%s",name)), + alnumerize(ep_strdup_printf("diameter.%s.IPv4",name)), NULL, FT_IPv4, BASE_NONE, NULL, 0); reginfo(&(t->hf_ipv6), ep_strdup_printf("%s Address",name), - alnumerize(ep_strdup_printf("diameter.%s",name)), + alnumerize(ep_strdup_printf("diameter.%s.IPv6",name)), NULL, FT_IPv6, BASE_NONE, NULL, 0); reginfo(&(t->hf_other), ep_strdup_printf("%s Address",name), - alnumerize(ep_strdup_printf("diameter.%s",name)), + alnumerize(ep_strdup_printf("diameter.%s.Bytes",name)), NULL, FT_BYTES, BASE_NONE, NULL, 0); g_ptr_array_add(build_dict.ett,ettp); @@ -1523,7 +1523,7 @@ if ( (strcase_equal(x->name,"avp-proto") && strcase_equal(x->key,a->name)) || (a->type && strcase_equal(x->name,"type-proto") && strcase_equal(x->key,a->type)) ) { - static avp_type_t proto_type = {"proto", proto_avp, proto_avp, FT_UINT32, BASE_NONE, build_proto_avp}; + static avp_type_t proto_type = {"proto", proto_avp, proto_avp, FT_UINT32, BASE_HEX, build_proto_avp}; type = &proto_type; avp_data = x->value;

@@ -3,7 +3,7 @@ * payloads (i.e., payloads when there could be an Ethernet trailer and * possibly an FCS). * - * $Id: packet-ethertype.c 39543 2011-10-24 22:34:56Z gerald $ + * $Id: packet-ethertype.c 43869 2012-07-20 19:31:41Z gerald $ * * Gilbert Ramirez <gram@alumni.rice.edu> * @@ -109,6 +109,8 @@ { ETHERTYPE_MMRP, "802.1ak Multiple Mac Registration Protocol" }, { ETHERTYPE_AVBTP, "IEEE 1722 Audio Video Bridging Transport Protocol" }, { ETHERTYPE_ROHC, "Robust Header Compression(RoHC)" }, + { ETHERTYPE_TRILL, "TRansparent Interconnection of Lots of Links" }, + { ETHERTYPE_L2ISIS, "Intermediate System to Intermediate System" }, { ETHERTYPE_MAC_CONTROL, "MAC Control" }, { ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" }, { ETHERTYPE_RTMAC, "Real-Time Media Access Control" }, @@ -129,6 +131,7 @@ { ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" }, { ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" }, { ETHERTYPE_TTE_PCF, "TTEthernet Protocol Control Frame" }, + { ETHERTYPE_CESOETH, "Circuit Emulation Services over Ethernet (MEF8)" }, { ETHERTYPE_LLTD, "Link Layer Topology Discovery (LLTD)" }, { ETHERTYPE_WSMP, "(WAVE) Short Message Protocol (WSM)" }, { ETHERTYPE_VMLAB, "VMware Lab Manager" }, @@ -158,6 +161,7 @@ { ETHERTYPE_FCOE, "Fibre Channel over Ethernet" }, { ETHERTYPE_IEEE80211_DATA_ENCAP, "IEEE 802.11 data encapsulation" }, { ETHERTYPE_FIP, "FCoE Initialization Protocol" }, + { ETHERTYPE_ELMI, "Ethernet Local Management Interface (MEF16)" }, { ETHERTYPE_PTP, "PTPv2 over Ethernet (IEEE1588)" }, { ETHERTYPE_PRP, "Parallel Redundancy Protocol (IEC62439 Chapter 6)" }, { ETHERTYPE_FLIP, "Flow Layer Internal Protocol" },

@@ -15,7 +15,7 @@ * (GSM 08.08 version 7.7.0 Release 1998) TS 100 590 v7.7.0 * 3GPP TS 48.008 version 8.4.0 Release 8 * - * $Id: packet-gsm_a_bssmap.c 37399 2011-05-25 21:32:13Z gerald $ + * $Id: packet-gsm_a_bssmap.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -4360,7 +4360,7 @@ /* LSA Access Control Suppression 3.2.2.61 MSC-BSS O (note 8) 2 */ ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_LSA_ACC_CTRL].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); /* Service Handover 3.2.2.75 MSC-BSS O (note 9) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); + ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); /* Encryption Information 3.2.2.10 MSC-BSS O (note 10) 3-n */ ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_ENC_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); /* Talker Priority 3.2.2.89 MSC-BSS O (note 11) 2 */ @@ -4584,7 +4584,7 @@ /* LSA Access Control Suppression 3.2.2.61 MSC-BSS O (note 15) 2 */ ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_LSA_ACC_CTRL].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); /* Service Handover 3.2.2.75 MSC-BSS O (note 21) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); + ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); /* IMSI 3.2.2.6 MSC-BSC O (note 16) 3-10 */ ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_IMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); /* Source RNC to target RNC transparent information (UMTS) 3.2.2.76 MSC-BSS O (note 18) n-m */

@@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c 42680 2012-05-17 17:42:49Z gerald $ + * $Id: packet-ieee80211.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -8778,7 +8778,7 @@ dissect_frame_control(hdr_tree, tvb, wlan_broken_fc, 0); if (frame_type_subtype == CTRL_PS_POLL) - proto_tree_add_uint(hdr_tree, hf_ieee80211_assoc_id, tvb, 2, 2, TRUE); + proto_tree_add_item(hdr_tree, hf_ieee80211_assoc_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); else proto_tree_add_uint (hdr_tree, hf_ieee80211_did_duration, tvb, 2, 2, @@ -12583,7 +12583,7 @@ {&hf_ieee80211_tag_supp_rates, {"Supported Rates", "wlan_mgt.supported_rates", - FT_UINT8, BASE_NONE, VALS(ieee80211_supported_rates_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(ieee80211_supported_rates_vals), 0x0, "In Mbit/sec, (B) for Basic Rates", HFILL }}, {&hf_ieee80211_tag_fh_dwell_time, @@ -14702,7 +14702,7 @@ {&hf_ieee80211_tag_extended_capabilities_serv_int_granularity, {"Service Interval Granularity", "wlan_mgt.extcap.infoexchange.serv_int_granularity", - FT_UINT8, BASE_NONE, VALS(service_interval_granularity_vals), 0x000e, + FT_UINT8, BASE_DEC, VALS(service_interval_granularity_vals), 0x000e, NULL, HFILL }}, {&hf_ieee80211_tag_neighbor_report_bssid, @@ -15311,7 +15311,7 @@ {&hf_ieee80211_tag_ext_supp_rates, {"Extented Supported Rates", "wlan_mgt.extented_supported_rates", - FT_UINT8, BASE_NONE, VALS(ieee80211_supported_rates_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(ieee80211_supported_rates_vals), 0x0, "In Mbit/sec, (B) for Basic Rates", HFILL }}, {&hf_ieee80211_sched_info,

@@ -1,7 +1,7 @@ /* packet-mndp.c * Routines for the disassembly of the Mikrotik Neighbor Discovery Protocol * - * $Id: packet-mndp.c 36179 2011-03-12 12:09:52Z stig $ + * $Id: packet-mndp.c 43867 2012-07-20 18:52:56Z gerald $ * * Copyright 2011 Joerg Mayer (see AUTHORS file) * @@ -339,7 +339,7 @@ 0x0, NULL, HFILL }}, { &hf_mndp_unpack, - { "Unpack", "mndp.unpack", FT_UINT8, BASE_NONE, VALS(mndp_unpack_vals), + { "Unpack", "mndp.unpack", FT_UINT8, BASE_DEC, VALS(mndp_unpack_vals), 0x0, NULL, HFILL }}, { &hf_mndp_ipv6address,

@@ -3,7 +3,7 @@ * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding) * - * $Id: packet-nfs.c 42106 2012-04-17 11:49:04Z pascal $ + * $Id: packet-nfs.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -4930,6 +4930,7 @@ acc_req = civ->private_data; /* Should never happen because ONC-RPC requires the call in order to dissect the reply. */ if (acc_req==NULL) { + /* XXX, when nfsv4 return offset+8? */ return offset+4; } if(nfsv4) { @@ -6317,13 +6318,10 @@ fitem = proto_tree_add_text(tree, tvb, offset, 4, "Owner"); - if (fitem) - { - newftree = proto_item_add_subtree(fitem, ett_nfs_lock_owner4); + newftree = proto_item_add_subtree(fitem, ett_nfs_lock_owner4); - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); - offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs_data); - } + offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); + offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs_data); return offset; } @@ -6340,15 +6338,10 @@ "pathname components (%u)", comp_count); offset += 4; - if (fitem) - { - newftree = proto_item_add_subtree(fitem, ett_nfs_pathname4); - - for (i = 0; i < comp_count; i++) - offset = dissect_nfs_utf8string(tvb, offset, newftree, - hf_nfs_component4, NULL); - } + newftree = proto_item_add_subtree(fitem, ett_nfs_pathname4); + for (i = 0; i < comp_count; i++) + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); return offset; } @@ -6394,12 +6387,8 @@ fitem = proto_tree_add_text(tree, tvb, offset, 0, "%s", name); - if (fitem == NULL) return offset; - newftree = proto_item_add_subtree(fitem, ett_nfs_fsid4); - if (newftree == NULL) return offset; - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_fsid4_major, offset); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_fsid4_minor, @@ -6644,8 +6633,6 @@ fitem = proto_tree_add_text(tree, tvb, offset, 0, "fs_location4"); - if (fitem == NULL) return offset; - newftree = proto_item_add_subtree(fitem, ett_nfs_fs_location4); offset = dissect_rpc_array(tvb, pinfo, newftree, offset, dissect_nfs_server4, hf_nfs_server); @@ -6663,8 +6650,6 @@ fitem = proto_tree_add_text(tree, tvb, offset, 0, "%s", name); - if (fitem == NULL) return offset; - newftree = proto_item_add_subtree(fitem, ett_nfs_fs_locations4); offset = dissect_nfs_pathname4(tvb, offset, newftree); @@ -7822,33 +7807,28 @@ } } - if (fitem) { - newftree = proto_item_add_subtree(fitem, ett_nfs_open_claim4); - + newftree = proto_item_add_subtree(fitem, ett_nfs_open_claim4); - switch(open_claim_type4) - { - case CLAIM_NULL: - offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, name); - break; + switch(open_claim_type4) + { + case CLAIM_NULL: + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, name); + break; - case CLAIM_PREVIOUS: - offset = dissect_rpc_uint32(tvb, newftree, - hf_nfs_delegate_type, offset); - break; + case CLAIM_PREVIOUS: + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_delegate_type, offset); + break; - case CLAIM_DELEGATE_CUR: - offset = dissect_nfs_open_claim_delegate_cur4(tvb, offset, - newftree); - break; + case CLAIM_DELEGATE_CUR: + offset = dissect_nfs_open_claim_delegate_cur4(tvb, offset, newftree); + break; - case CLAIM_DELEGATE_PREV: - offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); - break; + case CLAIM_DELEGATE_PREV: + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); + break; - default: - break; - } + default: + break; } return offset; @@ -7916,18 +7896,16 @@ offset+0, 4, opentype4); offset += 4; - if (fitem) { - newftree = proto_item_add_subtree(fitem, ett_nfs_opentype4); + newftree = proto_item_add_subtree(fitem, ett_nfs_opentype4); - switch(opentype4) - { - case OPEN4_CREATE: - offset = dissect_nfs_createhow4(tvb, offset, pinfo, newftree); - break; + switch(opentype4) + { + case OPEN4_CREATE: + offset = dissect_nfs_createhow4(tvb, offset, pinfo, newftree); + break; - default: - break; - } + default: + break; } return offset; @@ -7987,11 +7965,8 @@ offset = dissect_rpc_uint32(tvb, tree, hf_nfs_cb_program, offset); fitem = proto_tree_add_text(tree, tvb, offset, 0, "cb_location"); - if (fitem) - { - cb_location = proto_item_add_subtree(fitem, ett_nfs_clientaddr4); - offset = dissect_nfs_clientaddr4(tvb, offset, cb_location); - } + cb_location = proto_item_add_subtree(fitem, ett_nfs_clientaddr4); + offset = dissect_nfs_clientaddr4(tvb, offset, cb_location); return offset; } @@ -8185,8 +8160,6 @@ offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_changeid4_after, offset); - - return offset; } @@ -8346,15 +8319,12 @@ fitem = proto_tree_add_text(tree, tvb, offset, 4 + bitmap_len * 4, "%s", "operation mask"); offset += 4; - if (fitem == NULL) return offset; newftree = proto_item_add_subtree(fitem, ett_nfs_bitmap4); - if (newftree == NULL) return offset; if(bitmap_len) bitmap = ep_alloc(bitmap_len * sizeof(guint32)); - if (bitmap == NULL) return offset; for (i = 0; i < bitmap_len; i++) { bitmap[i] = tvb_get_ntohl(tvb, offset); sl = 0x00000001; @@ -8363,9 +8333,7 @@ if (bitmap[i] & sl) { op_fitem = proto_tree_add_uint(newftree, hf_nfs_recc_attr, tvb, offset, 4, fattr); - if (op_fitem == NULL) break; - op_newftree = proto_item_add_subtree(op_fitem, ett_nfs_bitmap4); - if (op_newftree == NULL) break; + op_newftree = proto_item_add_subtree(op_fitem, ett_nfs_bitmap4); } sl <<= 1; } @@ -8540,27 +8508,23 @@ offset+0, 4, delegation_type); offset += 4; - if (fitem) { - newftree = proto_item_add_subtree(fitem, ett_nfs_open_delegation4); + newftree = proto_item_add_subtree(fitem, ett_nfs_open_delegation4); - switch(delegation_type) - { + switch(delegation_type) + { case OPEN_DELEGATE_NONE: break; case OPEN_DELEGATE_READ: - offset = dissect_nfs_open_read_delegation4(tvb, offset, pinfo, - newftree); + offset = dissect_nfs_open_read_delegation4(tvb, offset, pinfo, newftree); break; case OPEN_DELEGATE_WRITE: - offset = dissect_nfs_open_write_delegation4(tvb, offset, pinfo, - newftree); + offset = dissect_nfs_open_write_delegation4(tvb, offset, pinfo, newftree); break; default: break; - } } return offset; @@ -9574,19 +9538,15 @@ flavor); offset += 4; - if (fitem) + switch(flavor) { - switch(flavor) - { case RPCSEC_GSS: secftree = proto_item_add_subtree(fitem, ett_nfs_secinfo4_flavor_info); - if (secftree) - offset = dissect_nfs_rpcsec_gss_info(tvb, offset, secftree); + offset = dissect_nfs_rpcsec_gss_info(tvb, offset, secftree); break; default: break; - } } return offset;

@@ -7,7 +7,7 @@ * Routines for dissection of ASN.1 Aligned PER * 2003 Ronnie Sahlberg * - * $Id: packet-per.c 41664 2012-03-19 07:17:32Z etxrab $ + * $Id: packet-per.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -604,17 +604,6 @@ } -/* dissect a constrained IA5String that consists of the full ASCII set, - i.e. no FROM stuff limiting the alphabet -*/ -guint32 -dissect_per_IA5String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension) -{ - offset=dissect_per_octet_string(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension, NULL); - - return offset; -} - /* XXX we don't do >64k length strings yet */ static guint32 dissect_per_restricted_character_string_sorted(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension _U_,const char *alphabet, int alphabet_length, tvbuff_t **value_tvb) @@ -742,7 +731,8 @@ /* ALIGNED PER does not do any remapping of chars if bitsperchar is 8 */ - if(bits_per_char==8){ + /* If alphabet is not provided, do not do any remapping either */ + if((bits_per_char==8) || (alphabet==NULL)){ buf[char_pos]=val; } else { if (val < alphabet_length){ @@ -799,6 +789,18 @@ return dissect_per_restricted_character_string_sorted(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension, alphabet_ptr, alphabet_length, value_tvb); } +/* dissect a constrained IA5String that consists of the full ASCII set, + i.e. no FROM stuff limiting the alphabet +*/ +guint32 +dissect_per_IA5String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension) +{ + offset=dissect_per_restricted_character_string_sorted(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension, + NULL, 128, NULL); + + return offset; +} + guint32 dissect_per_NumericString(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension) {

@@ -2,7 +2,7 @@ * Routines for ppp packet disassembly * RFC 1661, RFC 1662 * - * $Id: packet-ppp.c 38869 2011-09-02 20:22:41Z gerald $ + * $Id: packet-ppp.c 43843 2012-07-20 00:58:16Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -3864,6 +3864,11 @@ /* allocate a copy of the IP packet */ ip_packet = tvb_memdup(tvb, 0, length); + /* + * make sure that we will be able to write the write the length information + * to the copy at least + */ + tvb_ensure_bytes_exist (tvb, ip_hdr_len, 5); /* restore the proper values to the IP and UDP length fields */ ip_packet[2] = length >> 8;

@@ -6,7 +6,7 @@ * Changed 07/2005 Luis Ontanon <luis@ontanon.org> - use FreeRADIUS' dictionary * Changed 10/2006 Alejandro Vaquero <alejandrovaquero@yahoo.com> - add Conversations support * - * $Id: packet-radius.c 42672 2012-05-16 23:57:14Z gerald $ + * $Id: packet-radius.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1624,7 +1624,7 @@ rad_info->req_time.nsecs = radius_call->req_time.nsecs; } - if (tree && avplength > 0) + if (avplength > 0) { /* list the attribute value pairs */ avptf = proto_tree_add_text(radius_tree, tvb, HDR_LENGTH,

@@ -25,7 +25,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: packet-snmp.c 39927 2011-11-18 01:36:07Z gerald $ + * $Id: packet-snmp.c 43886 2012-07-21 10:13:58Z pascal $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1318,10 +1318,11 @@ if (! ( user_tvb && engine_tvb ) ) return NULL; - given_username_len = tvb_ensure_length_remaining(user_tvb,0); - given_username = ep_tvb_memdup(user_tvb,0,-1); - given_engine_len = tvb_ensure_length_remaining(engine_tvb,0); - given_engine = ep_tvb_memdup(engine_tvb,0,-1); + given_username_len = tvb_length(user_tvb); + given_engine_len = tvb_length(engine_tvb); + if (! ( given_engine_len && given_username_len ) ) return NULL; + given_username = (guint8*)ep_tvb_memdup(user_tvb,0,-1); + given_engine = (guint8*)ep_tvb_memdup(engine_tvb,0,-1); for (a = localized_ues; a; a = a->next) { if ( localized_match(a, given_username, given_username_len, given_engine, given_engine_len) ) { @@ -2758,7 +2759,7 @@ /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1538 "../../asn1/snmp/packet-snmp-template.c" +#line 1539 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3324,7 +3325,7 @@ "Engine ID Data: IPv6 address", "snmp.engineid.ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_snmp_engineid_cisco_type, { - "Engine ID Data: Cisco type", "snmp.engineid.cisco.type", FT_UINT8, BASE_NONE, + "Engine ID Data: Cisco type", "snmp.engineid.cisco.type", FT_UINT8, BASE_HEX, VALS(snmp_engineid_cisco_type_vals), 0, NULL, HFILL }}, { &hf_snmp_engineid_mac, { "Engine ID Data: MAC address", "snmp.engineid.mac", FT_ETHER, BASE_NONE, @@ -3515,7 +3516,7 @@ "SnmpEngineID", HFILL }}, { &hf_snmp_contextName, { "contextName", "snmp.contextName", - FT_BYTES, BASE_NONE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, { &hf_snmp_get_request, { "get-request", "snmp.get_request", @@ -3675,7 +3676,7 @@ NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2190 "../../asn1/snmp/packet-snmp-template.c" +#line 2191 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3715,7 +3716,7 @@ &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2206 "../../asn1/snmp/packet-snmp-template.c" +#line 2207 "../../asn1/snmp/packet-snmp-template.c" }; module_t *snmp_module;

@@ -7,7 +7,7 @@ * facility) to the MTP3 dissector by Abhik Sarkar <sarkar.abhik[AT]gmail.com> * with some rework by Jeff Morriss <jeff.morriss[AT]ulticom.com> * - * $Id: packet-syslog.c 40414 2012-01-09 18:16:04Z wmeier $ + * $Id: packet-syslog.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald[AT]wireshark.org> @@ -357,6 +357,7 @@ syslog_handle = create_dissector_handle(dissect_syslog, proto_syslog); dissector_add_uint("udp.port", UDP_PORT_SYSLOG, syslog_handle); + dissector_add_handle("tcp.port", syslog_handle); /* Find the mtp3 dissector */ mtp_handle = find_dissector("mtp3");

@@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP/UDPLite packet disassembly * - * $Id: packet-udp.c 41777 2012-03-26 20:27:20Z gerald $ + * $Id: packet-udp.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -462,12 +462,18 @@ switch (pinfo->src.type) { case AT_IPv4: - phdr[0] = g_htonl((ip_proto<<16) | udph->uh_ulen); + if (ip_proto == IP_PROTO_UDP) + phdr[0] = g_htonl((ip_proto<<16) | udph->uh_ulen); + else + phdr[0] = g_htonl((ip_proto<<16) | reported_len); cksum_vec[2].len = 4; break; case AT_IPv6: - phdr[0] = g_htonl(udph->uh_ulen); + if (ip_proto == IP_PROTO_UDP) + phdr[0] = g_htonl(udph->uh_ulen); + else + phdr[0] = g_htonl(reported_len); phdr[1] = g_htonl(ip_proto); cksum_vec[2].len = 8; break;

@@ -1,7 +1,7 @@ /* packet-vmlab.c * Routines for VMware Lab Manager Frame Dis-assembly * - * $Id: packet-vmlab.c 37087 2011-05-12 17:21:49Z cmaynard $ + * $Id: packet-vmlab.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -146,7 +146,7 @@ { &hf_vmlab_flags_part1, { "Unknown", "vmlab.unknown1", FT_UINT8, BASE_HEX, NULL, 0xF8, NULL, HFILL }}, { &hf_vmlab_flags_fragment, { "More Fragments", "vmlab.fragment", - FT_UINT8, BASE_NONE, VALS(fragment_vals), 0x04, NULL, HFILL }}, + FT_UINT8, BASE_DEC, VALS(fragment_vals), 0x04, NULL, HFILL }}, { &hf_vmlab_flags_part2, { "Unknown", "vmlab.unknown2", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL }},

@@ -65,7 +65,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2012-05-19) +(last updated 2012-07-22) SMI Network Management Private Enterprise Codes: @@ -8142,9 +8142,9 @@ Fancher Steven&Fancher.com 2032 - airwide solutions + Mavenir Systems (previous was 'airwide solutions') Nick Worth - snmp&airwidesolutions.com + nick.worth&mavenir.com 2033 McKinney Lighting & Sound Justin Barbalace @@ -14282,7 +14282,7 @@ Jim Cole jcole&netEPS.com 3570 - Tait Electronics Ltd + Tait Limited Nathalie Giraudon nathalie.giraudon&taitradio.com 3571 @@ -15987,8 +15987,8 @@ jci&vasco.com 3996 Open Systems AG - Stephan Meystre - mey&open.ch + Dominik Langenegger + iana&open.ch 3997 ImproWare AG Patrick Guelat @@ -47367,8 +47367,8 @@ david.kim&zetabroadband.com 11953 ZUMtOBEL AG - Jurgen Paulmichl - paulmichl&zag.at + Martin Eberle + martin.eberle&zumtobel.com 11954 Elegant solutions consulting Inc. Atsushi Ikeda @@ -52775,7 +52775,7 @@ Marius-Julian.Tamas&t-systems.com 13305 Berne University of Applied Sciences - Adrian Gschwend + Wolfram Strauss ldapmaster&bfh.ch 13306 University of Montana @@ -55023,9 +55023,9 @@ Charlie LE HOANGAN charlie.lehoangan&acetiming.com 13867 - adfinis GmbH + Adfinis SyGroup AG Matthias Blaser - mb&adfinis.ch + matthias.blaser&adfinis-sygroup.ch 13868 Bahrain Credit Adel Darwish @@ -83282,7 +83282,7 @@ 20931 Software Builders Exchange Roby E. Gamboa - rgamboa&sofbex.org + regamboa&att.net 20932 yobe.org Roman Kunert @@ -88273,9 +88273,9 @@ Andrey Komyagin admin&netmechanica.com 22179 - Otsuka Corporation, Internet Data Center - Takanori Kurahashi - support&idc.aics.ne.jp + Otsuka Corporation + TAKANORI KURAHASHI + noc&aics.ad.jp 22180 INSCAPE DATA CORPORATION Richard Ho @@ -99139,9 +99139,9 @@ Christopher Horn hornc&aptea.com 24893 - GE Fanuc Intelligent Platforms, Inc. - Jozef Jablonski - jozef.jablonski&ge.com + GE Intelligent Platforms, Inc. + Chiu Leung + chiu.leung&ge.com 24894 PantheraNet Steven Saner @@ -118948,9 +118948,9 @@ Ferdy Nagy ferdy.nagy&fatspaniel.com 29842 - mikado soft gmbH - Wolfgang Duerr - Wolfgang.Duerr&mikado.de + macmon secure gmbh (previous was 'mikado soft gmbH') + Christian Bücker + christian.buecker&macmon.eu 29843 ncode gmbh Oli Kessler @@ -125946,8 +125946,8 @@ dwight.ball&provaimages.com 31591 Digital Governance - Elliot Moore - iana&diggov.net + Andre Esser + it-dept&digitalgovernance.co.uk 31592 Jump Trading, LLC Michael Wassong @@ -131308,7 +131308,7 @@ 32931 TOTEC AMENITY LIMITED (previous was 'easynet, inc.') Kazuhito Aono - Kazuhito_Aono&ccgw.totec.co.jp + Kazuhito_Aono&totec.co.jp 32932 Direct Telecom Ltd Andrey Nikolayev @@ -131504,7 +131504,7 @@ 32980 Hitachi Systems Engineering and Solutions, Ltd. (previous was 'Computer System Engineering Co., Ltd.') Yasumasa Ichioka - wiseaudit.rm&hitachi-systems.com + wiseaudit.rm&ml.hitachi-systems.com 32981 Arcadyan Technology Corporation Thomas Lee; Tom Teng @@ -135258,9 +135258,9 @@ Morgan Crocker morgan.crocker&topproducersystems.com 33919 - Magenta Video Networks + ImmediaTV Corporation (previous was 'Magenta Video Networks') Ciro Noronha - ciro&magentavideo.com + ciro&immediatv.com 33920 Remote Management Systems Limited Chris Johnston @@ -138307,7 +138307,7 @@ ernst.huber&ruag.com 34681 DATAGROUP IT Services Holding AG - Andreas Holm + Tobias Hüttner security&datagroup.de 34682 ATP Management & Technology s.r.l. @@ -156527,9 +156527,9 @@ Paul Lafferty paul.lafferty&exelisinc.com 39236 - Sacred Point Studios + TriFractal Studios (previous was 'Sacred Point Studios') Joshua Porter - jporter&sacredpointstudios.com + jporter&trifractalstudios.com 39237 FW-Systeme GmbH Reiner Onnen @@ -159319,7 +159319,7 @@ Marek Stuczynski marek.stuczynski&tsiuk.com 39934 - TopHat + TopHat Software Colm Vize colm&tophat.ie 39935 @@ -159382,6 +159382,1218 @@ Beijing Arrays Medical Imaging Technology Development Co.,td sunlei sunlei&arrays.com.cn +39950 + Altersign, LLC. + Vitalii Prikazchik + info&altersign.com.ua +39951 + Town Sports International + John Adams + ssladmin&town-sports.com +39952 + SecurePKI + Dennis van den Oever + d.vandenoever&securepki.com +39953 + SERVICE DEPARTEMENTAL D INCENDIE ET DE SECOURS DE LA DROME + Emmanuel JUGGERY + directeur-adjoint&sdis26.fr +39954 + RWetc. s.r.o. + Zdenek Roh + rwetc&rwetc.com +39955 + SMP Bank OJSC + Artem Bychkov + abychkov&smpbank.ru +39956 + Vale + Renato Orgito + renato.orgito&vale.com +39957 + Columbus Regional Heathcare System, Inc. + Terry Richards + terry.richards&crhs.net +39958 + Withings + Damien Lesgourgues + damien.lesgourgues&withings.com +39959 + CIRCUTOR, SA + Mr. Bernat García + bgarcia&circutor.es +39960 + cktsoi.com + Jacky Tsoi + jacky&tsoi.me +39961 + Nicira, Inc. + Rob Enns + rpe&nicira.com +39962 + Kern Scientific Co. + David L. Kern, Jr. + david&kernscientific.com +39963 + AGCO Corporation + Richa Bhootra + Richa.Bhootra&agcocorp.com +39964 + EIDEN Co,Ltd + ISAMU OHNO + i-ohno&eiden-gp.co.jp +39965 + Trans Sped + Viky-Teodora Manaila + viky.manaila&transsped.ro +39966 + Luminoso, LLC + Jason B. Alonso + jalonso&lumino.so +39967 + Ethersex Project + Stefan Siegl (project founder & maintainer) + maintainer&ethersex.de +39968 + Toya Technologies Inc. + Dustin Little + dlittle&toyatech.net +39969 + United Energy Pakistan Limited + Mohammad Abdul Qadir + qadirma&uep.com.pk +39970 + HandySolutions (CJSC) + Evgeny Nikitin + enikitin&handybank.ru +39971 + Shenzhen Skyee Optical Fiber Communication Technology Ltd. + wuminhua + wuminhua&skyee.com.cn +39972 + TUV RHEINLAND IBERICA SA + Enrique Mora + enrique.mora&es.tuv.com +39973 + Janmedia Interactive Sp. z o.o. + Bartosz Kondek + bkondek&janmedia.pl +39974 + Garland Technology LLC + Jerry Dillard + jerry.dillard&garlandtechnology.com +39975 + COGNEX + Michael Miller + mike.miller&cognex.com +39976 + Southwestern University + Todd K. Watson + tkw&southwestern.edu +39977 + Deltix, Inc. + Gene Florintsev + gflorin&deltixlab.com +39978 + Daniel Theodoro Consultoria em Informatica Ltd. + Daniel Theodoro + daniel&theodoro.com.br +39979 + ConicIT Ltd. + Tetelman Chen + chen&conicit.biz +39980 + Nocturnal Aviation + Jeff Grossman + jeffg&NocturnalAviation.net +39981 + OPT SP CO.,LTD. + Yutaka Yamada + cti-solution&optsp.co.jp +39982 + Icareus Ltd + Mikko Karppinen + support&icareus.com +39983 + Project Engineering srl + Nannini Nicola + nicola.nannini&proeng.it +39984 + Shenzhen Process Tech.Co.,Ltd. + Kelven Li + kelven11&163.com +39985 + GRZ IT Center Linz GmbH + Ralph Hosp + ralph.hosp&logis.at +39986 + Florida Department of Education + Ted Duncan + Ted.Duncan&fldoe.org +39987 + Pathmaker Group, Inc. + Jerry Castille + jerry.castille&pathmaker-group.com +39988 + NetCracker Technology Corp + Sachin Rathee + sachin.rathee&netcracker.com +39989 + LINE SEÑALIZACIÓN ELECTRÓNICA S.L. + JESÚS JIMÉNEZ MUÑOZ + jjimenez&line.es +39990 + Center of Information Technologies of Volgograd region (http:\\citvo.ru) + Kucherenko Vladimir Alexandrovich + admin&citvo.ru +39991 + Aitia International Inc. + Endre Cseszkó + ecseszko&aitia.ai +39992 + davidhowland.com + David Howland + pen&metalliqaz.fastmail.fm +39993 + Owl Forestry + Mikko Kokkonen + mikko&owlforestry.com +39994 + Echo360 + Jonathan Allen + jonathan.allen&echo360.com +39995 + Plymouth University + John Horne + snmp-admin&plymouth.ac.uk +39996 + sys4 AG + Patrick Ben Koetter + pk&sys4.de +39997 + Netsumo Ltd + Richard Smith + noc&netsumo.com +39998 + Beijing Lanxum New Technology + Jason Hu + hutiejun&lanxum.com +39999 + Hispania Eurovip SL + Daniel Sanchez + daniel&eurovip.es +40000 + Kapsi Internet-käyttäjät ry + Juho Juopperi + jkj&kapsi.fi +40001 + WineSOFT + Jonathan Jaeha Ahn + bglee&winesoft.co.kr +40002 + Open System Co., Ltd. + Jonson Doong + jonson&opensys.com.tw +40003 + Karjalan Paperi Oy + Juha Hartikainen + juha.hartikainen&karjalanpaperi.fi +40004 + Cargo Service Nord GmbH + André Bürger + a.buerger&csn-logistik.de +40005 + 5p. GmbH & Co. KG + Lukas Sassl + l.sassl&5partner.de +40006 + Reevex, LLC + Snehal Vashi + svashi&revventures.com +40007 + Universal Research Solutions, LLC + Matt Allen + iana&oberd.com +40008 + Virtual Connect Technologies, Inc + Benjamin Hathaway + ben.hathaway&virtualconnect.net +40009 + Oasiswork SARL + Nicolas Brisac + contact&oasiswork.fr +40010 + MSMC Informatica Ltda + Mario Dias + mario.dias&msmc.com.br +40011 + Fripost + Guilhem Moulin + guilhem&fripost.org +40012 + Hatomi Sp. z o.o. + Tomasz Macioszek + tomasz.macioszek&hatomi.pl +40013 + lintloaf.net + Juha Nyholm + oid-admin&lintloaf.net +40014 + Progress Rail Services Inspection & Information Systems + Steven Kirby + skirby&progressrail.com +40015 + Hüttner & Werfling Softwareentwicklung GbR + Stefan Werfling + info&hw-softwareentwicklung.de +40016 + MAS Technology + Shawn Peters + manager&mastechnology.ca +40017 + ARKS LLC + Alexandr V. Koshkin + dit&arks.ru +40018 + JSC Bank Vologzhanin + Dmitry Ogarkov + admins-group&bankvl.ru +40019 + Isbak A.S. + Abdullah Karadag + akaradag&isbak.com.tr +40020 + Gutenberg Networks + Sebastien CALARD + sebastien.calard&gutenberg-networks.com +40021 + Viscount Systems Inc + David Lee + david&viscount.com +40022 + Sirius Software, Inc. + Gary Gregory + gary&sirius-software.com +40023 + LLC " NPF DUKON" + Oleg Poterpeev + root&dukon.ru +40024 + iNovo Broadband, Inc. + Jesse Still + jstill&inovobb.com +40025 + Tym3 + James Carpenter + jcarpenter&tym3.com +40026 + SIS-FRANCE + Bruno Villedieu + bruno.villedieu&sis-france.com +40027 + Aki Network Technology + Akifumi Shiroma + aki&gp7.info +40028 + TAKOTA, LTD + Shakalov Andrey + ice&doka.tc +40029 + leadtone + gexingyu + gexingyu&leadtone.com +40030 + RADOM, s.r.o. + Jaroslav Hokeš + development&radom.eu +40031 + Oblako10, Ltd. + Vadim Ponomarev + vadim&oblako10.ru +40032 + Ultra Electronics, Precision Air & Land Systems + Richard Collins + Richard.Collins&ultra-pals.com +40033 + Radio Design + Caspar Lucas + caspar.lucas&radiodesign.eu +40034 + DuraSpace + Andrew Woods + awoods&duraspace.org +40035 + CellSec Inc. + Erik Dahl + admin&cellsec.com +40036 + Vertafore PLM + Josh Zook + jzook&vertafore.com +40037 + Inceptum d.o.o + Zvonimir Balog + zvonimir.balog&inceptum.hr +40038 + Livestream, LLC + Justin Stallard + devops&livestream.com +40039 + MySysAdmin.DE + Peer Dampmann + dampmann&mysysadmin.de +40040 + Stichting IFCAT Foundation + Wilco Baan Hofman + treasury&ifcat.org +40041 + ООО «Электронные Офисные Системы (проектирование и внедрение)» /OOO “Elektronnye Ofisnye Sistemy (proektirovanie i vnedrenie)/ + Alexey Kravchenko + eosreg&eos.ru +40042 + Stiftelsen Chalmers Studentbostäder + Carl-Martin Pershed + calmar&csbnet.se +40043 + NewPace Technology Development Inc.‎ + Josh Warren + josh.branchwarren&newpace.com +40044 + PC-Doctor, Inc. + Colin Corr + spammagnet&pc-doctor.com +40045 + Nexenta Systems, Inc. + Peer Dampmann + peer.dampmann&nexenta.com +40046 + CREDIT EUROPE BANK Ltd. + Ivan Bauzhadze + ivan.bauzhadze&crediteurope.ru +40047 + Korex Networks s.r.o. + Vladimir Vydra + vvydra&korex.sk +40048 + Information Display Company + Sam Mallicoat + smallicoat&gmail.com +40049 + Red Bend + Elad Tamari + elad.tamari&redbend.com +40050 + Microtech Andrzej Sokulski + Andrzej Sokulski + info&micro-tech.com.pl +40051 + RELEASE14 + Josip Djuricic + jd&release14.org +40052 + Energie AG Oberösterreich Data GmbH + Christian Aichinger + christian.aichinger&energieag.at +40053 + Sistemas Avanzados de Diseño + Ildefonso Moreno + ildefonso&sadsl.es +40054 + 4UR + ILyong Kim + hostmaster&4ur.cc +40055 + Yuchengtech + MingRui Li + limr&yuchengtech.com +40056 + AccuBeat Ltd + Yishay Eliav + yishay.e&accubeat.com +40057 + Reserved + Removed 2012-06-26 + ---none--- +40058 + Vitaliy Tokarev + Vitaliy Tokarev + gh0stwizard&myopera.com +40059 + Datagram, Inc. + Jae Kim + jae&datagram.com +40060 + Leo-Li com. + Leo Li + leo.wenlu&gmail.com +40061 + Bay Area Hospital + Brenda Curtner + brenda.curtner&bayareahospital.org +40062 + Trevor and Emily Mouat King + W. Trevor King + wking&tremily.us +40063 + Qintara, Inc. + Joseph W. Daigle + oid&qintara.com +40064 + Optima Lab srl + Daniele Arduini + admin&optimalab.it +40065 + Larch networks + Alex Cheskis + alexk&larch-networks.com +40066 + Saliens Information Systems Ltd. + Marko Pecic + mpecic&saliens.com.hr +40067 + LinTech JSC + Alexander Kochetkov + akochetkov&lintech.ru +40068 + The Venus Project + Roxanne Meadows + admin&thevenusproject.com +40069 + enprovia Software Engineering s. r. o. + Patrik Csokas + oid.admin&enprovia.com +40070 + Nearbuy Systems + Nathan Mueller + nate&nearbuysystems.com +40071 + P. St. Onge + P. St. Onge + pete.stonge&utoronto.ca +40072 + scminfo.net + Shotaro Chiba + schiba&scminfo.net +40073 + Lutron Electronics Company, Inc + Jeremy Neyhart + jneyhart&lutron.com +40074 + Energy Solutions Ltd. + Vladimir Todorov Fuchedzhiev + vendor&borsabg.com +40075 + SPL-Xdemat + Philippe RICARD + philippe.ricard&spl-xdemat.fr +40076 + SiFox + Alexey Larin + alexey.larin&sifox.ru +40077 + Austrian Red Cross + Markus Hnatek + markus.hnatek&roteskreuz.at +40078 + Open Grid Computing + Jes Nielsen + jes&opengridcomputing.com +40079 + Electronic Systems Protection, Inc. + Robert Dawley + radawley&espei.com +40080 + IIHE - Inter-university Institute for High Energies + Gilles De Lentdecker + gdelentd&ulb.ac.be +40081 + Shanghai Myway Technology, Inc. + Simon Tian + simonT&mywayinfo.com +40082 + NuGardt Software + Kevin Gardthausen + kevin&nugardt.com +40083 + Accelerated Concepts, Inc. + Tom Butts + tom.butts&accelecon.com +40084 + Ingalls Memorial Hospital + Susan Bjork + sbjork&ingalls.org +40085 + Stage Tec GmbH + R. Harder + org.adm&stagetec.com +40086 + Inworx Group + Javier Schamber + itadministrator&inworx.com +40087 + NIDO Informatica + Cassio Jose de Jesus + cassio&nido.com.br +40088 + Voixtel Telecom + Melcon Moraes + ianaoid&voixtel.com.br +40089 + NetAmbit Infosource & E-services Pvt. Ltd. + Vijay Sharma + vijay.sharma&netambit.in +40090 + Netline Communications Technologies Ltd + Harel Bahaloul + harel&netline.co.il +40091 + A.C.T.I.C asbl + Kenny Louveaux + info&actic.be +40092 + Wiwynn Corporation + Zong Bing, Wu + bing_wu&wiwynn.com +40093 + Zhuhai Seine Technology Co., Ltd + WangDan + wangdan&pantum.com +40094 + SecuEnv + Zhou Li + zhou.li&secuenv.com +40095 + G4S Engenharia e Sistemas S. A. + Mario Dias + mario.dias&br.g4s.com +40096 + ROICX + matt Hu + hul&roicx.com +40097 + WorldPay + Vladimir Jirasek + vladimir.jirasek&worldpay.com +40098 + update software + Christoph Macheiner + christoph.macheiner&update.com +40099 + North Carolina Healthcare Exchange + Himabindu Bolisetty + bindu&careevolution.com +40100 + TechNet + Richard Dols + richard&technetgroup.nl +40101 + EPB Fiber Optics + Mike Cathey + iana-poc&epbinternet.com +40102 + Pinger, Inc. + Jo Rhett + jorhett&pinger.com +40103 + Fashion Days + David Shulman + David.Shulman&fashiondays.ch +40104 + BamseNet GmbH + Mr. Rico Koerner + service&bamsenet.de +40105 + APN Promise S.A. + Konrad Sagala + konrad.sagala&promise.pl +40106 + Polara Engineering, Inc. + Brad Whitney + bwhitney&polara.com +40107 + Michael Reschly + Michael Reschly + michael&reschly.com +40108 + Amber Buddha + Steve Gillam + steveg&amberbuddha.com +40109 + SigAlgo Technology Ltd + Roger McCalman + snmp-pen&sigalgo.com +40110 + EGNATIA + Athanasios Bakalis + athanasios.bakalis&group-egnatia.gr +40111 + Deloitte Services & Investments nv + Christophe Castelein + ccastelein&deloitte.be +40112 + Ethernix + Amaury Darsch + amaury&ethernix.com +40113 + Blue Mountain Health System + Cheryl Heffelfinger + cheffelfinger&blmtn.org +40114 + Guavatech + John Cheeseman + johnc&guavatech.com +40115 + V & B Ingenieria S.A. de C.V. + Asterio Valenzuela Delfin + ventas.vybingenieria&gmail.com +40116 + DCO4 Sp. z o.o. + Jan Szumiec + jan&linkedlist.co.uk +40117 + Faculté des Sciences et Technologies - Université de Lorraine + Samson Bisaro + Samson.Bisaro&univ-lorraine.fr +40118 + CNPC LOGGING Co.Ltc + chen xiaolei + chenxiaolei2002&126.com +40119 + Terralink LLC + Grudtsin Andrey + support&terralink.ru +40120 + Pamlock AB + Johannes Hassmund + johannes&pamlock.com +40121 + Methodia Inc + Gerard Hovanessyan + gerard.hovanesyan&methodia.com +40122 + Beijing Cyber Stone Information Technology Corp. Ltd. + Yunfei xiang + xiangyf&cyber-stone.com +40123 + Hangzhou dunchong Technology Co.,Ltd. + lupeihong + lupeihong&dunchongnet.com +40124 + Kernkraftwerk Leibstadt AG + Wälti Stefan + ServiceDesk&kkl.ch +40125 + Travelfusion Ltd + Seth Tunstall + seth&travelfusion.com +40126 + real virtual GmbH + Ralph Borowski + rborowski&real-virtual.com +40127 + Monolith Software + Brett Engel + bengel&monolith-software.com +40128 + Beijing Photon-Byte Technology Co., Ltd. + David.Hua + softpro&vip.163.com +40129 + MarLukKi Centre + Marcin Kiejzik + marlukki&marlukki.eu +40130 + Asguard Networks + David Mattes + mattes&asguardnetworks.com +40131 + Nuvem Networks Inc + Ricki Evans + operations&nuvemnet.com +40132 + Telemedia Argentina S.A. + Tenorio, Leandro + ltenorio&telemediala.com +40133 + FIX TELECOM + Ismael Nunez + a.nunez&fix.com.do +40134 + Nexum, Inc + Michael Fread + mfread&nexuminc.com +40135 + Spawn Labs, Inc. + Paul Gautreaux + PaulGautreaux&gamestop.com +40136 + Comviva Technologies Limited + Shadaksharayya Aravind Hiremath + shadaksharayya.ha&comviva.com +40137 + University of Pardubice + Lukas Slansky + lukas.slansky&upce.cz +40138 + DataNET21 Solutions GmbH + Eckhard Schulz + admin&datanet21.de +40139 + GRN Serveis Telematics + Jordi Fabregas + iana&grn.es +40140 + AIRTEL ATN + Frank O'Connor + frank.oconnor&airtel-atn.com +40141 + InterConnect Brasil + Luis Marcelo de Almeida Nogueira + NIC&INTER.BZ +40142 + MODULISTIC.NET + Pablo Costa + in.Ko9exohk.Vee2UoQu.iana&modulistic.net +40143 + CookieConcepts + Jeroen S. van de Hoef + info&cookieconcepts.nl +40144 + Understanding SharePoint LLC + Bjørn Furuknap + furuknap&gmail.com +40145 + STRYME GmbH + Clemens Czepe + office&stryme.com +40146 + Ascent Communication Technology + Vincent Nguyen + support&ascentcomtec.com +40147 + IT-Technology GmbH + Johann Steinwendtner + steinwendtner&it-technology.at +40148 + Thorsten Pape + Thorsten Pape + tpape&pape-clan.de +40149 + PFA Pension + Dennis Wiberg-Jørgensen + dwi&pfa.dk +40150 + Kenium + Robert Breton + rbreton&kenium.com +40151 + G²mobility SA + Lionel CAUSSE + lionel.causse&g2mobility.com +40152 + Trimtab.ca + Alex Kwiatkowski + iana_oid&trimtab.ca +40153 + Abraxas Informatik AG + Florian Meister + florian.meister&abraxas.ch +40154 + North Caucasian Federal University + Yuri Serdyukov + YSerdyukov&ncstu.ru +40155 + Groundhog Technologies + Shaun Chang + shaun&ghtinc.com +40156 + WVNET GmbH + Stefan Berger + support&wvnet.at +40157 + Medicalgorithmics + Tomasz Mularczyk + t.mularczyk&medicalgorithmics.com +40158 + Gage Marketing Group, LLC + Kevin Borchers + netadmin&gage.com +40159 + Paul Reinhart AG + Heinz Hiltebrand + h.hiltebrand&reinhart.ch +40160 + NJVC + Peter Jeanmougin + Peter.Jeanmougin&njvc.com +40161 + Canal Street Securities + Luis Nogueira + canalstreet&lmn.com.br +40162 + McCarthy Tetrault + Hugo Ethier + hethier&mccarthy.ca +40163 + Kamidama Breedables + Grandma Bates + grandma.bates.sl&gmail.com +40164 + OOO Avtomatizirovannye sistemy (Automated Systems, LTD) + Andrew Glukhov + not_x&mail.ru +40165 + morrow.me.uk + Ben Morrow + ben&morrow.me.uk +40166 + Omega Tech Consulting Group LLC + Matt Chamberlain + mchamberlain&otcgcorp.com +40167 + NS Reizigers B.V. + Morten Minke + morten.minke&ns.nl +40168 + Etransmedia Technology + Ben Steadwell + Ben.Steadwell&etransmedia.com +40169 + 3xA Security AB + Stefan Santesson + stefan&aaa-sec.com +40170 + NP Networks, Inc. + Stephen Liang + kuochuan&npnetworks.com +40171 + HF. Radio Communication Technology Co., Ltd + Paky.Du + paky.pc.du&radiotech.cn +40172 + Closed joint stock company “StandarTelecom” + Stanislav Vasin + standartelecom&gmail.com +40173 + Hoermann Solutions + Hoermann Johann + support&hans-hoermann.de +40174 + BlueFinch + Richard Verkaik + info&bluefinch.nl +40175 + RIPAS + Pavel Karasin + karasin&ripas.ru +40176 + Consulfem + Jorge Berti + jberti&consulfem.com +40177 + Right&Above + Vasyl Rublyov + enterprise&rightandabove.com +40178 + Noolitic + Sylvain Deceuninck + sylvain.deceuninck&noolitic.biz +40179 + aplicacionesYredes.com + Rafa Couto + rafa&aplicacionesyredes.com +40180 + HTL Kaindorf - Mechatronik + Manfred Steiner + sx&htl-kaindorf.ac.at +40181 + CyberCenter S.A. + Max Weinstein + admin&cybercenter.cl +40182 + Sichuan Cable TV Network Co., Ltd. + Gangliu + liugang&catvgd.com +40183 + con terra GmbH + Uwe König + u.koenig&conterra.de +40184 + NovInTeh LLC + Maksim Balabanov + noc&novinteh.com +40185 + Esa Unggul University + didi supriyadi + didi&esaunggul.ac.id +40186 + DA/Page, LLC + Greg Ansley + support&dapage.net +40187 + Aclima, Inc. + Stan Hu + stanhu&aclimalabs.com +40188 + United States Infrastructure Corporation + Jason Bush + noc&usicinc.com +40189 + Charlton Labs + Chuck Charlton + ccharlton&gmail.com +40190 + JCL-eCommerce GmbH + Martin Köckinger + martin.koeckinger&jcl-ecommerce.com +40191 + Lylid Net Ltd. + Key Aavoja + key.aavoja&lylid.net +40192 + ITQuality + Chris Knudsen + cfk&itq.dk +40193 + Institute of Electronic Music and Acoustics + Johannes Zmölnig + noc&iem.at +40194 + WaveCloud Corporation + David Van Duzer + dvd&wavecloud.com +40195 + Zantek Pty. Ltd. + Rowan Taubitz + rowan&zantek.com.au +40196 + SANTOS + Adam Nye + unix.support&santos.com +40197 + JSC CROC POVOLZHYE + Radaev Konstantin + k.radaev&volga.croc.ru +40198 + Movirtu + Durgesh O Mishra + durgesh&movirtu.com +40199 + Szechenyi Istvan SZKI + Laszlo Herman + school&szimki.sulinet.hu +40200 + Anext + Ing. Peter Petrilak + peter.petrilak&anext.sk +40201 + Nexiway + Adel Mezibra + adel.mezibra&nexiway.com +40202 + Primetech Ltd. + Sergey Zhilkin + z-h-i-l-k-i-n&yandex.ru +40203 + Golder Associates + Tom Laitinen + tlaitinen&golder.com +40204 + Availity, L.L.C. + Susan Eveland + seveland&availity.com +40205 + Jackson Family Enterprises + Jason Womack + itadmin&kjmail.com +40206 + minivi + David Santoso + davidsantoso&minivi.com +40207 + Gerrit Beine GmbH + Gerrit Beine + mail&gerritbeine.com +40208 + S.J.M. Steffann + Sander Steffann + sander&steffann.nl +40209 + Hiroshima University + Kouji Nishimura + kouji&hiroshima-u.ac.jp +40210 + Matt-J.co.uk + Matt Johnson + mattkj09&gmail.com +40211 + SHENZHEN MEGMEET ELECTRICAL CO.,LTD + Yongru An + anyongru&megmeet.com +40212 + PHV - Confluances + DREUX Vincent + vincent.dreux&confluances.fr +40213 + University College Northen Denmark + Jacob-Steen Madsen + itdrift&ucn.dk +40214 + ICEANS, Inventive Computer Engineering and Network Service + Ahmed Waqas Abid + owner&iceans.com +40215 + ITF-EDV Froeschl GmbH + Armin Riedl + internet&itf-edv.de +40216 + Global Traffic Technologies, LLC + Chad Chryst + chad.chryst&gtt.com +40217 + Bertel S.p.A. + Alessandro Maggi, Gianpietro Germi + notifier&bertel.it +40218 + Witzig The Office Company AG + Stephan Brenner + stephan.brenner&witzig.ch +40219 + Hirtle, Callaghan & Co. + Josh Rose + jrose&hirtlecallaghan.com +40220 + Northwestern Michigan College + Neil Streeter + nstreeter&nmc.edu +40221 + Infrastructures Technologiques Gallium + Antoine Reid + areid&Gallium-IT.com +40222 + Family Home Care & Hospice, Inc. + Mark Manley + Mark.Manley&familyhomecare.org +40223 + molotov.ro + Szabolcs Borbely + bbszabi&yahoo.com +40224 + Willem4Ever BV + Willem Eradus + pen-request-owner&eradus.eu +40225 + Image Data Systems + Robin Kearney + robin&image-data.com +40226 + xNetBox Solutions + Tony Huang + support&xnetbox.com +40227 + Digital One + Daniel Mahoney + dmahoney&d1tv.net +40228 + Valley ComputerWorks, Inc. DBA Paragus Strategic I.T. + Delcie Bean + dbean&paragusit.com +40229 + VizionR + Pierre Souchay + pierre.souchay&vizionr.fr +40230 + Medikon Polska Sp. z o.o. + Artur Wajgel + a.wajgel&medikon.pl +40231 + Baptist St. Anthony's Health System + Micah Campbell + Micah.Campbell&bsahs.org +40232 + Michel Messerschmidt + Michel Messerschmidt + oid&michel-messerschmidt.de +40233 + Sanoma Media Netherlands B.V. + Marco Lebbink + marco.lebbink&sanomamedia.nl +40234 + Andreas Zieschang + Andreas Zieschang + a.zieschang&arcor.de +40235 + Stadt Dortmund + Sebastian Franz + sfranz&stadtdo.de +40236 + Diputació de Barcelona + Miguel Angel Murillo Viñuales + murillovm&diba.cat +40237 + The Office of the Government Chief Information Officer / the Hong Kong Special Administrative Region Government + Dennis Ng + dccng&ogcio.gov.hk +40238 + RoutoMessaging + Marko Dukanac + marko&routotelecom.com +40239 + Gruppo Editoriale L'Espresso spa + Stefano Malossini + s.malossini&gruppoespresso.it +40240 + OpenSky.com + Friedrich Seifts + systems&opensky.com +40241 + Ogden Technology Corporation + Andy Lan + andy.lan&ogdentec.com +40242 + GNS Science + Robert Pearce + r.pearce&gns.cri.nz +40243 + 3U HOLDING AG + Erik Schoenau + nmc&3u.net +40244 + SDAMO Group, LLC + Aleksey V. Shepelev + shepelev&sdamo.ru +40245 + Böning Automationstechnologie GmbH & Co. KG + Marten Müller + marten.mueller&boening.com +40246 + OOO "Laboratoriya Trehmernogo Zreniya" + Alexander Zinchuk + azinchuk&3detection.ru +40247 + GGS German Graduate School of Management and Law + Thomas Heiligenmann + thomas.heiligenmann&ggs.de +40248 + NPO Telecom JSC + Rodion Zobnin + okb&npotelecom.ru +40249 + Vargyas Networks, Inc D/B/A Maxxwave + Brian Vargyas + brianv&balticnetworks.com +40250 + Fiber Connections Inc. + Jordan Slater + jslater&fiberc.com +40251 + coretanium.net + Leon de Jager + ldejager&coretanium.net +40252 + Lonnie Mandigo + Lonnie Mandigo + lonnie.mandigo&gmail.com End of Document

@@ -1,7 +1,7 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h 37104 2011-05-12 21:37:55Z morriss $ + * $Id: etypes.h 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -401,6 +401,10 @@ #endif /* Specification (IOS) for cdma2000 Access Network Interfaces (document numbers A.S0011-B */ /* through A.S0017-B v1.0). This document already uses the Ether type 8881 */ +#ifndef ETHERTYPE_CESOETH +#define ETHERTYPE_CESOETH 0x88D8 /* Circuit Emulation Services over Ethernet (MEF 8) */ +#endif + #ifndef ETHERTYPE_LLTD #define ETHERTYPE_LLTD 0x88D9 /* Link Layer Topology Discovery (LLTD) */ #endif @@ -421,6 +425,10 @@ #define ETHERTYPE_IEEE_802_1AH 0x88E7 /* IEEE 802.1ah Provider Backbone Bridge Mac-in-Mac */ #endif +#ifndef ETHERTYPE_ELMI +#define ETHERTYPE_ELMI 0x88EE /* Ethernet Local Management Interface (E-LMI) (MEF16) */ +#endif + #ifndef ETHERTYPE_MMRP #define ETHERTYPE_MMRP 0x88F6 /* IEEE 802.1ak Multiple MAC Registration Protocol */ #endif

@@ -1,7 +1,7 @@ /* filesystem.c * Filesystem utility routines * - * $Id: filesystem.c 37984 2011-07-11 23:13:44Z gerald $ + * $Id: filesystem.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -305,7 +305,7 @@ * Oh, well. Return an indication of the error. */ error = GetLastError(); - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, 0, (LPTSTR) &msg_w, 0, NULL) == 0) { /* * Gak. We can't format the message.

@@ -90,7 +90,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,5 +1,5 @@ /* - * $Id: ftype-double.c 29615 2009-08-29 07:53:48Z krj $ + * $Id: ftype-double.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -55,7 +55,7 @@ { char *endptr = NULL; - fv->value.floating = strtod(s, &endptr); + fv->value.floating = g_ascii_strtod(s, &endptr); if (endptr == s || *endptr != '\0') { /* This isn't a valid number. */

@@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c 39927 2011-11-18 01:36:07Z gerald $ + * $Id: prefs.c 42934 2012-05-30 23:10:52Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -2429,6 +2429,13 @@ find_index_from_string_array(value, gui_layout_content_text, 0); } else if (strcmp(pref_name, PRS_CONSOLE_LOG_LEVEL) == 0) { prefs.console_log_level = strtoul(value, NULL, 10); + if (prefs.console_log_level & (G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG)) { + /* + * GLib >= 2.32 drops INFO and DEBUG messages by default. Tell + * it not to do that. + */ + g_setenv("G_MESSAGES_DEBUG", "all", TRUE); + } /* handle the capture options */ } else if (strcmp(pref_name, PRS_CAP_DEVICE) == 0) {

@@ -1,7 +1,7 @@ /* proto.c * Routines for protocol tree * - * $Id: proto.c 39940 2011-11-18 17:46:50Z gerald $ + * $Id: proto.c 43260 2012-06-14 18:20:13Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -3848,10 +3848,15 @@ case FT_UINT32: case FT_FRAMENUM: u_integer = fvalue_get_uinteger(&finfo->value); - if (hfinfo->strings) { - if (hfinfo->display & BASE_CUSTOM) { - g_snprintf(result+offset_r, size-offset_r, "%u", u_integer); - } else if (hfinfo->display & BASE_RANGE_STRING) { + if ((hfinfo->display & BASE_DISPLAY_E_MASK) == BASE_CUSTOM) { + gchar tmp[ITEM_LABEL_LENGTH]; + custom_fmt_func_t fmtfunc = (custom_fmt_func_t)hfinfo->strings; + + DISSECTOR_ASSERT(fmtfunc); + fmtfunc(tmp, u_integer); + g_snprintf(result+offset_r, size-offset_r, "%s", tmp); + } else if (hfinfo->strings) { + if (hfinfo->display & BASE_RANGE_STRING) { g_strlcpy(result+offset_r, rval_to_str(u_integer, hfinfo->strings, "%u"), size-offset_r); } else if (hfinfo->display & BASE_EXT_STRING) { g_strlcpy(result+offset_r, val_to_str_ext(u_integer, (value_string_ext *) (hfinfo->strings), "%u"), size-offset_r); @@ -3891,10 +3896,15 @@ case FT_INT24: case FT_INT32: integer = fvalue_get_sinteger(&finfo->value); - if (hfinfo->strings) { - if (hfinfo->display & BASE_CUSTOM) { - g_snprintf(result+offset_r, size-offset_r, "%d", integer); - } else if (hfinfo->display & BASE_RANGE_STRING) { + if ((hfinfo->display & BASE_DISPLAY_E_MASK) == BASE_CUSTOM) { + gchar tmp[ITEM_LABEL_LENGTH]; + custom_fmt_func_t fmtfunc = (custom_fmt_func_t)hfinfo->strings; + + DISSECTOR_ASSERT(fmtfunc); + fmtfunc(tmp, integer); + g_snprintf(result+offset_r, size-offset_r, "%s", tmp); + } else if (hfinfo->strings) { + if (hfinfo->display & BASE_RANGE_STRING) { g_strlcpy(result+offset_r, rval_to_str(integer, hfinfo->strings, "%d"), size-offset_r); } else if (hfinfo->display & BASE_EXT_STRING) { g_strlcpy(result+offset_r, val_to_str_ext(integer, (value_string_ext *) (hfinfo->strings), "%d"), size-offset_r); @@ -6374,28 +6384,30 @@ range = NULL; tfs = NULL; - if ((hfinfo->display & BASE_DISPLAY_E_MASK) != BASE_CUSTOM && - (hfinfo->type == FT_UINT8 || - hfinfo->type == FT_UINT16 || - hfinfo->type == FT_UINT24 || - hfinfo->type == FT_UINT32 || - hfinfo->type == FT_UINT64 || - hfinfo->type == FT_INT8 || - hfinfo->type == FT_INT16 || - hfinfo->type == FT_INT24 || - hfinfo->type == FT_INT32 || - hfinfo->type == FT_INT64)) { - - if (hfinfo->display & BASE_EXT_STRING) { - vals = VALUE_STRING_EXT_VS_P((value_string_ext *)hfinfo->strings); - } else if ((hfinfo->display & BASE_RANGE_STRING) == 0) { - vals = hfinfo->strings; - } else { - range = hfinfo->strings; + if (hfinfo->strings != NULL) { + if ((hfinfo->display & BASE_DISPLAY_E_MASK) != BASE_CUSTOM && + (hfinfo->type == FT_UINT8 || + hfinfo->type == FT_UINT16 || + hfinfo->type == FT_UINT24 || + hfinfo->type == FT_UINT32 || + hfinfo->type == FT_UINT64 || + hfinfo->type == FT_INT8 || + hfinfo->type == FT_INT16 || + hfinfo->type == FT_INT24 || + hfinfo->type == FT_INT32 || + hfinfo->type == FT_INT64)) { + + if (hfinfo->display & BASE_EXT_STRING) { + vals = VALUE_STRING_EXT_VS_P((value_string_ext *)hfinfo->strings); + } else if ((hfinfo->display & BASE_RANGE_STRING) == 0) { + vals = hfinfo->strings; + } else { + range = hfinfo->strings; + } + } + else if (hfinfo->type == FT_BOOLEAN) { + tfs = hfinfo->strings; } - } - else if (hfinfo->type == FT_BOOLEAN) { - tfs = hfinfo->strings; } /* Print value strings? */

@@ -2053,7 +2053,7 @@ { 2029, "Vivid Image" }, { 2030, "AfriQ*Access, Inc." }, { 2031, "Reliant Networks Corporation Steven" }, - { 2032, "airwide solutions" }, + { 2032, "Mavenir Systems (previous was 'airwide solutions')" }, { 2033, "McKinney Lighting & Sound" }, { 2034, "Whole Systems Design, Inc." }, { 2035, "O'Reilly & Associates, Inc." }, @@ -3591,7 +3591,7 @@ { 3567, "Scott Supply Service, Inc." }, { 3568, "Service Co LLC" }, { 3569, "Electronic Payment Services, Inc." }, - { 3570, "Tait Electronics Ltd" }, + { 3570, "Tait Limited" }, { 3571, "Gift-Trek Malaysia Sdn. Bhd." }, { 3572, "HanA Systems, Inc." }, { 3573, "South African Networking People (Pty) Ltd" }, @@ -13888,7 +13888,7 @@ { 13864, "MAMINOS, Inc." }, { 13865, "Universit\0303\0251 Charles de Gaulle - Lille 3" }, { 13866, "ACE TIMING" }, - { 13867, "adfinis GmbH" }, + { 13867, "Adfinis SyGroup AG" }, { 13868, "Bahrain Credit" }, { 13869, "Blum Capital Partners, LP" }, { 13870, "Corporate Oxygen" }, @@ -22200,7 +22200,7 @@ { 22176, "asknet AG" }, { 22177, "DFN-Verein" }, { 22178, "Kurs LLC" }, - { 22179, "Otsuka Corporation, Internet Data Center" }, + { 22179, "Otsuka Corporation" }, { 22180, "INSCAPE DATA CORPORATION" }, { 22181, "Avision Inc." }, { 22182, "Cascadia BHC" }, @@ -24914,7 +24914,7 @@ { 24890, "Extant Solutions" }, { 24891, "Instituto Tecnol\0303\0263gico y de Estudios Superiores de Occidente A.C." }, { 24892, "Great Atlantic and Pacific Tea Company, Inc." }, - { 24893, "GE Fanuc Intelligent Platforms, Inc." }, + { 24893, "GE Intelligent Platforms, Inc." }, { 24894, "PantheraNet" }, { 24895, "Medifacts International Inc." }, { 24896, "Microdental Laboratories" }, @@ -29863,7 +29863,7 @@ { 29839, "Dalman Technical Services Ltd" }, { 29840, "llrp.org" }, { 29841, "Fat Spaniel Technologies" }, - { 29842, "mikado soft gmbH" }, + { 29842, "macmon secure gmbh (previous was 'mikado soft gmbH')" }, { 29843, "ncode gmbh" }, { 29844, "Centile SA" }, { 29845, "VCC Perfect Pictures AG" }, @@ -33940,7 +33940,7 @@ { 33916, "Freeman Decorating Services, Inc." }, { 33917, "Intact Financial Corporation" }, { 33918, "Top Producer Systems" }, - { 33919, "Magenta Video Networks" }, + { 33919, "ImmediaTV Corporation (previous was 'Magenta Video Networks')" }, { 33920, "Remote Management Systems Limited" }, { 33921, "Molowa" }, { 33922, "Byzoro Networks Ltd." }, @@ -39257,7 +39257,7 @@ { 39233, "Saint John's Health System" }, { 39234, "Mitroko Inc." }, { 39235, "Exelis Inc." }, - { 39236, "Sacred Point Studios" }, + { 39236, "TriFractal Studios (previous was 'Sacred Point Studios')" }, { 39237, "FW-Systeme GmbH" }, { 39238, "VelociData, Inc" }, { 39239, "LittleJackal " }, @@ -39955,7 +39955,7 @@ { 39931, "openNetMon" }, { 39932, "Mindware" }, { 39933, "Technology Space Integration Limited" }, - { 39934, "TopHat" }, + { 39934, "TopHat Software" }, { 39935, "Transas Marine International" }, { 39936, "Cheshire Medical Center" }, { 39937, "Netspective" }, @@ -39971,6 +39971,309 @@ { 39947, "B PLUS TV a.s." }, { 39948, "Ping Communication" }, { 39949, "Beijing Arrays Medical Imaging Technology Development Co.,td" }, + { 39950, "Altersign, LLC." }, + { 39951, "Town Sports International" }, + { 39952, "SecurePKI" }, + { 39953, "SERVICE DEPARTEMENTAL D INCENDIE ET DE SECOURS DE LA DROME" }, + { 39954, "RWetc. s.r.o." }, + { 39955, "SMP Bank OJSC" }, + { 39956, "Vale" }, + { 39957, "Columbus Regional Heathcare System, Inc." }, + { 39958, "Withings" }, + { 39959, "CIRCUTOR, SA" }, + { 39960, "cktsoi.com" }, + { 39961, "Nicira, Inc." }, + { 39962, "Kern Scientific Co." }, + { 39963, "AGCO Corporation" }, + { 39964, "EIDEN Co,Ltd" }, + { 39965, "Trans Sped" }, + { 39966, "Luminoso, LLC" }, + { 39967, "Ethersex Project" }, + { 39968, "Toya Technologies Inc." }, + { 39969, "United Energy Pakistan Limited" }, + { 39970, "HandySolutions (CJSC)" }, + { 39971, "Shenzhen Skyee Optical Fiber Communication Technology Ltd." }, + { 39972, "TUV RHEINLAND IBERICA SA " }, + { 39973, "Janmedia Interactive Sp. z o.o." }, + { 39974, "Garland Technology LLC" }, + { 39975, "COGNEX" }, + { 39976, "Southwestern University" }, + { 39977, "Deltix, Inc." }, + { 39978, "Daniel Theodoro Consultoria em Informatica Ltd." }, + { 39979, "ConicIT Ltd." }, + { 39980, "Nocturnal Aviation" }, + { 39981, "OPT SP CO.,LTD." }, + { 39982, "Icareus Ltd" }, + { 39983, "Project Engineering srl" }, + { 39984, "Shenzhen Process Tech.Co.,Ltd." }, + { 39985, "GRZ IT Center Linz GmbH" }, + { 39986, "Florida Department of Education" }, + { 39987, "Pathmaker Group, Inc." }, + { 39988, "NetCracker Technology Corp" }, + { 39989, "LINE SE\0303\0221ALIZACI\0303\0223N ELECTR\0303\0223NICA S.L." }, + { 39990, "Center of Information Technologies of Volgograd region (http:\\\\citvo.ru)" }, + { 39991, "Aitia International Inc." }, + { 39992, "davidhowland.com" }, + { 39993, "Owl Forestry" }, + { 39994, "Echo360" }, + { 39995, "Plymouth University" }, + { 39996, "sys4 AG" }, + { 39997, "Netsumo Ltd" }, + { 39998, "Beijing Lanxum New Technology" }, + { 39999, "Hispania Eurovip SL" }, + { 40000, "Kapsi Internet-k\0303\0244ytt\0303\0244j\0303\0244t ry" }, + { 40001, "WineSOFT" }, + { 40002, "Open System Co., Ltd." }, + { 40003, "Karjalan Paperi Oy" }, + { 40004, "Cargo Service Nord GmbH" }, + { 40005, "5p. GmbH & Co. KG" }, + { 40006, "Reevex, LLC" }, + { 40007, "Universal Research Solutions, LLC" }, + { 40008, "Virtual Connect Technologies, Inc" }, + { 40009, "Oasiswork SARL" }, + { 40010, "MSMC Informatica Ltda" }, + { 40011, "Fripost" }, + { 40012, "Hatomi Sp. z o.o." }, + { 40013, "lintloaf.net" }, + { 40014, "Progress Rail Services Inspection & Information Systems " }, + { 40015, "H\0303\0274ttner & Werfling Softwareentwicklung GbR" }, + { 40016, "MAS Technology" }, + { 40017, "ARKS LLC" }, + { 40018, "JSC Bank Vologzhanin" }, + { 40019, "Isbak A.S." }, + { 40020, "Gutenberg Networks" }, + { 40021, "Viscount Systems Inc" }, + { 40022, "Sirius Software, Inc." }, + { 40023, "LLC \" NPF DUKON\"" }, + { 40024, "iNovo Broadband, Inc." }, + { 40025, "Tym3" }, + { 40026, "SIS-FRANCE" }, + { 40027, "Aki Network Technology" }, + { 40028, "TAKOTA, LTD" }, + { 40029, "leadtone" }, + { 40030, "RADOM, s.r.o." }, + { 40031, "Oblako10, Ltd." }, + { 40032, "Ultra Electronics, Precision Air & Land Systems" }, + { 40033, "Radio Design" }, + { 40034, "DuraSpace" }, + { 40035, "CellSec Inc." }, + { 40036, "Vertafore PLM" }, + { 40037, "Inceptum d.o.o" }, + { 40038, "Livestream, LLC" }, + { 40039, "MySysAdmin.DE" }, + { 40040, "Stichting IFCAT Foundation" }, + { 40041, "\0320\0236\0320\0236\0320\0236 \0302\0253\0320\0255\0320\0273\0320\0265\0320\0272\0321\0202\0321\0200\0320\0276\0320\0275\0320\0275\0321\0213\0320\0265 \0320\0236\0321\0204\0320\0270\0321\0201\0320\0275\0321\0213\0320\0265 \0320\0241\0320\0270\0321\0201\0321\0202\0320\0265\0320\0274\0321\0213 (\0320\0277\0321\0200\0320\0276\0320\0265\0320\0272\0321\0202\0320\0270\0321\0200\0320\0276\0320\0262\0320\0260\0320\0275\0320\0270\0320\0265 \0320\0270 \0320\0262\0320\0275\0320\0265\0320\0264\0321\0200\0320\0265\0320\0275\0320\0270\0320\0265)\0302\0273 /OOO \0342\0200\0234Elektronnye Ofisnye Sistemy (proektirovanie i vnedrenie)/" }, + { 40042, "Stiftelsen Chalmers Studentbost\0303\0244der" }, + { 40043, "NewPace Technology Development Inc.\0342\0200\0216" }, + { 40044, "PC-Doctor, Inc." }, + { 40045, "Nexenta Systems, Inc." }, + { 40046, "CREDIT EUROPE BANK Ltd." }, + { 40047, "Korex Networks s.r.o." }, + { 40048, "Information Display Company" }, + { 40049, "Red Bend" }, + { 40050, "Microtech Andrzej Sokulski" }, + { 40051, "RELEASE14" }, + { 40052, "Energie AG Ober\0303\0266sterreich Data GmbH" }, + { 40053, "Sistemas Avanzados de Dise\0303\0261o" }, + { 40054, "4UR" }, + { 40055, "Yuchengtech" }, + { 40056, "AccuBeat Ltd" }, + { 40057, "Reserved" }, + { 40058, "Vitaliy Tokarev" }, + { 40059, "Datagram, Inc." }, + { 40060, "Leo-Li com." }, + { 40061, "Bay Area Hospital" }, + { 40062, "Trevor and Emily Mouat King" }, + { 40063, "Qintara, Inc." }, + { 40064, "Optima Lab srl" }, + { 40065, "Larch networks" }, + { 40066, "Saliens Information Systems Ltd." }, + { 40067, "LinTech JSC" }, + { 40068, "The Venus Project" }, + { 40069, "enprovia Software Engineering s. r. o." }, + { 40070, "Nearbuy Systems" }, + { 40071, "P. St. Onge" }, + { 40072, "scminfo.net" }, + { 40073, "Lutron Electronics Company, Inc" }, + { 40074, "Energy Solutions Ltd." }, + { 40075, "SPL-Xdemat" }, + { 40076, "SiFox" }, + { 40077, "Austrian Red Cross" }, + { 40078, "Open Grid Computing" }, + { 40079, "Electronic Systems Protection, Inc." }, + { 40080, "IIHE - Inter-university Institute for High Energies" }, + { 40081, "Shanghai Myway Technology, Inc." }, + { 40082, "NuGardt Software" }, + { 40083, "Accelerated Concepts, Inc." }, + { 40084, "Ingalls Memorial Hospital" }, + { 40085, "Stage Tec GmbH" }, + { 40086, "Inworx Group" }, + { 40087, "NIDO Informatica" }, + { 40088, "Voixtel Telecom" }, + { 40089, "NetAmbit Infosource & E-services Pvt. Ltd." }, + { 40090, "Netline Communications Technologies Ltd " }, + { 40091, "A.C.T.I.C asbl" }, + { 40092, "Wiwynn Corporation" }, + { 40093, "Zhuhai Seine Technology Co., Ltd" }, + { 40094, "SecuEnv" }, + { 40095, "G4S Engenharia e Sistemas S. A." }, + { 40096, "ROICX" }, + { 40097, "WorldPay" }, + { 40098, "update software" }, + { 40099, "North Carolina Healthcare Exchange" }, + { 40100, "TechNet" }, + { 40101, "EPB Fiber Optics" }, + { 40102, "Pinger, Inc." }, + { 40103, "Fashion Days" }, + { 40104, "BamseNet GmbH" }, + { 40105, "APN Promise S.A." }, + { 40106, "Polara Engineering, Inc." }, + { 40107, "Michael Reschly" }, + { 40108, "Amber Buddha" }, + { 40109, "SigAlgo Technology Ltd" }, + { 40110, "EGNATIA" }, + { 40111, "Deloitte Services & Investments nv" }, + { 40112, "Ethernix" }, + { 40113, "Blue Mountain Health System" }, + { 40114, "Guavatech" }, + { 40115, "V & B Ingenieria S.A. de C.V." }, + { 40116, "DCO4 Sp. z o.o." }, + { 40117, "Facult\0303\0251 des Sciences et Technologies - Universit\0303\0251 de Lorraine" }, + { 40118, "CNPC LOGGING Co.Ltc" }, + { 40119, "Terralink LLC" }, + { 40120, "Pamlock AB" }, + { 40121, "Methodia Inc" }, + { 40122, "Beijing Cyber Stone Information Technology Corp. Ltd." }, + { 40123, "Hangzhou dunchong Technology Co.,Ltd." }, + { 40124, "Kernkraftwerk Leibstadt AG" }, + { 40125, "Travelfusion Ltd" }, + { 40126, "real virtual GmbH" }, + { 40127, "Monolith Software" }, + { 40128, "Beijing Photon-Byte Technology Co., Ltd." }, + { 40129, "MarLukKi Centre" }, + { 40130, "Asguard Networks" }, + { 40131, "Nuvem Networks Inc" }, + { 40132, "Telemedia Argentina S.A." }, + { 40133, "FIX TELECOM" }, + { 40134, "Nexum, Inc" }, + { 40135, "Spawn Labs, Inc." }, + { 40136, "Comviva Technologies Limited" }, + { 40137, "University of Pardubice" }, + { 40138, "DataNET21 Solutions GmbH" }, + { 40139, "GRN Serveis Telematics" }, + { 40140, "AIRTEL ATN" }, + { 40141, "InterConnect Brasil" }, + { 40142, "MODULISTIC.NET" }, + { 40143, "CookieConcepts" }, + { 40144, "Understanding SharePoint LLC" }, + { 40145, "STRYME GmbH" }, + { 40146, "Ascent Communication Technology" }, + { 40147, "IT-Technology GmbH" }, + { 40148, "Thorsten Pape" }, + { 40149, "PFA Pension" }, + { 40150, "Kenium" }, + { 40151, "G\0302\0262mobility SA" }, + { 40152, "Trimtab.ca" }, + { 40153, "Abraxas Informatik AG" }, + { 40154, "North Caucasian Federal University" }, + { 40155, "Groundhog Technologies" }, + { 40156, "WVNET GmbH" }, + { 40157, "Medicalgorithmics" }, + { 40158, "Gage Marketing Group, LLC" }, + { 40159, "Paul Reinhart AG" }, + { 40160, "NJVC" }, + { 40161, "Canal Street Securities" }, + { 40162, "McCarthy Tetrault" }, + { 40163, "Kamidama Breedables" }, + { 40164, "OOO Avtomatizirovannye sistemy (Automated Systems, LTD)" }, + { 40165, "morrow.me.uk" }, + { 40166, "Omega Tech Consulting Group LLC" }, + { 40167, "NS Reizigers B.V." }, + { 40168, "Etransmedia Technology" }, + { 40169, "3xA Security AB" }, + { 40170, "NP Networks, Inc." }, + { 40171, "HF. Radio Communication Technology Co., Ltd " }, + { 40172, "Closed joint stock company \0342\0200\0234StandarTelecom\0342\0200\0235" }, + { 40173, "Hoermann Solutions" }, + { 40174, "BlueFinch" }, + { 40175, "RIPAS" }, + { 40176, "Consulfem" }, + { 40177, "Right&Above" }, + { 40178, "Noolitic" }, + { 40179, "aplicacionesYredes.com" }, + { 40180, "HTL Kaindorf - Mechatronik" }, + { 40181, "CyberCenter S.A." }, + { 40182, "Sichuan Cable TV Network Co., Ltd." }, + { 40183, "con terra GmbH" }, + { 40184, "NovInTeh LLC" }, + { 40185, "Esa Unggul University" }, + { 40186, "DA/Page, LLC" }, + { 40187, "Aclima, Inc." }, + { 40188, "United States Infrastructure Corporation" }, + { 40189, "Charlton Labs" }, + { 40190, "JCL-eCommerce GmbH" }, + { 40191, "Lylid Net Ltd." }, + { 40192, "ITQuality" }, + { 40193, "Institute of Electronic Music and Acoustics" }, + { 40194, "WaveCloud Corporation" }, + { 40195, "Zantek Pty. Ltd." }, + { 40196, "SANTOS" }, + { 40197, "JSC CROC POVOLZHYE" }, + { 40198, "Movirtu" }, + { 40199, "Szechenyi Istvan SZKI" }, + { 40200, "Anext" }, + { 40201, "Nexiway" }, + { 40202, "Primetech Ltd." }, + { 40203, "Golder Associates" }, + { 40204, "Availity, L.L.C." }, + { 40205, "Jackson Family Enterprises" }, + { 40206, "minivi" }, + { 40207, "Gerrit Beine GmbH" }, + { 40208, "S.J.M. Steffann" }, + { 40209, "Hiroshima University" }, + { 40210, "Matt-J.co.uk" }, + { 40211, "SHENZHEN MEGMEET ELECTRICAL CO.,LTD" }, + { 40212, "PHV - Confluances" }, + { 40213, "University College Northen Denmark" }, + { 40214, "ICEANS, Inventive Computer Engineering and Network Service" }, + { 40215, "ITF-EDV Froeschl GmbH" }, + { 40216, "Global Traffic Technologies, LLC" }, + { 40217, "Bertel S.p.A." }, + { 40218, "Witzig The Office Company AG" }, + { 40219, "Hirtle, Callaghan & Co." }, + { 40220, "Northwestern Michigan College" }, + { 40221, "Infrastructures Technologiques Gallium" }, + { 40222, "Family Home Care & Hospice, Inc." }, + { 40223, "molotov.ro" }, + { 40224, "Willem4Ever BV" }, + { 40225, "Image Data Systems" }, + { 40226, "xNetBox Solutions" }, + { 40227, "Digital One" }, + { 40228, "Valley ComputerWorks, Inc. DBA Paragus Strategic I.T. " }, + { 40229, "VizionR" }, + { 40230, "Medikon Polska Sp. z o.o." }, + { 40231, "Baptist St. Anthony's Health System" }, + { 40232, "Michel Messerschmidt" }, + { 40233, "Sanoma Media Netherlands B.V." }, + { 40234, "Andreas Zieschang" }, + { 40235, "Stadt Dortmund" }, + { 40236, "Diputaci\0303\0263 de Barcelona" }, + { 40237, "The Office of the Government Chief Information Officer / the Hong Kong Special Administrative Region Government" }, + { 40238, "RoutoMessaging" }, + { 40239, "Gruppo Editoriale L'Espresso spa" }, + { 40240, "OpenSky.com" }, + { 40241, "Ogden Technology Corporation" }, + { 40242, "GNS Science" }, + { 40243, "3U HOLDING AG" }, + { 40244, "SDAMO Group, LLC" }, + { 40245, "B\0303\0266ning Automationstechnologie GmbH & Co. KG" }, + { 40246, "OOO \"Laboratoriya Trehmernogo Zreniya\"" }, + { 40247, "GGS German Graduate School of Management and Law" }, + { 40248, "NPO Telecom JSC" }, + { 40249, "Vargyas Networks, Inc D/B/A Maxxwave" }, + { 40250, "Fiber Connections Inc." }, + { 40251, "coretanium.net" }, + { 40252, "Lonnie Mandigo" }, { 0, NULL} };

@@ -67,7 +67,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -91,7 +91,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c 41583 2012-03-15 23:44:31Z gerald $ + * $Id: file.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -485,7 +485,7 @@ } cf_read_status_t -cf_read(capture_file *cf, gboolean from_save) +cf_read(capture_file *cf, gboolean reloading) { int err; gchar *err_info; @@ -528,10 +528,10 @@ name_ptr = get_basename(cf->filename); - if (from_save == FALSE) - cf_callback_invoke(cf_cb_file_read_started, cf); + if (reloading) + cf_callback_invoke(cf_cb_file_reload_started, cf); else - cf_callback_invoke(cf_cb_file_save_started, (gpointer)name_ptr); + cf_callback_invoke(cf_cb_file_read_started, cf); /* Find the size of the file. */ size = wtap_file_size(cf->wth, NULL); @@ -565,11 +565,11 @@ */ if ((progbar == NULL) && !(count % MIN_NUMBER_OF_PACKET)){ progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str)); - if (from_save == FALSE) - progbar = delayed_create_progress_dlg("Loading", name_ptr, + if (reloading) + progbar = delayed_create_progress_dlg("Reloading", name_ptr, TRUE, &stop_flag, &start_time, progbar_val); else - progbar = delayed_create_progress_dlg("Saving", name_ptr, + progbar = delayed_create_progress_dlg("Loading", name_ptr, TRUE, &stop_flag, &start_time, progbar_val); } @@ -663,10 +663,10 @@ cf->current_row = 0; new_packet_list_thaw(); - if (from_save == FALSE) - cf_callback_invoke(cf_cb_file_read_finished, cf); + if (reloading) + cf_callback_invoke(cf_cb_file_reload_finished, cf); else - cf_callback_invoke(cf_cb_file_save_finished, cf); + cf_callback_invoke(cf_cb_file_read_finished, cf); /* If we have any displayed packets to select, select the first of those packets by making the first row the selected row. */ @@ -3790,7 +3790,6 @@ correctly for the "no capture file open" state). */ break; } - cf_callback_invoke(cf_cb_file_save_reload_finished, cf); } } return CF_OK; @@ -4032,7 +4031,7 @@ is_tempfile = cf->is_tempfile; cf->is_tempfile = FALSE; if (cf_open(cf, filename, is_tempfile, &err) == CF_OK) { - switch (cf_read(cf, FALSE)) { + switch (cf_read(cf, TRUE)) { case CF_READ_OK: case CF_READ_ERROR:

@@ -1,7 +1,7 @@ /* file.h * Definitions for file structures and routines * - * $Id: file.h 37398 2011-05-25 21:19:56Z gerald $ + * $Id: file.h 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -60,12 +60,13 @@ cf_cb_file_closed, cf_cb_file_read_started, cf_cb_file_read_finished, + cf_cb_file_reload_started, + cf_cb_file_reload_finished, cf_cb_packet_selected, cf_cb_packet_unselected, cf_cb_field_unselected, cf_cb_file_save_started, cf_cb_file_save_finished, - cf_cb_file_save_reload_finished, cf_cb_file_save_failed } cf_cbs;

@@ -116,7 +116,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c 41677 2012-03-19 18:06:01Z gerald $ + * $Id: dfilter_expr_dlg.c 43513 2012-06-27 18:11:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -192,7 +192,9 @@ * fill up the list of values, otherwise clear the list of values. */ /* XXX: ToDo: Implement "range-string" filter ? */ - if ((hfinfo->strings != NULL) && !(hfinfo->display & BASE_RANGE_STRING)) { + if ((hfinfo->strings != NULL) && + ! (hfinfo->display & BASE_RANGE_STRING) && + ! ((hfinfo->display & BASE_DISPLAY_E_MASK) == BASE_CUSTOM)) { const value_string *vals = hfinfo->strings; if (hfinfo->display & BASE_EXT_STRING) vals = VALUE_STRING_EXT_VS_P((value_string_ext *) vals);

@@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c 41372 2012-03-06 09:44:15Z etxrab $ + * $Id: main.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1689,13 +1689,6 @@ } static void -main_cf_cb_file_save_reload_finished(gpointer data _U_) -{ - set_display_filename(&cfile); - set_menus_for_capture_file(&cfile); -} - -static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_) { switch(event) { @@ -1715,6 +1708,14 @@ g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Read finished"); main_cf_cb_file_read_finished(data); break; + case(cf_cb_file_reload_started): + g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Reload started"); + main_cf_cb_file_read_started(data); + break; + case(cf_cb_file_reload_finished): + g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Reload finished"); + main_cf_cb_file_read_finished(data); + break; case(cf_cb_packet_selected): main_cf_cb_packet_selected(data); break; @@ -1730,10 +1731,6 @@ case(cf_cb_file_save_finished): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Save finished"); break; - case(cf_cb_file_save_reload_finished): - g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Reload finished"); - main_cf_cb_file_save_reload_finished(data); - break; case(cf_cb_file_save_failed): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Save failed"); break;

@@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: main_proto_draw.c 36866 2011-04-26 08:51:25Z darkjames $ + * $Id: main_proto_draw.c 43869 2012-07-20 19:31:41Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -582,7 +582,7 @@ } /* Refresh the display so that the expanded trees are visible */ - main_proto_tree_draw(tree); + proto_tree_draw(tree, GTK_WIDGET(tree_view)); /* select our field's row */ gtk_tree_selection_select_path(gtk_tree_view_get_selection(tree_view),

@@ -1,6 +1,6 @@ /* main_statusbar.c * - * $Id: main_statusbar.c 37134 2011-05-13 21:49:35Z stig $ + * $Id: main_statusbar.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -658,7 +658,7 @@ static void -statusbar_cf_file_read_started_cb(capture_file *cf) +statusbar_cf_file_read_started_cb(capture_file *cf, const char *action) { const gchar *name_ptr; @@ -667,7 +667,7 @@ name_ptr = get_basename(cf->filename); - statusbar_push_file_msg(" Loading: %s", name_ptr); + statusbar_push_file_msg(" %s: %s", action, name_ptr); } @@ -807,14 +807,6 @@ } static void -statusbar_cf_file_reload_finished_cb(capture_file *cf) -{ - statusbar_pop_file_msg(); - statusbar_set_filename(cf->filename, cf->f_datalen, &(cf->elapsed_time)); -} - - -static void statusbar_cf_file_save_failed_cb(gpointer data _U_) { /* Pop the "Saving:" message off the status bar. */ @@ -834,11 +826,17 @@ statusbar_cf_file_closed_cb(data); break; case(cf_cb_file_read_started): - statusbar_cf_file_read_started_cb(data); + statusbar_cf_file_read_started_cb(data, "Loading"); break; case(cf_cb_file_read_finished): statusbar_cf_file_read_finished_cb(data); break; + case(cf_cb_file_reload_started): + statusbar_cf_file_read_started_cb(data, "Reloading"); + break; + case(cf_cb_file_reload_finished): + statusbar_cf_file_read_finished_cb(data); + break; case(cf_cb_packet_selected): break; case(cf_cb_packet_unselected): @@ -852,9 +850,6 @@ case(cf_cb_file_save_finished): statusbar_cf_file_save_finished_cb(data); break; - case(cf_cb_file_save_reload_finished): - statusbar_cf_file_reload_finished_cb(data); - break; case(cf_cb_file_save_failed): statusbar_cf_file_save_failed_cb(data); break;

@@ -65,7 +65,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -2,7 +2,7 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id: make-version.pl 41975 2012-04-06 20:03:55Z gerald $ +# $Id: make-version.pl 42785 2012-05-22 17:12:13Z 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" => 8, + "version_micro" => 9, "version_build" => 0, "enable" => 1,

@@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 42725 2012-05-20 14:34:01Z gerald $ +# $Id: manuf 43913 2012-07-22 15:04:40Z gerald $ # # Laurent Deniel <laurent.deniel [AT] free.fr> # @@ -2854,7 +2854,7 @@ 00:0B:0C Agile # Agile Systems Inc. 00:0B:0D Air2u # Air2U, Inc. 00:0B:0E TrapezeN # Trapeze Networks -00:0B:0F NyquistI # Nyquist Industrial Control BV +00:0B:0F BoschRex # Bosch Rexroth 00:0B:10 11waveTe # 11wave Technonlogy Co.,Ltd 00:0B:11 HimejiAb # HIMEJI ABC TRADING CO.,LTD. 00:0B:12 NuriTele # NURI Telecom Co., Ltd. @@ -3297,7 +3297,7 @@ 00:0C:C7 Intellig # Intelligent Computer Solutions Inc. 00:0C:C8 Xytronix # Xytronix Research & Design, Inc. 00:0C:C9 IlwooDat # ILWOO DATA & TECHNOLOGY CO.,LTD -00:0C:CA HitachiG # Hitachi Global Storage Technologies +00:0C:CA HgstAWes # HGST a Western Digital Company 00:0C:CB DesignCo # Design Combus Ltd 00:0C:CC Aeroscou # Aeroscout Ltd. 00:0C:CD Iec-Tc57 # IEC - TC57 @@ -4500,7 +4500,7 @@ 00:11:7B Bã¼ChiLa # BÃ¼chi Labortechnik AG 00:11:7C E-ZyNet # e-zy.net 00:11:7D ZmdAmeri # ZMD America, Inc. -00:11:7E Progeny # Progeny Inc. +00:11:7E ProgenyA # Progeny, A division of Midmark Corp 00:11:7F NeotuneI # Neotune Information Technology Corporation,.LTD 00:11:80 Motorola # Motorola Mobility, Inc. 00:11:81 Interene # InterEnergy Co.Ltd, @@ -9488,7 +9488,7 @@ 00:24:FA HilgerUK # Hilger u. Kern GMBH 00:24:FB Private 00:24:FC Quopin # QuoPin Co., Ltd. -00:24:FD Prosilie # Prosilient Technologies AB +00:24:FD Accedian # Accedian Networks Inc 00:24:FE Avm # AVM GmbH 00:24:FF Qlogic # QLogic Corporation 00:25:00 Apple # Apple, Inc @@ -14718,6 +14718,56 @@ 00:50:C2:F9:60:00/36 Jlcooper # JLCooper Electronics 00:50:C2:F9:70:00/36 SiconSrl # Sicon srl 00:50:C2:F9:80:00/36 Infotech # Infotech North America +00:50:C2:F9:90:00/36 DrNeuman # Dr. Neumann elektronik GmbH +00:50:C2:F9:A0:00/36 Telvent +00:50:C2:F9:B0:00/36 NewellTe # NEWELL TECHNOLOGIES LIMITED +00:50:C2:F9:C0:00/36 R&DKomet # R&D KOMETEH +00:50:C2:F9:D0:00/36 Jsc"Kalu # JSC "Kaluga Teletypes Manufacturing Plant" +00:50:C2:F9:E0:00/36 Matsusad # Matsusada Precision Inc. +00:50:C2:F9:F0:00/36 NanjingS # Nanjing SAC Power Grid Automation Co., Ltd. +00:50:C2:FA:00:00/36 AmplusCo # Amplus Communication Pte Ltd +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. +00:50:C2:FA:80:00/36 YashSiqu # Yash SiQure Technologies India Pvt. Ltd. +00:50:C2:FA:90:00/36 HijetPri # Hijet Print d.o.o. +00:50:C2:FA:A0:00/36 Yjsystem +00:50:C2:FA:B0:00/36 AplexTec # Aplex Technology Inc. +00:50:C2:FA:C0:00/36 AdetelGr # ADETEL GROUP +00:50:C2:FA:D0:00/36 Finishin # Finishing Brands +00:50:C2:FA:E0:00/36 AtiAutom # ATI Automacao Telecomunicacoes e Informatica Ltda +00:50:C2:FA:F0:00/36 Vremya-C # Vremya-CH JSC +00:50:C2:FB:00:00/36 Tateishi # Tateishi Kobisha Co.LTD +00:50:C2:FB:10:00/36 Matelex +00:50:C2:FB:20:00/36 PrestonI # Preston Industries dba PolyScience +00:50:C2:FB:30:00/36 Ct # CT Company +00:50:C2:FB:40:00/36 Mc-Monit # MC-monitoring SA +00:50:C2:FB:50:00/36 Assembly # Assembly Contracts Limited +00:50:C2:FB:60:00/36 Argus-Sp # ARGUS-SPECTRUM +00:50:C2:FB:70:00/36 PounceCo # Pounce Consulting +00:50:C2:FB:80:00/36 Techno # TECHNO CO.,LTD. +00:50:C2:FB:90:00/36 CoralTel # Coral Telecom Ltd +00:50:C2:FB:A0:00/36 ElbitOfA # Elbit Systems of America +00:50:C2:FB:B0:00/36 Acida # ACIDA GmbH +00:50:C2:FB:C0:00/36 LeroySom # Leroy Somer +00:50:C2:FB:D0:00/36 FhfFunke # FHF Funke + Huster Fernsig GmbH +00:50:C2:FB:E0:00/36 SentecEl # senTec Elektronik GmbH +00:50:C2:FB:F0:00/36 Mylogic +00:50:C2:FC:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA +00:50:C2:FC:10:00/36 MotecPty # Motec Pty Ltd +00:50:C2:FC:20:00/36 Elta +00:50:C2:FC:30:00/36 HsdcSpZO # HSDC Sp. z o.o. +00:50:C2:FC:40:00/36 Kyowaden # Kyowadensi +00:50:C2:FC:50:00/36 SakuraSe # Sakura Seiki Co.,Ltd. +00:50:C2:FC:60:00/36 Critical # Critical Link +00:50:C2:FC:70:00/36 SercomRe # SERCOM Regeltechniek +00:50:C2:FC:80:00/36 FarSouth # Far South Networks +00:50:C2:FC:90:00/36 MehtaTec # Mehta Tech, Inc. +00:50:C2:FC:A0:00/36 Telemisi # Telemisis Ltd 00:50:C4 Imd 00:50:C5 AdsTechn # ADS Technologies, Inc 00:50:C6 LoopTele # LOOP TELECOMMUNICATION INTERNATIONAL, INC. @@ -14777,6 +14827,7 @@ 00:54:AF Continen # Continental Automotive Systems Inc. 00:55:00 Xerox 00:5C:B1 GospellD # Gospell DIGITAL TECHNOLOGY CO., LTD +00:5D:03 Xilinx # Xilinx, Inc 00:60:00 Xycom # XYCOM INC. 00:60:01 Innosys # InnoSys, Inc. 00:60:02 ScreenSu # SCREEN SUBTITLING SYSTEMS, LTD @@ -16314,7 +16365,7 @@ 00:D0:B0 Bitswitc # BITSWITCH LTD. 00:D0:B1 OmegaEle # OMEGA ELECTRONICS SA 00:D0:B2 Xiotech # XIOTECH CORPORATION -00:D0:B3 DrsFligh # DRS FLIGHT SAFETY AND +00:D0:B3 DrsTechn # DRS Technologies Canada Ltd 00:D0:B4 Katsujim # KATSUJIMA CO., LTD. 00:D0:B5 IpricotF # IPricot formerly DotCom 00:D0:B6 Crescent # CRESCENT NETWORKS, INC. @@ -16394,6 +16445,7 @@ 00:D1:1C Acetel 00:D3:8D HotelTec # Hotel Technology Next Generation 00:D6:32 GeEnergy # GE Energy +00:DB:1E AlbedoTe # Albedo Telecom SL 00:DB:45 Thamway # THAMWAY CO.,LTD. 00:DB:DF IntelCor # Intel Corporate 00:DD:00 Ungerman # UNGERMANN-BASS INC. @@ -16673,11 +16725,13 @@ 00:E6:D3 NixdorfC # NIXDORF COMPUTER CORP. 00:E8:AB MeggittT # Meggitt Training Systems, Inc. 00:F0:51 Kwb # KWB Gmbh +00:F4:03 OrbisOy # Orbis Systems Oy 00:F4:B9 Apple # Apple, Inc. 00:F8:60 PtPanggu # PT. Panggung Electric Citrabuana 00:FA:3B CloosEle # CLOOS ELECTRONIC GMBH 00:FC:58 Websilic # WebSilicon Ltd. 00:FC:70 Intrepid # Intrepid Control Systems, Inc. +00:FD:4C Nevatec 01:0E:CF PN-MC # PROFINET Multicast 02:04:06 BbnInter # BBN internal usage (not registered) 02:07:01 Racal-Da # RACAL-DATACOM @@ -16704,6 +16758,7 @@ 04:0E:C2 Viewsoni # ViewSonic Mobile China Limited 04:18:0F SamsungE # Samsung Electronics Co.,Ltd 04:18:B6 Private +04:18:D6 Ubiquiti # Ubiquiti Networks 04:1D:10 DreamWar # Dream Ware Inc. 04:1E:64 Apple # Apple, Inc 04:20:9A Panasoni # Panasonic AVC Networks Company @@ -16714,6 +16769,7 @@ 04:32:F4 Partron 04:36:04 Gyeyoung # Gyeyoung I&T 04:46:65 MurataMa # Murata Manufacturing Co., Ltd. +04:4A:50 RamaxelT # Ramaxel Technology (Shenzhen) limited company 04:4F:AA RuckusWi # Ruckus Wireless 04:54:53 Apple # Apple, Inc. 04:55:CA BriviewX # BriView (Xiamen) Corp. @@ -16736,6 +16792,7 @@ 04:94:A1 CatchWin # CATCH THE WIND INC 04:98:F3 AlpsElec # ALPS Electric Co,. Ltd. 04:9C:62 BmtMedic # BMT Medical Technology s.r.o. +04:9F:06 Smobile # Smobile Co., Ltd. 04:9F:81 SimenaLl # Simena, LLC 04:A3:F3 Emicon 04:A8:2A Nokia # Nokia Corporation @@ -16904,6 +16961,7 @@ 08:00:8F Chipcom # CHIPCOM CORPORATION 08:00:90 Retix 08:08:EA Amsc +08:0C:0B SysmikDr # SysMik GmbH Dresden 08:0C:C9 MissionT # Mission Technology Group, dba Magma 08:0D:84 Geco # GECO, Inc. 08:11:96 IntelCor # Intel Corporate @@ -16925,10 +16983,13 @@ 08:4E:BF BroadNet # Broad Net Mux Corporation 08:51:2E OrionDia # Orion Diagnostica Oy 08:5B:0E Fortinet # Fortinet, Inc. +08:68:EA EitoElec # EITO ELECTRONICS CO., LTD. 08:75:72 ObeluxOy # Obelux Oy 08:76:18 VieTechn # ViE Technologies Sdn. Bhd. 08:76:95 AutoIndu # Auto Industrial Co., Ltd. 08:76:FF ThomsonT # Thomson Telecom Belgium +08:7C:BE Quintic # Quintic Corp. +08:7D:21 AltasecT # Altasec technology corporation 08:86:3B BelkinIn # Belkin International, Inc. 08:8D:C8 RyowaEle # Ryowa Electronics Co.,Ltd 08:8F:2C HillsSou # Hills Sound Vision & Lighting @@ -16994,6 +17055,8 @@ 0C:BF:15 Genetec 0C:C0:C0 MagnetiM # MAGNETI MARELLI SISTEMAS ELECTRONICOS MEXICO 0C:C3:A7 Meritec +0C:C4:7E Eucast # EUCAST Co., Ltd. +0C:C6:6A Nokia # Nokia Corporation 0C:C6:AC Dags 0C:C9:C6 SamwinHo # Samwin Hong Kong Limited 0C:CD:D3 Eastrive # EASTRIVER TECHNOLOGY CO., LTD. @@ -17002,6 +17065,10 @@ 0C:D5:02 Westell 0C:D6:96 Amimon # Amimon Ltd 0C:D7:C2 AxiumTec # Axium Technologies, Inc. +0C:D9:96 Cisco # Cisco Systems +0C:D9:C1 JohnsonC # Johnson Controls-ASG +0C:DA:41 Hangzhou # Hangzhou H3C Technologies Co., Limited +0C:DC:CC InalaTec # Inala Technologies 0C:DD:EF Nokia # Nokia Corporation 0C:DF:A4 SamsungE # Samsung Electronics Co.,Ltd 0C:E5:D3 DhElectr # DH electronics GmbH @@ -17028,6 +17095,7 @@ 10:0E:2B NecCasio # NEC CASIO Mobile Communications 10:10:B6 Mccain # McCain Inc 10:12:12 VivoInte # Vivo International Corporation Pty Ltd +10:12:48 Itg # ITG, Inc. 10:13:EE JustecIn # Justec International Technology INC. 10:18:9E ElmoMoti # Elmo Motion Control 10:1B:54 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -17042,11 +17110,15 @@ 10:45:BE Norphoni # Norphonic AS 10:45:F8 Lnt-Auto # LNT-Automation GmbH 10:47:80 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +10:48:B1 BeijingD # Beijing Duokan Technology Limited 10:56:CA PeplinkI # Peplink International Ltd. +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:6F:3F Buffalo # Buffalo Inc. +10:6F:EF Ad-SolNi # Ad-Sol Nissin Corp 10:71:F9 CloudTel # Cloud Telecomputers, LLC 10:76:8A Eocell 10:78:D2 Elitegro # ELITEGROUP COMPUTER SYSTEM CO., LTD. @@ -17076,22 +17148,26 @@ 10:E6:AE SourceTe # Source Technologies, LLC 10:E8:EE Phasespa # PhaseSpace 10:EE:D9 CanogaPe # Canoga Perkins Corporation +10:F3:DB Gridco # Gridco Systems, Inc. 10:F9:6F LgElectr # LG Electronics 10:F9:EE Nokia # Nokia Corporation 10:FC:54 ShanyEle # Shany Electronic Co., Ltd. 11:00:AA Private 14:07:08 Private 14:07:E0 Abrantix # Abrantix AG +14:10:9F Apple # Apple Inc 14:14:4B FujianSt # FUJIAN STAR-NET COMMUNICATION CO.,LTD 14:1A:51 Treetech # Treetech Sistemas Digitais 14:1B:BD Volex # Volex Inc. 14:2D:F5 Amphitec # Amphitech 14:30:7A Avermetr # Avermetrics +14:35:8B Mediabri # Mediabridge Products, LLC. 14:35:B3 FutureDe # Future Designs, Inc. 14:36:05 Nokia # Nokia Corporation 14:37:3B Procom # PROCOM Systems 14:3A:EA Dynapowe # Dynapower Company LLC 14:3E:60 Alcatel- # Alcatel-Lucent +14:43:19 Creative # Creative&Link Technology Limited 14:49:78 DigitalC # Digital Control Incorporated 14:4C:1A MaxCommu # Max Communication GmbH 14:54:12 Entis # Entis Co., Ltd. @@ -17132,6 +17208,7 @@ 18:06:75 DilaxInt # DILAX Intelcom GmbH 18:0B:52 Nanotron # Nanotron Technologies GmbH 18:0C:77 Westingh # Westinghouse Electric Company, LLC +18:0C:AC Canon # CANON INC. 18:14:20 TebSas # TEB SAS 18:14:56 Nokia # Nokia Corporation 18:17:14 Daewoois @@ -17150,6 +17227,7 @@ 18:42:1D Private 18:42:2F AlcatelL # Alcatel Lucent 18:46:17 SamsungE # Samsung Electronics +18:48:D8 Fastback # Fastback Networks 18:4E:94 MessoaTe # MESSOA TECHNOLOGIES INC. 18:59:33 CiscoSpv # Cisco SPVTG 18:66:E3 Veros # Veros Systems, Inc. @@ -17158,11 +17236,13 @@ 18:7C:81 ValeoVis # Valeo Vision Systems 18:80:CE Barberry # Barberry Solutions Ltd 18:80:F5 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd +18:86:3A DigitalA # DIGITAL ART SYSTEM 18:86:AC NokiaDan # Nokia Danmark A/S 18:87:96 Htc # HTC Corporation 18:8E:D5 PhilipsI # Philips Innovative Application NV 18:92:2C VirtualI # Virtual Instruments 18:97:FF Techfait # TechFaith Wireless Technology Limited +18:9A:67 Cse-Serv # CSE-Servelec Limited 18:9E:FC Apple # Apple Inc 18:A9:05 Hewlett- # Hewlett-Packard Company 18:AB:F5 UltraEle # Ultra Electronics - Electrics @@ -17206,10 +17286,12 @@ 1C:4B:D6 Azurewav # AzureWave 1C:51:B5 Techaya # Techaya LTD 1C:5C:55 PrimaCin # PRIMA Cinema, Inc +1C:5C:60 Shenzhen # Shenzhen Belzon Technology Co.,LTD. 1C:5F:FF BeijingE # Beijing Ereneben Information Technology Co.,Ltd Shenzhen Branch 1C:62:B8 SamsungE # Samsung Electronics Co.,Ltd 1C:65:9D LiteonTe # Liteon Technology Corporation 1C:66:6D HonHaiPr # Hon Hai Precision Ind.Co.Ltd +1C:66:AA SamsungE # Samsung Electronics 1C:69:A5 Research # Research In Motion 1C:6B:CA Mitsunam # Mitsunami Co., Ltd. 1C:6F:65 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. @@ -17221,6 +17303,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:94:92 RuagSchw # RUAG Schweiz AG 1C:95:5D I-LaxEle # I-LAX ELECTRONICS INC. 1C:97:3D PricomDe # PRICOM Design 1C:AA:07 Cisco # Cisco Systems @@ -17233,6 +17316,7 @@ 1C:BD:0E Amplifie # Amplified Engineering Pty Ltd 1C:BD:B9 D-LinkIn # D-LINK INTERNATIONAL PTE LIMITED 1C:C1:DE Hewlett- # Hewlett-Packard Company +1C:C3:16 Milesigh # MileSight Technology Co., Ltd. 1C:C6:3C Arcadyan # Arcadyan Technology Corporation 1C:D4:0C KriwanIn # Kriwan Industrie-Elektronik GmbH 1C:DF:0F Cisco # Cisco Systems @@ -17240,7 +17324,7 @@ 1C:E1:92 Qisda # Qisda Corporation 1C:E2:CC TexasIns # Texas Instruments 1C:F0:61 Scaps # SCAPS GmbH -1C:F4:CA Aviwest +1C:F4:CA Private 1C:F5:E7 TurtleIn # Turtle Industry Co., Ltd. 1C:FE:A7 Identyte # IDentytech Solutins Ltd. 20:01:4F LineaRes # Linea Research Ltd @@ -17265,15 +17349,19 @@ 20:4A:AA HanscanS # Hanscan Spain S.A. 20:4E:6B AxxanaIs # Axxana(israel) ltd 20:4E:7F Netgear +20:54:76 SonyMobi # Sony Mobile Communications AB 20:59:A0 ParagonT # Paragon Technologies Inc. 20:5B:2A Private 20:5B:5E Shenzhen # Shenzhen Wonhe Technology Co., Ltd 20:64:32 SamsungE # SAMSUNG ELECTRO MECHANICS CO.,LTD. +20:67:B1 Pluto # Pluto inc. 20:6A:8A WistronI # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. 20:6A:FF AtlasEle # Atlas Elektronik UK Limited 20:6F:EC BraemacC # Braemac CA LLC +20:74:CF Shenzhen # Shenzhen Voxtech Co.,Ltd 20:76:00 Actionte # Actiontec Electronics, Inc 20:7C:8F QuantaMi # Quanta Microsystems,Inc. +20:89:84 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD 20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd 20:A2:E7 Lee-Dick # Lee-Dickens Ltd 20:AA:25 Ip-NetLl # IP-NET LLC @@ -17285,10 +17373,13 @@ 20:BF:DB Dvl 20:C1:AF IWitDigi # i Wit Digital Co., Limited 20:C8:B3 Shenzhen # SHENZHEN BUL-TECH CO.,LTD. +20:C9:D0 Apple # Apple Inc 20:CF:30 AsustekC # ASUSTek COMPUTER INC. 20:D5:AB KoreaInf # Korea Infocom Co.,Ltd. 20:D6:07 Nokia # Nokia Corporation 20:D9:06 Iota # Iota, Inc. +20:DC:93 CheetahH # Cheetah Hi-Tech, Inc. +20:E5:2A Netgear # NETGEAR INC., 20:E5:64 Motorola # Motorola Mobility, Inc. 20:EE:C6 Elefirst # Elefirst Science & Tech Co ., ltd 20:F0:02 MtdataDe # MTData Developments Pty. Ltd. @@ -17315,6 +17406,7 @@ 24:49:7B Innovati # Innovative Converged Devices Inc 24:5F:DF Kyocera # KYOCERA Corporation 24:65:11 Avm # AVM GmbH +24:69:4A Jasmine # Jasmine Systems Inc. 24:76:7D CiscoSpv # Cisco SPVTG 24:77:03 IntelCor # Intel Corporate 24:82:8A ProwaveT # Prowave Technologies Ltd. @@ -17343,11 +17435,13 @@ 24:CB:E7 Myk # MYK, Inc. 24:CF:21 Shenzhen # Shenzhen State Micro Technology Co., Ltd 24:D2:CC Smartdri # SmartDrive Systems Inc. +24:D9:21 Avaya # Avaya, Inc 24:DA:B6 Sistemas # Sistemas de Gestión Energética S.A. de C.V. 24:DB:AC HuaweiDe # Huawei Device Co., Ltd 24:DB:AD Shoppert # ShopperTrak RCT Corporation 24:E6:BA JscZavod # JSC Zavod im. Kozitsky 24:EC:99 AskeyCom # Askey Computer Corp +24:EE:3A ChengduY # Chengdu Yingji Electronic Hi-tech Co Ltd 24:F0:FF Ght # GHT Co., Ltd. 28:04:E0 FermaxEl # FERMAX ELECTRONICA S.A.U. 28:06:1E NingboGl # NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD @@ -17360,6 +17454,7 @@ 28:17:CE Omnisens # Omnisense Ltd 28:18:FD AdityaIn # Aditya Infotech Ltd. 28:26:A6 PbrElect # PBR electronics GmbH +28:29:D9 Globalbe # GlobalBeiMing technology (Beijing)Co. Ltd 28:34:10 EnigmaDi # Enigma Diagnostics Limited 28:37:37 Apple # Apple, Inc. 28:38:CF Gen2wave @@ -17381,13 +17476,18 @@ 28:72:F0 Athena 28:85:2D TouchNet # Touch Networks 28:89:15 Cashguar # CashGuard Sverige AB +28:91:D0 StageTec # Stage Tec Entwicklungsgesellschaft fuer professionelle Audiotechnik mbH 28:92:4A HewlettP # Hewlett Packard 28:93:FE Cisco # Cisco Systems 28:94:0F Cisco # Cisco Systems 28:98:7B SamsungE # Samsung Electronics Co.,Ltd +28:9A:4B Steelser # SteelSeries ApS +28:9E:DF DanfossT # Danfoss Turbocor Compressors, Inc +28:A1:86 Enblink 28:A5:74 MillerEl # Miller Electric Mfg. Co. 28:AF:0A SiriusXm # Sirius XM Radio Inc 28:B0:CC XenyaDOO # Xenya d.o.o. +28:B3:AB GenmarkA # Genmark Automation 28:BA:18 NextnavL # NextNav, LLC 28:BE:9B Technico # Technicolor USA Inc. 28:C0:DA JuniperN # Juniper Networks @@ -17431,6 +17531,8 @@ 2C:41:38 Hewlett- # Hewlett-Packard Company 2C:44:01 SamsungE # Samsung Electronics Co.,Ltd 2C:54:2D Cisco # Cisco Systems +2C:62:5A FinestSe # Finest Security Systems Co., Ltd +2C:62:89 Regeners # Regenersis (Glenrothes) Ltd 2C:67:FB Shenzhen # ShenZhen Zhengjili Electronics Co., LTD 2C:6B:F5 JuniperN # Juniper networks 2C:75:0F Shanghai # Shanghai Dongzhou-Lawton Communication Technology Co. Ltd. @@ -17447,6 +17549,7 @@ 2C:A1:57 Acromate # ACROMATE, INC. 2C:A7:80 TrueTech # True Technologies Inc. 2C:A8:35 Rim +2C:AB:25 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd 2C:B0:5D Netgear 2C:B0:DF SolitonT # Soliton Technologies Pvt Ltd 2C:B6:9D RedDigit # RED Digital Cinema @@ -17459,6 +17562,7 @@ 2C:D4:44 Fujitsu # Fujitsu Limited 2C:DD:0C Discover # Discovergy GmbH 2C:E4:12 Sagemcom # SAGEMCOM SAS +2C:ED:EB AlpheusD # Alpheus Digital Company Limited 2C:EE:26 Petroleu # Petroleum Geo-Services 2C:F4:C5 Avaya # Avaya Inc 2E:2E:2E LaaLocal # LAA (Locally Administered Address) for Meditech Systems @@ -17485,12 +17589,14 @@ 30:52:5A Nst # NST Co., LTD 30:55:ED TrexNetw # Trex Network LLC 30:57:AC Irlab # IRLAB LTD. +30:5D:38 Beissbar # Beissbarth 30:61:18 Paradom # Paradom Inc. 30:68:8C ReachTec # Reach Technology Inc. 30:69:4B Rim 30:6C:BE Skymotio # Skymotion Technology (HK) Limited 30:6E:5C ValidusT # Validus Technologies 30:71:B2 Hangzhou # Hangzhou Prevail Optoelectronic Equipment Co.,LTD. +30:78:C2 Innowire # Innowireless, Co. Ltd. 30:7C:30 Rim 30:7E:CB Sfr 30:85:A9 AsustekC # Asustek Computer Inc @@ -17504,7 +17610,10 @@ 30:E4:DB Cisco # Cisco Systems 30:EB:25 IntekDig # INTEK DIGITAL 30:EF:D1 AlstomSt # Alstom Strongwish (Shenzhen) Co., Ltd. +30:F3:3A +PluggSr # +plugg srl +30:F7:0D Cisco # Cisco Systems 30:F9:ED Sony # Sony Corporation +30:FD:11 Macrotec # MACROTECH (USA) INC. 34:07:FB Ericsson # Ericsson AB 34:08:04 D-Link # D-Link Corporation 34:15:9E Apple # Apple, Inc @@ -17519,6 +17628,7 @@ 34:51:C9 Apple # Apple, Inc. 34:5B:11 EviHeat # EVI HEAT AB 34:68:4A Terawork # Teraworks Co., Ltd. +34:6B:D3 HuaweiTe # Huawei Technologies Co., Ltd 34:6E:8A Ecosense 34:6F:92 WhiteRod # White Rodgers Division 34:76:C5 I-ODataD # I-O DATA DEVICE, INC. @@ -17538,11 +17648,13 @@ 34:A7:BA FischerI # Fischer International Systems Corporation 34:AA:99 Alcatel- # Alcatel-Lucent 34:AA:EE Mikrovis # Mikrovisatos Servisas UAB +34:AF:2C Nintendo # Nintendo Co., Ltd. 34:B5:71 Plds 34:BA:51 Se-KureC # Se-Kure Controls, Inc. 34:BA:9A Asiatelc # Asiatelco Technologies Co. 34:BB:1F Research # Research In Motion 34:BC:A6 BeijingD # Beijing Ding Qing Technology, Ltd. +34:BD:C8 Cisco # Cisco Systems 34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd. 34:C3:AC SamsungE # Samsung Electronics 34:C6:9A Enecsys # Enecsys Ltd @@ -17550,7 +17662,9 @@ 34:CE:94 ParsecPt # Parsec (Pty) Ltd 34:D0:9B Mobilmax # MobilMAX Technology Inc. 34:D2:C4 RenaPrin # RENA GmbH Print Systeme +34:D7:B4 Tributar # Tributary Systems, Inc. 34:DF:2A FujikonI # Fujikon Industrial Co.,Limited +34:E0:CF Zte # zte corporation 34:E0:D7 Dongguan # DONGGUAN QISHENG ELECTRONICS INDUSTRIAL CO., LTD 34:EF:44 2wire 34:EF:8B NttCommu # NTT Communications Corporation @@ -17562,6 +17676,7 @@ 38:0A:94 SamsungE # Samsung Electronics Co.,Ltd 38:0D:D4 PrimaxEl # Primax Electronics LTD. 38:16:D1 SamsungE # Samsung Electronics Co.,Ltd +38:1C:4A SimcomWi # SIMCom Wireless Solutions Co.,Ltd. 38:22:9D AdbBroad # ADB Broadband Italia 38:22:D6 H3cTechn # H3C Technologies Co., Limited 38:26:CD Andtek # ANDTEK @@ -17584,8 +17699,10 @@ 38:91:FB XenoxBv # Xenox Holding BV 38:95:92 BeijingT # Beijing Tendyron Corporation 38:9F:83 OtnNV # OTN Systems N.V. +38:A5:B6 Shenzhen # SHENZHEN MEGMEET ELECTRICAL CO.,LTD 38:A8:51 Quickset # Quickset International Inc 38:A9:5F Actifio # Actifio Inc +38:AA:3C SamsungE # SAMSUNG ELECTRO-MECHANICS 38:B1:2D Sonotron # Sonotronic Nagel GmbH 38:BB:23 Ozvision # OzVision America LLC 38:BF:33 NecCasio # NEC CASIO Mobile Communications @@ -17724,6 +17841,7 @@ 40:AC:8D DataMana # Data Management, Inc. 40:B2:C8 NortelNe # Nortel Networks 40:B3:FC Logital # Logital Co. Limited +40:B4:F0 JuniperN # Juniper Networks 40:B7:F3 Motorola # Motorola Mobility, Inc. 40:BA:61 ArimaCom # Arima Communications Corp. 40:BC:8B Itelio # itelio GmbH @@ -17783,6 +17901,7 @@ 44:8E:12 DtResear # DT Research, Inc. 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:9C:B5 Alcomp # Alcomp, Inc 44:A4:2D TctMobil # TCT Mobile Limited 44:A6:89 PromaxEl # PROMAX ELECTRONICA SA @@ -17793,6 +17912,7 @@ 44:B3:82 Kuang-Ch # Kuang-chi Institute of Advanced Technology 44:C1:5C TexasIns # Texas Instruments 44:C2:33 Guangzho # Guangzhou Comet Technology Development Co.Ltd +44:C3:9B OooRubez # OOO RUBEZH NPO 44:C9:A2 Greenwal # Greenwald Industries 44:D1:5E Shanghai # Shanghai Kingto Information Technology Ltd 44:D2:CA AnviaTvO # Anvia TV Oy @@ -17838,6 +17958,7 @@ 48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd 48:A6:D2 GjsunOpt # GJsun Optical Science and Tech Co.,Ltd. 48:AA:5D StoreEle # Store Electronic Systems +48:B2:53 Marketax # Marketaxess Corporation 48:C1:AC Plantron # PLANTRONICS, INC. 48:C8:62 SimoWire # Simo Wireless,Inc. 48:C8:B6 Systec # SysTec GmbH @@ -17854,12 +17975,14 @@ 48:F3:17 Private 48:F4:7D Techvisi # TechVision Holding Internation Limited 48:F7:F1 Alcatel- # Alcatel-Lucent +48:F8:B3 Cisco-Li # Cisco-Linksys, LLC 48:F8:E1 AlcatelL # Alcatel Lucent WT 48:FC:B8 Woodstre # Woodstream Corporation 4C:02:2E CmrKorea # CMR KOREA CO., LTD 4C:02:89 LexCompu # LEX COMPUTECH CO., LTD 4C:06:8A BaslerEl # Basler Electric Company 4C:07:C9 Computer # COMPUTER OFFICE Co.,Ltd. +4C:09:B4 Zte # zte corporation 4C:0B:3A TctMobil # TCT Mobile Limited 4C:0F:6E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 4C:0F:C7 EardaEle # Earda Electronics Co.,Ltd @@ -17911,6 +18034,7 @@ 4C:ED:DE AskeyCom # Askey Computer Corp 4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd 50:00:8C HongKong # Hong Kong Telecommunications (HKT) Limited +50:01:BB SamsungE # Samsung Electronics 50:05:3D CyweeGro # CyWee Group Ltd 50:0B:32 FoxdaTec # Foxda Technology Industrial(ShenZhen)Co.,LTD 50:0E:6D Trafficc # TrafficCast International @@ -17924,6 +18048,7 @@ 50:2D:F4 PhytecMe # Phytec Messtechnik GmbH 50:2E:CE AsahiEle # Asahi Electronics Co.,Ltd 50:3D:E5 Cisco # Cisco Systems +50:3F:56 Syncmold # Syncmold Enterprise Corp 50:48:EB BeijingH # BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD. 50:4A:5E Masimo # Masimo Corporation 50:56:63 TexasIns # Texas Instruments @@ -17934,9 +18059,11 @@ 50:67:F0 ZyxelCom # ZyXEL Communications Corporation 50:6F:9A Wi-FiAll # Wi-Fi Alliance 50:70:E5 HeShanWo # He Shan World Fair Electronics Technology Limited +50:72:4D BegBruec # BEG Brueck Electronic GmbH 50:76:A6 EcilInfo # Ecil Informatica Ind. Com. Ltda 50:79:5B Interexp # Interexport Telecomunicaciones S.A. 50:7D:02 Biodit +50:7E:5D Arcadyan # Arcadyan Technology Corporation 50:87:B8 Nuvyyo # Nuvyyo Inc 50:8A:42 UptmateT # Uptmate Technology Co., LTD 50:8A:CB Shenzhen # SHENZHEN MAXMADE TECHNOLOGY CO., LTD. @@ -17946,6 +18073,7 @@ 50:A6:E3 DavidCla # David Clark Company 50:A7:33 RuckusWi # Ruckus Wireless 50:AF:73 Shenzhen # Shenzhen Bitland Information Technology Co., Ltd. +50:B7:C3 SamsungE # Samsung Electronics Co.,LTD 50:C5:8D JuniperN # Juniper Networks 50:C9:71 GnNetcom # GN Netcom A/S 50:CC:F8 SamsungE # Samsung Electro Mechanics @@ -17979,6 +18107,7 @@ 54:53:ED Sony # Sony Corporation 54:5E:BD NlTechno # NL Technologies 54:5F:A9 Teracom # Teracom Limited +54:73:98 ToyoElec # Toyo Electronics Corporation 54:75:D0 Cisco # Cisco Systems 54:7F:54 Ingenico 54:7F:EE Cisco # Cisco Systems @@ -18028,19 +18157,21 @@ 58:66:BA Hangzhou # Hangzhou H3C Technologies Co., Limited 58:67:1A Barnes&N # BARNES&NOBLE.COM 58:67:7F ClareCon # Clare Controls Inc. -58:69:6C FujianRu # Fujian Ruijeie Networks co, ltd +58:69:6C FujianRu # Fujian Ruijie Networks co, ltd 58:69:F9 FusionTr # Fusion Transactive Ltd. 58:6D:8F Cisco-Li # Cisco-Linksys, LLC 58:6E:D6 Private 58:75:21 CjscRtso # CJSC RTSoft 58:76:75 BeijingE # Beijing ECHO Technologies Co.,Ltd 58:7F:C8 S2m +58:87:4C Lite-OnC # LITE-ON CLEAN ENERGY TECHNOLOGY CORP. 58:8D:09 Cisco # Cisco Systems 58:91:CF IntelCor # Intel Corporate 58:92:0D KineticA # Kinetic Avionics Limited 58:93:96 RuckusWi # Ruckus Wireless 58:94:6B IntelCor # Intel Corporate 58:98:35 Technico # Technicolor +58:98:6F Revoluti # Revolution Display 58:A7:6F Id # iD corporation 58:B0:35 Apple # Apple, Inc 58:B0:D4 Zunidata # ZuniData Systems Inc. @@ -18048,6 +18179,7 @@ 58:BC:27 Cisco # Cisco Systems 58:BD:A3 Nintendo # Nintendo Co., Ltd. 58:BF:EA Cisco # Cisco Systems +58:C2:32 Nec # NEC Corporation 58:C3:8B SamsungE # Samsung Electronics 58:CF:4B LufkinIn # Lufkin Industries 58:D0:8F Ieee1904 # IEEE 1904.1 Working Group @@ -18056,6 +18188,7 @@ 58:E6:36 EvrsafeT # EVRsafe Technologies 58:E7:47 Deltanet # Deltanet AG 58:E8:08 Autonics # AUTONICS CORPORATION +58:EC:E1 Newport # Newport Corporation 58:EE:CE IconTime # Icon Time Systems 58:F6:7B XiaMenUn # Xia Men UnionCore Technology LTD. 58:F6:BF KyotoUni # Kyoto University @@ -18070,14 +18203,18 @@ 5C:17:37 I-ViewNo # I-View Now, LLC. 5C:17:D3 Lge # LGE 5C:18:B5 TalonCom # Talon Communications +5C:24:79 Baltech # Baltech AG 5C:26:0A Dell # Dell Inc. 5C:33:8E AlphaNet # Alpha Networkc Inc. 5C:35:3B CompalBr # Compal Broadband Networks Inc. 5C:35:DA ThereOy # There Corporation Oy 5C:40:58 Jefferso # Jefferson Audio Video Systems, Inc. +5C:4A:26 EnguityT # Enguity Technology Corp 5C:4C:A9 HuaweiDe # Huawei Device Co., Ltd 5C:50:15 Cisco # Cisco Systems +5C:51:4F IntelCor # Intel Corporate 5C:56:ED 3pleplay # 3pleplay Electronics Private Limited +5C:57:1A ArrisGro # ARRIS Group, Inc. 5C:57:C8 Nokia # Nokia Corporation 5C:59:48 Apple # Apple, Inc. 5C:5E:AB JuniperN # Juniper Networks @@ -18101,12 +18238,14 @@ 5C:CA:32 Theben # Theben AG 5C:CE:AD Cdyne # CDYNE Corporation 5C:D1:35 XtremePo # Xtreme Power Systems +5C:D4:1B UczoonTe # UCZOON Technology Co., LTD 5C:D4:AB Zektor 5C:D9:98 D-Link # D-Link Corporation 5C:DA:D4 MurataMa # Murata Manufacturing Co., Ltd. 5C:E2:23 DelphinT # Delphin Technology AG 5C:E2:86 NortelNe # Nortel Networks 5C:E2:F4 AcsipTec # AcSiP Technology Corp. +5C:E8:EB SamsungE # Samsung Electronics 5C:EB:4E RStahlHm # R. STAHL HMI Systems GmbH 5C:EE:79 GlobalDi # Global Digitech Co LTD 5C:F2:07 SpecoTec # Speco Technologies @@ -18117,9 +18256,11 @@ 60:12:83 Solucion # Soluciones Tecnologicas para la Salud y el Bienestar SA 60:15:C7 Idatech 60:19:0C Rramac +60:19:29 Voltroni # VOLTRONIC POWER TECHNOLOGY(SHENZHEN) CORP. 60:1D:0F MidniteS # Midnite Solar 60:2A:54 Cardiote # CardioTek B.V. 60:2A:D0 CiscoSpv # Cisco SPVTG +60:32:F0 MplusTec # Mplus technology 60:33:4B Apple # Apple, Inc. 60:35:53 BuwonTec # Buwon Technology 60:36:DD IntelCor # Intel Corporate @@ -18129,12 +18270,15 @@ 60:44:F5 EasyDigi # Easy Digital Ltd. 60:45:5E LiptelSR # Liptel s.r.o. 60:45:BD Microsof # Microsoft +60:46:16 XiamenVa # XIAMEN VANN INTELLIGENT CO., LTD 60:52:D0 FactsEng # FACTS Engineering 60:54:64 EyedroGr # Eyedro Green Solutions Inc. 60:63:FD Transcen # Transcend Communication Beijing Co.,Ltd. 60:67:20 IntelCor # Intel Corporate 60:6B:BD SamsungE # Samsung Electronics Co., LTD 60:6C:66 IntelCor # Intel Corporate +60:73:5C Cisco +60:74:8D AtmacaEl # Atmaca Elektronik 60:76:88 Velodyne 60:83:B2 GkwareEK # GkWare e.K. 60:84:3B Soladigm # Soladigm, Inc. @@ -18158,6 +18302,7 @@ 60:CB:FB Airscape # AirScape Inc. 60:D0:A9 SamsungE # Samsung Electronics Co.,Ltd 60:D1:AA VishalTe # Vishal Telecommunications Pvt Ltd +60:D2:B9 RealandB # REALAND BIO CO., LTD. 60:D3:0A Quatius # Quatius Limited 60:D8:19 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 60:DA:23 Estech # Estech Co.,Ltd @@ -18165,6 +18310,7 @@ 60:EB:69 QuantaCo # Quanta computer Inc. 60:F1:3D Jablocom # JABLOCOM s.r.o. 60:F2:81 TranwoTe # TRANWO TECHNOLOGY CO., LTD. +60:F2:EF Visionve # VisionVera International Co., Ltd. 60:F3:DA LogicWay # Logic Way GmbH 60:F5:9C Cru-Data # CRU-Dataport 60:F6:73 Terumo # TERUMO CORPORATION @@ -18200,7 +18346,9 @@ 64:55:7F NsfocusI # NSFOCUS Information Technology 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 64:65:C0 Nuvon # Nuvon, Inc +64:66:B3 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 64:67:07 BeijingO # Beijing Omnific Technology, Ltd. 64:68:0C Comtrend 64:69:BC HyteraCo # Hytera Communications Co .,ltd @@ -18233,10 +18381,12 @@ 64:BC:11 Combiq # CombiQ AB 64:C5:AA SouthAfr # South African Broadcasting Corporation 64:C6:AF AxerraNe # AXERRA Networks Ltd +64:C9:44 LarkTech # LARK Technologies, Inc 64:D0:2D NextGene # Next Generation Integration (NGI) 64:D1:A3 SitecomE # Sitecom Europe BV 64:D2:41 KeithKoe # Keith & Koep GmbH 64:D4:DA IntelCor # Intel Corporate +64:D8:14 Cisco # Cisco Systems 64:D9:12 Solidica # Solidica, Inc. 64:D9:89 Cisco # Cisco Systems 64:DB:18 Openpatt # OpenPattern @@ -18249,14 +18399,17 @@ 64:ED:57 Motorola # Motorola Mobility, Inc. 64:ED:62 Woori # WOORI SYSTEMS Co., Ltd 64:F2:42 GerdesAk # Gerdes Aktiengesellschaft +64:F5:0E KinionTe # Kinion Technology Company Limited 64:F9:70 KenadeEl # Kenade Electronics Technology Co.,LTD. 64:F9:87 Avvasi # Avvasi Inc. 64:FC:8C Zonar # Zonar Systems 68:05:CA Intel # Intel Corporation 68:09:27 Apple # Apple, Inc. 68:12:2D SpecialI # Special Instrument Development Co., Ltd. +68:15:D3 ZakladyE # Zaklady Elektroniki i Mechaniki Precyzyjnej R&G S.A. 68:16:05 AndElect # Systems And Electronic Development FZCO 68:1A:B2 Zte # zte corporation +68:1C:A2 Rosewill # Rosewill Inc. 68:1F:D8 Advanced # Advanced Telemetry 68:23:4B NihonDen # Nihon Dengyo Kousaku 68:43:52 Bhuu # Bhuu Limited @@ -18267,6 +18420,7 @@ 68:5D:43 IntelCor # Intel Corporate 68:5E:6B Powerray # PowerRay Co., Ltd. 68:63:59 Advanced # Advanced Digital Broadcast SA +68:69:F2 ComapSRO # ComAp s.r.o. 68:6E:23 Wi3 # Wi3 Inc. 68:72:51 Ubiquiti # Ubiquiti Networks 68:78:4C NortelNe # Nortel Networks @@ -18277,12 +18431,14 @@ 68:85:40 IgiMobil # IGI Mobile, Inc. 68:87:6B InqMobil # INQ Mobile Limited 68:92:34 RuckusWi # Ruckus Wireless +68:96:7B Apple # Apple Inc 68:97:4B Shenzhen # Shenzhen Costar Electronics Co. Ltd. 68:9C:5E AcsipTec # AcSiP Technology Corp. 68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd. 68:A3:C4 LiteonTe # Liteon Technology Corporation 68:A8:6D Apple # Apple, Inc. 68:AA:D2 Datecs # DATECS LTD., +68:AB:8A RfIdeas # RF IDeas 68:B4:3A Waterfur # WaterFurnace International, Inc. 68:B5:99 Hewlett- # Hewlett-Packard Company 68:B6:FC HitronTe # Hitron Technologies. Inc @@ -18315,7 +18471,9 @@ 6C:33:A9 Magicjac # Magicjack LP 6C:39:1D BeijingZ # Beijing ZhongHuaHun Network Information center 6C:3A:84 Shenzhen # Shenzhen Aero-Startech. Co.Ltd +6C:3E:6D Apple # Apple Inc 6C:3E:9C KeKneste # KE Knestel Elektronik GmbH +6C:40:C6 NimbusDa # Nimbus Data Systems, Inc. 6C:50:4D Cisco # Cisco Systems 6C:5C:DE Sunrepor # SunReports, Inc. 6C:5D:63 Shenzhen # ShenZhen Rapoo Technology Co., Ltd. @@ -18325,6 +18483,7 @@ 6C:70:39 Novar # Novar GmbH 6C:81:FE Mitsuba # Mitsuba Corporation 6C:83:36 SamsungE # Samsung Electronics Co.,Ltd +6C:88:14 IntelCor # Intel Corporate 6C:8C:DB OtusTech # Otus Technologies Ltd 6C:8D:65 Wireless # Wireless Glue Networks, Inc. 6C:92:BF InspurEl # Inspur Electronic Information Industry Co.,Ltd. @@ -18345,6 +18504,7 @@ 6C:D6:8A LgElectr # LG Electronics Inc 6C:DC:6A Promethe # Promethean Limited 6C:E0:B0 Sound4 +6C:E4:CE Villiger # Villiger Security Solutions AG 6C:E9:07 Nokia # Nokia Corporation 6C:E9:83 Gastron # Gastron Co., LTD. 6C:F0:49 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. @@ -18357,6 +18517,7 @@ 70:14:04 Liabilit # Limited Liability Company "Research Center "Bresler" 70:1A:04 LiteonTe # Liteon Tech Corp. 70:1A:ED Advas # ADVAS CO., LTD. +70:23:93 Fos4x # fos4X GmbH 70:2B:1D E-DomusI # E-Domus International Limited 70:2F:4B Polyvisi # PolyVision Inc. 70:2F:97 AavaMobi # Aava Mobile Oy @@ -18379,6 +18540,7 @@ 70:6F:81 Private 70:70:4C PurpleCo # Purple Communications, Inc 70:71:BC Pegatron # PEGATRON CORPORATION +70:72:3C HuaweiTe # Huawei Technologies Co., Ltd 70:72:CF Edgecore # EdgeCore Networks 70:73:CB Apple # Apple, Inc. 70:76:F0 Levelone # LevelOne Communications (India) Private Limited @@ -18388,6 +18550,7 @@ 70:81:05 Cisco # Cisco Systems 70:82:8E Oleumtec # OleumTech Corporation 70:8B:78 Citygrow # citygrow technology co., ltd +70:93:F8 SpaceMon # Space Monkey, Inc. 70:97:56 Happyele # Happyelectronics Co.,Ltd 70:9A:0B ItalianI # Italian Institute of Technology 70:9B:A5 Shenzhen # Shenzhen Y&D Electronics Co.,LTD. @@ -18411,6 +18574,7 @@ 70:DD:A1 Tellabs 70:DE:E2 Apple # Apple, Inc. 70:E1:39 3view # 3view Ltd +70:E2:4C SaeIt-Sy # SAE IT-systems GmbH & Co. KG 70:E8:43 BeijingC # Beijing C&W Optical Communication Technology Co.,Ltd. 70:EE:50 Netatmo 70:F1:A1 LiteonTe # Liteon Technology Corporation @@ -18418,6 +18582,8 @@ 74:0A:BC JsjsDesi # JSJS Designs (Europe) Limited 74:14:89 SrtWirel # SRT Wireless 74:15:E2 Tri-Sen # Tri-Sen Systems Corporation +74:1E:93 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. +74:27:3C Changyan # ChangYang Technology (Nanjing) Co., LTD 74:2B:0F Infinida # Infinidat Ltd. 74:2F:68 Azurewav # Azurewave Technologies, Inc. 74:31:70 Arcadyan # Arcadyan Technology Corporation @@ -18438,10 +18604,14 @@ 74:7D:B6 AliweiCo # Aliwei Communications, Inc 74:7E:1A RedEmbed # Red Embedded Design Limited 74:7E:2D BeijingT # Beijing Thomson CITIC Digital Technology Co. LTD. +74:88:8B AdbBroad # ADB Broadband Italia 74:8E:F8 BrocadeC # Brocade Communications Systems, Inc. 74:90:50 RenesasE # Renesas Electronics Corporation 74:91:1A RuckusWi # Ruckus Wireless 74:93:A4 ZebraTec # Zebra Technologies Corp. +74:94:3D Hemisphe # Hemisphere GPS +74:99:75 Ibm # IBM Corporation +74:9D:DC 2wire 74:A4:A7 QrsMusic # QRS Music Technologies, Inc. 74:A7:22 LgElectr # LG Electronics 74:AE:76 InovoBro # iNovo Broadband, Inc. @@ -18472,6 +18642,7 @@ 78:07:38 ZUKElzab # Z.U.K. Elzab S.A. 78:11:85 NbsPayme # NBS Payment Solutions Inc. 78:12:B8 Orantek # ORANTEK LIMITED +78:18:81 Azurewav # AzureWave Technologies, Inc. 78:19:2E NascentT # NASCENT Technology 78:19:F7 JuniperN # Juniper Networks 78:1C:5A Sharp # SHARP Corporation @@ -18483,9 +18654,12 @@ 78:2B:CB Dell # Dell Inc 78:2E:EF Nokia # Nokia Corporation 78:30:E1 Ultracle # UltraClenz, LLC +78:3C:E3 Kai-Ee 78:3F:15 Easysync # EasySYNC Ltd. +78:44:05 FujituHo # FUJITU(HONG KONG) ELECTRONIC Co.,LTD. 78:44:76 ZioncomT # Zioncom technology co.,ltd 78:45:C4 Dell # Dell Inc +78:46:C4 DaehapHy # DAEHAP HYPER-TECH 78:47:1D SamsungE # Samsung Electronics Co.,Ltd 78:51:0C Liveu # LiveU Ltd. 78:52:62 Shenzhen # Shenzhen Hojy Software Co., Ltd. @@ -18510,6 +18684,7 @@ 78:A6:83 Precidat # Precidata 78:A6:BD DaeyeonC # DAEYEON Control&Instrument Co,.Ltd 78:A7:14 Amphenol +78:AB:60 AbbAustr # ABB Australia 78:AC:C0 Hewlett- # Hewlett-Packard Company 78:B6:C1 AoboTele # AOBO Telecom Co.,Ltd 78:B8:1A InterSal # INTER SALES A/S @@ -18524,6 +18699,8 @@ 78:CA:39 Apple # Apple, Inc. 78:CD:8E SmcNetwo # SMC Networks Inc 78:D0:04 NeousysT # Neousys Technology Inc. +78:D1:29 Vicos +78:D3:4F Pace-O-M # Pace-O-Matic, Inc. 78:D6:F0 SamsungE # Samsung Electro Mechanics 78:DD:08 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 78:DD:D6 C-Scape @@ -18533,11 +18710,14 @@ 78:E7:D1 Hewlett- # Hewlett-Packard Company 78:EC:22 Shanghai # Shanghai Qihui Telecom Technology Co., LTD 78:EF:4C Unetconv # Unetconvergence Co., Ltd. +78:F5:FD HuaweiTe # Huawei Technologies Co., Ltd 78:F7:D0 Silverbr # Silverbrook Research 78:FE:3D JuniperN # Juniper Networks +7C:02:BC HansungE # Hansung Electronics Co. LTD 7C:03:4C Sagemcom 7C:05:1E Rafael # RAFAEL LTD. 7C:08:D9 Shanghai # Shanghai Engineering Research Center for Broadband Technologies and Applications +7C:09:2B Bekey # Bekey A/S 7C:11:BE Apple # Apple, Inc. 7C:14:76 DamallTe # Damall Technologies S.A.S. Di Ludovic Anselme Glaglanon & C. 7C:16:0D Saia-Bur # Saia-Burgess Controls AG @@ -18548,6 +18728,7 @@ 7C:2E:0D Blackmag # Blackmagic Design 7C:2F:80 GigasetC # Gigaset Communications GmbH 7C:33:6E MegElect # MEG Electronics Inc. +7C:38:6C RealTime # Real Time Logic 7C:39:20 SsomaSec # SSOMA SECURITY 7C:3B:D5 ImagoGro # Imago Group 7C:3E:9D Patech @@ -18581,6 +18762,8 @@ 7C:BF:B1 Motorola # Motorola Mobility, Inc. 7C:C3:A1 Apple # Apple, Inc. 7C:C5:37 Apple # Apple, Inc. +7C:C8:AB AcroAsso # Acro Associates, Inc. +7C:C8:D0 TianjinY # TIANJIN YAAN TECHNOLOGY CO., LTD. 7C:C8:D7 Damalisk 7C:CB:0D AaxeonTe # Aaxeon Technologies Inc. 7C:CF:CF Shanghai # Shanghai SEARI Intelligent System Co., Ltd @@ -18608,6 +18791,7 @@ 80:16:B7 BrunelUn # Brunel University 80:17:7D NortelNe # Nortel Networks 80:18:A7 SamsungE # Samsung Eletronics Co., Ltd +80:1D:AA Avaya # Avaya Inc 80:1F:02 EdimaxTe # Edimax Technology Co. Ltd. 80:20:AF TradeFid # Trade FIDES, a.s. 80:22:75 BeijingB # Beijing Beny Wave Technology Co Ltd @@ -18619,6 +18803,7 @@ 80:39:E5 Patlite # PATLITE CORPORATION 80:3B:9A Ghe-CesE # ghe-ces electronic ag 80:3F:5D Winstars # Winstars Technology Ltd +80:3F:D6 BytesAtW # bytes at work AG 80:42:7C AdolfTed # Adolf Tedsen GmbH & Co. KG 80:47:31 PacketDe # Packet Design, Inc. 80:49:71 Apple # Apple Inc @@ -18645,6 +18830,7 @@ 80:97:1B Altenerg # Altenergy Power System,Inc. 80:9B:20 IntelCor # Intel Corporate 80:A1:D7 Shanghai # Shanghai DareGlobal Technologies Co.,Ltd +80:AA:A4 Usag 80:AD:00 CnetTech # CNET Technology Inc. (Probably an error, see instead 0080AD) 80:B2:89 Forworld # Forworld Electronics Ltd. 80:B3:2A AlstomGr # Alstom Grid @@ -18675,6 +18861,7 @@ 84:29:99 Apple # Apple Inc 84:2B:2B Dell # Dell Inc. 84:2B:50 Huria # Huria Co.,Ltd. +84:2B:BC Modellei # Modelleisenbahn GmbH 84:30:E5 Skyhawke # SkyHawke Technologies, LLC 84:36:11 Hyungseu # hyungseul publishing networks 84:3A:4B IntelCor # Intel Corporate @@ -18688,6 +18875,8 @@ 84:6E:B1 ParkAssi # Park Assist LLC 84:74:2A Zte # zte corporation 84:7E:40 TexasIns # Texas Instruments +84:82:F4 BeijingH # Beijing Huasun Unicreate Technology Co., Ltd +84:85:06 Apple # Apple Inc 84:8D:84 Rajant # Rajant Corporation 84:8F:69 Dell # Dell Inc. 84:90:00 Arnold&A # Arnold & Richter Cine Technik @@ -18703,6 +18892,7 @@ 84:D9:C8 Unipatte # Unipattern Co., 84:DB:2F SierraWi # Sierra Wireless Inc 84:DE:3D CrystalV # Crystal Vision Ltd +84:DF:0C Net2grid # NET2GRID BV 84:EA:99 Vieworks 84:F6:4C CrossPoi # Cross Point BV 88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted @@ -18718,7 +18908,9 @@ 88:53:2E IntelCor # Intel Corporate 88:53:D4 HuaweiTe # Huawei Technologies Co., Ltd 88:5C:4F AlcatelL # Alcatel Lucent +88:61:5A SianoMob # Siano Mobile Silicon Ltd. 88:6B:76 ChinaHop # CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD +88:75:56 Cisco 88:86:A0 SimtonTe # Simton Technologies, Ltd. 88:87:17 Canon # CANON INC. 88:8B:5D StorageA # Storage Appliance Corporation @@ -18745,6 +18937,7 @@ 88:E0:F3 JuniperN # Juniper Networks 88:E7:12 Whirlpoo # Whirlpool Corporation 88:E7:A6 Iknowled # iKnowledge Integration Corp. +88:E9:17 Tamaggo 88:ED:1C CudoComm # Cudo Communication Co., Ltd. 88:F0:77 Cisco # Cisco Systems 88:F4:88 CellonCo # cellon communications technology(shenzhen)Co.,Ltd. @@ -18755,6 +18948,8 @@ 8C:21:0A Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 8C:27:1D Quanthou # QuantHouse 8C:27:8A Vocollec # Vocollect Inc +8C:2D:AA Apple # Apple Inc +8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC. 8C:44:35 Shanghai # Shanghai BroadMobi Communication Technology Co., Ltd. 8C:4D:EA Cerio # Cerio Corporation 8C:51:05 Shenzhen # Shenzhen ireadygo Information Technology CO.,LTD. @@ -18804,8 +18999,10 @@ 8C:DE:52 IsscTech # ISSC Technologies Corp. 8C:E7:48 Private 8C:E7:B3 Sonardyn # Sonardyne International Ltd +8C:EE:C6 Precepsc # Precepscion Pty. Ltd. 8C:F9:C9 MesadaTe # MESADA Technology Co.,Ltd. 8C:FA:BA Apple # Apple Inc +8C:FD:F0 Qualcomm # QUALCOMM Incorporated 90:00:4E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:01:3B Sagemcom 90:02:A9 Zhejiang # ZHEJIANG DAHUA TECHNOLOGY CO.,LTD @@ -18817,6 +19014,7 @@ 90:18:AE Shanghai # Shanghai Meridian Technologies, Co. Ltd. 90:19:00 ScsSa # SCS SA 90:1B:0E FujitsuT # Fujitsu Technology Solutions GmbH +90:1E:DD GreatCom # GREAT COMPUTER CORPORATION 90:21:55 Htc # HTC Corporation 90:27:E4 Apple # Apple, Inc. 90:2B:34 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. @@ -18834,6 +19032,7 @@ 90:54:46 TesElect # TES ELECTRONIC SOLUTIONS 90:55:AE Ericsson # Ericsson, EAB/RWI/K 90:56:82 Lenbrook # Lenbrook Industries Limited +90:59:AF TexasIns # Texas Instruments 90:5F:8D Modas # modas GmbH 90:61:0C FidaInte # Fida International (S) Pte Ltd 90:67:B5 Alcatel- # Alcatel-Lucent @@ -18850,11 +19049,13 @@ 90:90:60 RsiVideo # RSI VIDEO TECHNOLOGIES 90:92:B4 DiehlBgt # Diehl BGT Defence GmbH & Co. KG 90:94:E4 D-LinkIn # D-Link International +90:9D:E0 NewlandD # Newland Design + Assoc. Inc. 90:A2:DA GheoSa # GHEO SA 90:A4:DE WistronN # Wistron Neweb Corp. 90:A7:83 JswPacif # JSW PACIFIC CORPORATION 90:A7:C1 PakedgeD # Pakedge Device and Software Inc. 90:AC:3F Brightsi # BrightSign LLC +90:B1:1C Dell # Dell Inc. 90:B1:34 Motorola # Motorola Mobility, Inc. 90:B8:D0 Joyent # Joyent, Inc. 90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota @@ -18942,6 +19143,7 @@ 98:0C:82 SamsungE # Samsung Electro Mechanics 98:0E:E4 Private 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 98:2C:BE 2wire 98:2D:56 Resoluti # Resolution Audio @@ -18961,6 +19163,7 @@ 98:6D:C8 ToshibaM # TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION 98:73:C4 SageElec # Sage Electronic Engineering LLC 98:82:17 Disrupti # Disruptive Ltd +98:86:B1 Flyaudio # Flyaudio corporation (China) 98:89:ED AnademIn # Anadem Information Inc. 98:8B:5D SagemCom # SAGEM COMMUNICATION 98:8B:AD Corintec # Corintech Ltd. @@ -18984,6 +19187,7 @@ 98:F8:DB MariniIm # Marini Impianti Industriali s.r.l. 98:FC:11 Cisco-Li # Cisco-Linksys, LLC 98:FE:03 Ericsson # Ericsson - North America +98:FE:94 Apple # Apple Inc 9C:01:11 Shenzhen # Shenzhen Newabel Electronic Co., Ltd. 9C:02:98 SamsungE # Samsung Electronics Co.,Ltd 9C:06:6E HyteraCo # Hytera Communications Corporation Limited @@ -19007,6 +19211,7 @@ 9C:57:11 FeitianX # Feitian Xunda(Beijing) Aeronautical Information Technology Co., Ltd. 9C:5B:96 Nmr # NMR Corporation 9C:5C:8D FiremaxI # FIREMAX INDÚSTRIA E COMÉRCIO DE PRODUTOS ELETRÔNICOS LTDA +9C:5D:12 Aerohive # Aerohive Networks Inc 9C:5D:95 VtcElect # VTC Electronics Corp. 9C:5E:73 CalibreU # Calibre UK Ltd 9C:61:1D Omni-IdU # Omni-ID USA, Inc. @@ -19053,6 +19258,7 @@ A0:23:1B Telecomp # TeleComp R&D Corp. A0:2E:F3 UnitedIn # United Integrated Services Co., Led. A0:36:9F Intel # Intel Corporation +A0:36:F0 Comprehe # Comprehensive Power A0:36:FA EttusRes # Ettus Research LLC A0:3A:75 PssBelgi # PSS Belgium N.V. A0:40:25 Actionca # Actioncable, Inc. @@ -19061,6 +19267,7 @@ A0:42:3F TyanComp # Tyan Computer Corp A0:4C:C1 Helixtec # Helixtech Corp. A0:4E:04 Nokia # Nokia Corporation +A0:51:C6 Avaya # Avaya, Inc A0:55:DE Pace # Pace plc A0:59:3A VDSVideo # V.D.S. Video Display Systems srl A0:5A:A4 GrandPro # Grand Products Nevada, Inc. @@ -19098,14 +19305,16 @@ A0:DE:05 Jsc"Irbi # JSC "Irbis-T" A0:E2:01 AvtraceC # AVTrace Ltd.(China) A0:E2:95 DatSyste # DAT System Co.,Ltd +A0:E5:34 StratecB # Stratec Biomedical AG A0:E9:DB NingboFr # Ningbo FreeWings Technologies Co.,Ltd -A0:EF:84 ZhuhaiSe # ZHUHAI SEINE Technology CO., LTD. +A0:EF:84 SeineIma # Seine Image Int'l Co., Ltd A0:F2:17 GeMedica # GE Medical System(China) Co., Ltd. A0:F3:C1 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. A0:F3:E4 Alcatel- # Alcatel -Lucent IPD A0:F4:19 Nokia # Nokia Corporation A0:F4:50 Htc # HTC Corporation A4:01:30 Abisyste # ABIsystems Co., LTD +A4:0B:ED CarryTec # Carry Technology Co.,Ltd A4:0C:C3 Cisco # Cisco Systems A4:13:4E Luxul # Luxul A4:18:75 Cisco # Cisco Systems @@ -19115,6 +19324,7 @@ A4:29:B7 Bluesky A4:33:D1 Fibrlink # Fibrlink Communications Co.,Ltd. A4:38:FC PlasticL # Plastic Logic +A4:46:6B EocTechn # EOC Technology A4:46:FA AmtranVi # AmTRAN Video Corporation A4:4B:15 SunCupid # Sun Cupid Technology (HK) LTD A4:4C:11 Cisco # Cisco Systems @@ -19175,6 +19385,7 @@ A8:39:44 Actionte # Actiontec Electronics, Inc A8:40:41 DraginoT # Dragino Technology Co., Limited A8:49:A5 Lisantec # Lisantech Co., Ltd. +A8:54:B2 WistronN # Wistron Neweb Corp. A8:55:6A Pocketne # Pocketnet Technology Inc. A8:5B:B0 Shenzhen # Shenzhen Dehoo Technology Co.,Ltd A8:5B:F3 Audivo # Audivo GmbH @@ -19205,6 +19416,7 @@ A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG A8:E0:18 Nokia # Nokia Corporation A8:E3:EE SonyComp # Sony Computer Entertainment Inc. +A8:EF:26 Tritonwa # Tritonwave A8:F2:74 SamsungE # Samsung Electronics A8:F4:70 FujianNe # Fujian Newland Communication Science Technologies Co.,Ltd. A8:F9:4B EltexEnt # Eltex Enterprise Ltd. @@ -19244,6 +19456,7 @@ AC:5E:8C Utillink AC:61:23 Drivven # Drivven, Inc. AC:67:06 RuckusWi # Ruckus Wireless +AC:6E:1A Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd AC:6F:4F Enspert # Enspert Inc AC:6F:BB TatungTe # TATUNG Technology Inc. AC:6F:D9 Valueplu # Valueplus Inc. @@ -19264,9 +19477,11 @@ AC:9C:E4 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd AC:A0:16 Cisco # Cisco Systems AC:AB:8D LyngsoMa # Lyngso Marine A/S +AC:BD:0B Imac # IMAC CO.,LTD AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualed # Visualedge Technology Co., Ltd. AC:C2:EC CltIntLI # CLT INT'L IND. CORP. +AC:C6:98 KohzuPre # Kohzu Precision Co., Ltd. AC:C9:35 Ness # Ness Corporation AC:CA:54 TelldusT # Telldus Technologies AB AC:CA:BA Midokura # Midokura Co., Ltd. @@ -19278,6 +19493,7 @@ AC:D3:64 AbbAbbSa # ABB SPA, ABB SACE DIV. AC:D9:D6 Tci # tci GmbH AC:DE:48 Private +AC:E2:15 HuaweiTe # Huawei Technologies Co., Ltd AC:E3:48 Madgetec # MadgeTech, Inc AC:E8:7B HuaweiTe # Huawei Technologies Co., Ltd AC:E9:AA Hay # Hay Systems Ltd @@ -19285,10 +19501,13 @@ AC:EE:3B 6harmoni # 6harmonics Inc AC:F0:B2 BeckerEl # Becker Electronics Taiwan Ltd. AC:F9:7E Elesys # ELESYS INC. +B0:12:03 Dynamics # Dynamics Hong Kong Limited +B0:12:66 Futaba-K # Futaba-Kikaku B0:1B:7C OntrolAS # Ontrol A.S. B0:1C:91 Elim # Elim Co B0:38:29 Siliconw # Siliconware Precision Industries Co., Ltd. B0:43:5D Nuleds # NuLEDs, Inc. +B0:46:FC Mitrasta # MitraStar Technology Corp. B0:48:7A Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. B0:51:8E HollTech # Holl technology CO.Ltd. B0:58:C4 Broadcas # Broadcast Microwave Services, Inc @@ -19320,6 +19539,7 @@ B0:BD:A1 ZakladEl # ZAKLAD ELEKTRONICZNY SIMS B0:BF:99 Wizitdon # WIZITDONGDO 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:CF:4D Mi-ZoneT # MI-Zone Technology Ireland @@ -19361,6 +19581,7 @@ B4:58:61 CremoteL # CRemote, LLC B4:5C:A4 Thing-Ta # Thing-talk Wireless Communication Technologies Corporation Limited B4:62:38 Exablox +B4:62:93 SamsungE # Samsung Electronics Co.,Ltd B4:67:E9 QingdaoG # Qingdao GoerTek Technology Co., Ltd. B4:74:9F AskeyCom # askey computer corp B4:82:55 Research # Research Products Corporation @@ -19386,11 +19607,13 @@ B4:CF:DB Shenzhen # Shenzhen Jiuzhou Electric Co.,LTD B4:D8:A9 Betterbo # BetterBots B4:D8:DE IotaComp # iota Computing, Inc. +B4:DF:FA LitemaxE # Litemax Electronics Inc. B4:E0:CD IoTurbin # IO Turbine, Inc. B4:E1:EB Private B4:ED:19 PieDigit # Pie Digital, Inc. B4:ED:54 WohlerTe # Wohler Technologies B4:EE:D4 TexasIns # Texas Instruments +B4:F2:E8 Pace # Pace plc B4:F3:23 Petatel # PETATEL INC. B4:FC:75 SemaElec # SEMA Electronics(HK) CO.,LTD B8:03:05 IntelCor # Intel Corporate @@ -19399,6 +19622,7 @@ B8:17:C2 Apple # Apple, Inc. B8:19:99 Nesys B8:20:E7 Guangzho # Guangzhou Horizontal Information & Network Integration Co. Ltd +B8:24:10 MagnetiM # Magneti Marelli Slovakia s.r.o. B8:26:D4 Furukawa # Furukawa Industrial S.A. Produtos Elétricos B8:27:EB Raspberr # Raspberry Pi Foundation B8:28:8B ParkerHa # Parker Hannifin @@ -19408,6 +19632,8 @@ B8:3D:4E Shenzhen # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch B8:41:5F Asp # ASP AG B8:55:10 ZioncomE # Zioncom Electronics (Shenzhen) Ltd. +B8:58:10 Numera # NUMERA, 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 B8:64:91 CkTeleco # CK Telecom Ltd @@ -19419,6 +19645,7 @@ B8:79:7E SecureMe # Secure Meters (UK) Limited B8:87:1E GoodMind # Good Mind Industries Co., Ltd. B8:88:E3 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD +B8:89:CA IljinEle # ILJIN ELECTRIC Co., Ltd. B8:8D:12 Apple # Apple, Inc. B8:8E:3A Infinite # Infinite Technologies JLT B8:8F:14 Analytic # Analytica GmbH @@ -19426,6 +19653,7 @@ B8:94:D2 RetailIn # Retail Innovation HTT AB B8:96:74 Alldsp&A # AllDSP GmbH & Co. KG B8:97:5A BiostarM # BIOSTAR Microtech Int'l Corp. +B8:98:B0 Atlona # Atlona Inc. B8:9A:ED Oceanser # OceanServer Technology, Inc B8:9B:C9 SmcNetwo # SMC Networks Inc B8:A3:86 D-LinkIn # D-Link International @@ -19435,10 +19663,13 @@ B8:AF:67 Hewlett- # Hewlett-Packard Company B8:B1:C7 Bt&Com # BT&COM CO.,LTD B8:B4:2E GioneeCo # Gionee Communication Equipment Co,Ltd.ShenZhen +B8:B7:D7 2gigTech # 2GIG Technologies +B8:B9:4E Shenzhen # Shenzhen iBaby Labs, Inc. B8:BA:68 XiAnJizh # Xi'an Jizhong Digital Communication Co.,Ltd B8:BA:72 Cynove B8:BB:6D Eneres # ENERES Co.,Ltd. B8:BE:BF Cisco # Cisco Systems +B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd B8:C7:16 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD B8:C7:5D Apple # Apple, Inc. B8:CD:A7 MaxelerT # Maxeler Technologies Ltd. @@ -19479,9 +19710,12 @@ BC:47:60 SamsungE # Samsung Electronics Co.,Ltd BC:4B:79 Sensingt # SensingTek BC:4E:3C CoreStaf # CORE STAFF CO., LTD. +BC:52:B7 Apple # Apple Inc BC:5F:F4 AsrockIn # ASRock Incorporation +BC:67:78 Apple # Apple Inc BC:67:84 Environi # Environics Oy BC:6A:16 Tdvine +BC:6A:29 TexasIns # Texas Instruments BC:6E:76 GreenEne # Green Energy Options Ltd BC:71:C1 Xtrillio # XTrillion, Inc. BC:76:4E Rackspac # Rackspace US, Inc. @@ -19534,6 +19768,7 @@ C0:38:F9 NokiaDan # Nokia Danmark A/S C0:3B:8F MinicomD # Minicom Digital Signage C0:3F:0E Netgear +C0:3F:2A Biscotti # Biscotti, Inc. C0:41:F6 LgElectr # LG Electronics Inc C0:49:3D Maitrise # MAITRISE TECHNOLOGIQUE C0:58:A7 Pico # Pico Systems Co., Ltd. @@ -19556,6 +19791,7 @@ C0:AC:54 Sagemcom 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. C0:C1:C0 Cisco-Li # Cisco-Linksys, LLC C0:C5:20 RuckusWi # Ruckus Wireless C0:C9:46 MitsuyaL # MITSUYA LABORATORIES INC. @@ -19582,6 +19818,7 @@ C4:24:2E Galvanic # Galvanic Applied Sciences Inc C4:2C:03 Apple # Apple, Inc. C4:36:DA Rustelet # Rusteletech Ltd. +C4:38:D3 Tagatec # TAGATEC CO.,LTD C4:39:3A SmcNetwo # SMC Networks Inc C4:3A:9F Siconix # Siconix Inc. C4:3C:3C CybelecS # CYBELEC SA @@ -19600,6 +19837,7 @@ C4:6A:B7 XiaomiTe # Xiaomi Technology,Inc. C4:71:30 FonTechn # Fon Technology S.L. C4:71:FE Cisco # Cisco Systems +C4:73:1E SamsungE # Samsung Eletronics Co., Ltd C4:7B:2F BeijingJ # Beijing JoinHope Image Technology Ltd. C4:7B:A3 Navis # NAVIS Inc. C4:7D:4F Cisco # Cisco Systems @@ -19610,6 +19848,7 @@ C4:95:A2 Shenzhen # SHENZHEN WEIJIU INDUSTRY AND TRADE DEVELOPMENT CO., LTD C4:98:05 MinieumN # Minieum Networks, Inc C4:AA:A1 SummitDe # SUMMIT DEVELOPMENT, spol.s r.o. +C4:AD:21 Mediaedg # MEDIAEDGE Corporation C4:B5:12 GeneralE # General Electric Digital Energy C4:BA:99 I+MeActi # I+ME Actia Informatik und Mikro-Elektronik GmbH C4:C1:9F National # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) @@ -19617,7 +19856,9 @@ C4:CD:45 BeijingB # Beijing Boomsense Technology CO.,LTD. C4:D4:89 JiangsuJ # JiangSu Joyque Information Industry Co.,Ltd C4:D9:87 IntelCor # Intel Corporate +C4:DA:26 NoblexSa # NOBLEX SA C4:E1:7C U2s # U2S co. +C4:E7:BE Scspro # SCSpro Co.,Ltd C4:EE:AE VssMonit # VSS Monitoring C4:EE:F5 Oclaro # Oclaro, Inc. C4:F4:64 SpicaInt # Spica international @@ -19627,6 +19868,7 @@ C8:07:18 Tdsi C8:0A:A9 QuantaCo # Quanta Computer Inc. C8:0E:77 LeShiZhi # Le Shi Zhi Xin Electronic Technology (Tianjin) Co.,Ltd +C8:19:F7 SamsungE # Samsung Electronics Co.,Ltd C8:1A:FE Dlogic # DLOGIC GmbH C8:1E:8E AdvSecur # ADV Security (S) Pte Ltd C8:20:8E Storaged # Storagedata @@ -19666,6 +19908,7 @@ C8:9C:1D Cisco # Cisco Systems C8:9C:DC Elitegro # ELITEGROUP COMPUTER SYSTEM CO., LTD. C8:9F:42 VdiiInno # VDII Innovation AB +C8:A0:30 TexasIns # Texas Instruments C8:A1:B6 Shenzhen # Shenzhen Longway Technologies Co., Ltd C8:A1:BA Neul # Neul Ltd C8:A6:20 Nebula # Nebula, Inc @@ -19677,14 +19920,18 @@ C8:AF:40 MarcoSys # marco Systemanalyse und Entwicklung GmbH C8:BB:D3 Embrane C8:BC:C8 Apple # Apple, Inc. +C8:BE:19 D-LinkIn # D-Link International C8:C1:26 ZpmIndus # ZPM Industria e Comercio Ltda C8:C1:3C Ruggedte # RuggedTek Hangzhou Co., Ltd +C8:C7:91 Zero1Tv # Zero1.tv GmbH +C8:CB:B8 HewlettP # Hewlett Packard C8:CD:72 Sagemcom C8:D1:5E HuaweiTe # Huawei Technologies Co., Ltd C8:D1:D1 AgaitTec # AGAiT Technology Corporation C8:D2:C1 JetlunSh # Jetlun (Shenzhen) Corporation C8:D5:FE Shenzhen # Shenzhen Zowee Technology Co., Ltd C8:D7:19 CiscoCon # Cisco Consumer Products, LLC +C8:DE:51 IntegraN # Integra Networks, Inc. C8:DF:7C Nokia # Nokia Corporation C8:EE:08 TangtopT # TANGTOP TECHNOLOGY CO.,LTD C8:EF:2E BeijingG # Beijing Gefei Tech. Co., Ltd @@ -19693,6 +19940,7 @@ C8:F7:33 IntelCor # Intel Corporate C8:F9:81 SenecaSR # Seneca s.r.l. C8:F9:F9 Cisco # Cisco Systems +C8:FB:26 CiscoSpv # Cisco SPVTG C8:FE:30 BejingDa # Bejing DAYO Mobile Communication Technology Ltd. CC:00:80 TrustSys # TRUST SYSTEM Co., CC:05:1B SamsungE # Samsung Electronics Co.,Ltd @@ -19729,6 +19977,7 @@ CC:96:A0 HuaweiDe # Huawei Device Co., Ltd CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd +CC:A4:62 ArrisGro # ARRIS Group, Inc CC:AF:78 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. CC:B2:55 D-LinkIn # D-Link International CC:B5:5A Fraunhof # Fraunhofer ITWM @@ -19745,6 +19994,7 @@ CC:CE:40 Janteq # Janteq Corp CC:D8:11 AiconnTe # Aiconn Technology Corporation CC:D9:E9 ScrEngin # SCR Engineers Ltd. +CC:E7:98 MySocial # My Social Stuff CC:E7:DF American # American Magnetics, Inc. CC:EA:1C Dconwork # DCONWORKS Co., Ltd CC:EE:D9 DetoMech # Deto Mechatronic GmbH @@ -19768,6 +20018,7 @@ 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:4C:C1 Sintrone # SINTRONES Technology Corp. D0:54:2D Cambridg # Cambridge Industries(Group) Co.,Ltd. D0:57:4C Cisco # Cisco Systems D0:57:85 Pantech # Pantech Co., Ltd. @@ -19780,6 +20031,7 @@ D0:69:9E LuminexL # LUMINEX Lighting Control Equipment D0:75:BE RenoA&Am # Reno A&E D0:7D:E5 ForwardP # Forward Pay Systems, Inc. +D0:7E:28 HewlettP # Hewlett Packard D0:89:99 Apcon # APCON, Inc. D0:8C:B5 TexasIns # Texas Instruments D0:8C:FF Upwis # UPWIS AB @@ -19878,6 +20130,7 @@ D4:F6:3F IeaSRL # IEA S.R.L. 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:0D:E3 FxiTechn # FXI TECHNOLOGIES AS D8:16:0A NipponEl # Nippon Electro-Sensory Devices D8:1B:FE Twinlinx # TWINLINX CORPORATION @@ -19887,16 +20140,19 @@ D8:28:C9 GeneralE # General Electric Consumer and Industrial D8:29:86 BestWish # Best Wish Technology LTD D8:2A:7E Nokia # Nokia Corporation +D8:2D:E1 Tricasca # Tricascade Inc. D8:30:62 Apple # Apple, Inc 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 D8:4B:2A Cognitas # Cognitas Technologies, Inc. D8:54:3A TexasIns # Texas Instruments +D8:57:EF SamsungE # Samsung Electronics D8:5D:4C Tp-LinkT # TP-LINK Technologies Co.,Ltd. D8:5D:84 CaxSoft # CAx soft GmbH D8:67:D9 Cisco # Cisco Systems D8:6B:F7 Nintendo # Nintendo Co., Ltd. +D8:6C:E9 Sagemcom # SAGEMCOM SAS D8:71:57 LenovoMo # Lenovo Mobile Communication Technology Ltd. D8:75:33 Nokia # Nokia Corporation D8:76:0A Escort # Escort, Inc. @@ -19911,6 +20167,8 @@ D8:9E:3F Apple # Apple, Inc. D8:A2:5E Apple # Apple, Inc. D8:AE:90 ItibiaTe # Itibia Technologies +D8:AF:3B Hangzhou # Hangzhou Bigbright Integrated communications system Co.,Ltd +D8:AF:F1 Panasoni # Panasonic Appliances Company D8:B1:2A Panasoni # Panasonic Mobile Communications Co., Ltd. D8:B3:77 Htc # HTC Corporation D8:B6:C1 Networka # NetworkAccountant, Inc. @@ -19919,8 +20177,10 @@ D8:BF:4C VictoryC # Victory Concept Electronics Limited D8:C0:68 Netgenet # Netgenetech.co.,ltd. D8:C3:FB Detracom +D8:C6:91 HichanTe # Hichan Technology Corp. D8:C7:C8 ArubaNet # Aruba Networks D8:C9:9D EaDispla # EA DISPLAY LIMITED +D8:D2:7C JemaEner # JEMA ENERGY, SA D8:D3:85 Hewlett- # Hewlett-Packard Company D8:D6:7E GskCncEq # GSK CNC EQUIPMENT CO.,LTD D8:DF:0D Beronet # beroNet GmbH @@ -19951,6 +20211,7 @@ DC:3C:2E Manufact # Manufacturing System Insights, Inc. DC:3C:84 TicomGeo # Ticom Geomatics, Inc. DC:3E:51 SolbergA # Solberg & Andersen AS +DC:45:17 Motorola # Motorola Mobility, Inc. DC:49:C9 CascoSig # CASCO SIGNAL LTD DC:4E:DE ShinyeiT # SHINYEI TECHNOLOGY CO., LTD. DC:71:44 SamsungE # Samsung Electro Mechanics @@ -19958,12 +20219,14 @@ DC:85:DE Azurewav # Azurewave Technologies., inc. DC:9B:1E Intercom # Intercom, Inc. DC:9C:52 Sapphire # Sapphire Technology Limited. +DC:9F:A4 Nokia # Nokia Corporation DC:9F:DB Ubiquiti # Ubiquiti Networks, Inc. DC:A6:BD BeijingL # Beijing Lanbo Technology Co., Ltd. DC:A7:D9 Compress # Compressor Controls Corp DC:A8:CF NewSpinG # New Spin Golf, LLC. DC:A9:71 IntelCor # Intel Corporate DC:B4:C4 Microsof # Microsoft XCG +DC:BF:90 HuizhouQ # HUIZHOU QIAOXING TELECOMMUNICATION INDUSTRY 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 @@ -19984,6 +20247,7 @@ E0:14:3E Modoosis # Modoosis Inc. E0:1C:41 Aerohive # Aerohive Networks Inc. E0:1C:EE BravoTec # Bravo Tech, Inc. +E0:1D:3B Cambridg # Cambridge Industries(Group) Co.,Ltd E0:1E:07 AniteTel # Anite Telecoms US. Inc E0:1F:0A XslentEn # Xslent Energy Technologies. LLC E0:24:7F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -20023,7 +20287,9 @@ E0:B9:BA Apple # Apple, Inc. E0:BC:43 C2Micros # C2 Microsystems, Inc. E0:C2:86 AisaiCom # Aisai Communication Technology Co., Ltd. +E0:C7:9D TexasIns # Texas Instruments E0:C9:22 JirehEne # Jireh Energy Tech., Ltd. +E0:C9:7A Apple # Apple Inc E0:CA:4D Shenzhen # Shenzhen Unistar Communication Co.,LTD E0:CA:94 AskeyCom # Askey Computer E0:CB:1D Private @@ -20040,6 +20306,7 @@ E0:EF:25 LintesTe # Lintes Technology Co., Ltd. E0:F2:11 Digitalw # Digitalwatt E0:F3:79 Vaddio +E0:F5:CA ChengUei # CHENG UEI PRECISION INDUSTRY CO.,LTD. E0:F8:47 Apple # Apple, Inc. E0:F9:BE Cloudena # Cloudena Corp. E2:0C:0F Kingston # Kingston Technologies @@ -20051,10 +20318,12 @@ E4:27:71 Smartlab # Smartlabs E4:2A:D3 MagnetiM # Magneti Marelli S.p.A. Powertrain E4:2C:56 Lilee # Lilee Systems, Ltd. +E4:2F:26 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. E4:2F:F6 UnicoreC # Unicore communication Inc. E4:35:93 Hangzhou # Hangzhou GoTo technology Co.Ltd E4:35:FB SabreTec # Sabre Technology (Hull) Ltd E4:37:D7 HenriDep # HENRI DEPAEPE S.A.S. +E4:3F:A2 WuxiDspT # Wuxi DSP Technologies Inc. E4:41:E6 OttecTec # Ottec Technology GmbH E4:46:BD C&CTechn # C&C TECHNIC TAIWAN CO., LTD. E4:48:C7 CiscoSpv # Cisco SPVTG @@ -20090,6 +20359,7 @@ E8:03:9A SamsungE # Samsung Electronics Co.,LTD E8:04:0B Apple # Apple, Inc. E8:04:62 Cisco # Cisco Systems +E8:04:F3 Throught # Throughtek Co., Ltd. E8:05:6D NortelNe # Nortel Networks E8:06:88 Apple # Apple, Inc. E8:0B:13 AkibTaiw # Akib Systems Taiwan, INC @@ -20105,6 +20375,7 @@ E8:3A:97 OczTechn # OCZ Technology Group E8:3E:B6 Rim E8:3E:FB Geodesic # GEODESIC LTD. +E8:3E:FC ArrisGro # ARRIS Group, Inc E8:40:40 Cisco # Cisco Systems E8:40:F2 Pegatron # PEGATRON CORPORATION E8:43:B6 Qnap # QNAP Systems, Inc. @@ -20113,6 +20384,7 @@ E8:54:84 NeoInfor # NEO INFORMATION SYSTEMS CO., LTD. E8:56:D6 Nctech # NCTech Ltd E8:5B:5B LgElectr # LG ELECTRONICS INC +E8:5B:F0 ImagingD # Imaging Diagnostics E8:5E:53 Infratec # Infratec Datentechnik GmbH E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center E8:6D:52 Motorola # Motorola Mobility, Inc. @@ -20120,7 +20392,9 @@ E8:75:7F FirsTech # FIRS Technologies(Shenzhen) Co., Ltd 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: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 @@ -20133,6 +20407,7 @@ E8:BE:81 Sagemcom E8:C2:29 H-Displa # H-Displays (MSC) Bhd E8:C3:20 AustcoCo # Austco Communication Systems Pty Ltd +E8:CB:A1 Nokia # Nokia Corporation E8:CC:32 Micronet # Micronet LTD E8:D0:FA MksInstr # MKS Instruments Deutschland GmbH E8:D4:83 Ultimate # ULTIMATE Europe Transportation Equipment GmbH @@ -20175,6 +20450,7 @@ EC:7D:9D Mei 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:8E:AD Dlx EC:92:33 EddyfiNd # Eddyfi NDT Inc EC:93:27 Memmert+ # MEMMERT GmbH + Co. KG @@ -20194,6 +20470,8 @@ EC:CD:6D AlliedTe # Allied Telesis, Inc. EC:D0:0E Miraerec # MiraeRecognition Co., Ltd. EC:D1:9A ZhuhaiLi # Zhuhai Liming Industries Co., Ltd +EC:D9:25 Rami +EC:D9:50 IrtSa # IRT SA EC:DE:3D LampreyN # Lamprey Networks, Inc. EC:E0:9B SamsungE # Samsung electronics CO., LTD EC:E5:55 Hirschma # Hirschmann Automation @@ -20235,7 +20513,9 @@ F0:81:AF IrzAutom # IRZ AUTOMATION TECHNOLOGIES LTD F0:8B:FE Costel # COSTEL.,CO.LTD F0:93:3A Nxtconec # NxtConect +F0:93:C5 GarlandT # Garland Technology F0:9C:BB Raonthin # RaonThink Inc. +F0:9C:E9 Aerohive # Aerohive Networks Inc F0:A2:25 Private F0:A7:64 Gst # GST Co., Ltd. F0:AD:4E Globalsc # Globalscale Technologies, Inc. @@ -20250,6 +20530,7 @@ F0:C8:8C Leddarte # LeddarTech Inc. F0:CB:A1 Apple # Apple, Inc. F0:D1:4F LinearLl # LINEAR LLC +F0:D3:E7 Sensomet # Sensometrix SA F0:D7:67 AxemaPas # Axema Passagekontroll AB F0:DA:7C RlhIndus # RLH INDUSTRIES,INC. F0:DB:30 Yottabyt # Yottabyte @@ -20271,6 +20552,7 @@ F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited F4:0B:93 Research # Research In Motion +F4:0F:9B Wavelink F4:1F:0B Yamabish # YAMABISHI Corporation F4:36:E1 AbilisSa # Abilis Systems SARL F4:38:14 Shanghai # Shanghai Howell Electronic Co.,Ltd @@ -20305,6 +20587,7 @@ F4:AC:C1 Cisco # Cisco Systems F4:B1:64 Lightnin # Lightning Telecommunications Technology Co. Ltd F4:B5:49 YeastarT # Yeastar Technology Co., Ltd. +F4:B7:2A TimeInte # TIME INTERCONNECT LTD F4:C7:14 HuaweiDe # Huawei Device Co., Ltd F4:C7:95 WeyElekt # WEY Elektronik AG F4:CA:E5 FreeboxS # FREEBOX SA @@ -20318,6 +20601,7 @@ F4:EC:38 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. F4:FC:32 TexasIns # Texas Instruments F8:03:32 Khomp +F8:05:1C DrsImagi # DRS Imaging and Targeting Solutions F8:0C:F3 LgElectr # LG Electronics F8:0F:41 WistronI # Wistron InfoComm(ZhongShan) Corporation F8:0F:84 NaturalS # Natural Security SAS @@ -20325,6 +20609,7 @@ F8:1A:67 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. F8:1D:93 Longdhua # Longdhua(Beijing) Controls Technology Co.,Ltd F8:1E:DF Apple # Apple, Inc +F8:22:85 CypressT # Cypress Technology CO., LTD. F8:2F:5B EgaugeLl # eGauge Systems LLC F8:30:94 Alcatel- # Alcatel-Lucent Telecom Limited F8:31:3E Endeavou # endeavour GmbH @@ -20335,6 +20620,7 @@ F8:47:2D X2genDig # X2gen Digital Corp. Ltd F8:50:63 Verathon F8:52:DF VnlEurop # VNL Europe AB +F8:5F:2A Nokia # Nokia Corporation F8:66:F2 Cisco # Cisco Systems F8:69:71 SeibuEle # Seibu Electric Co., F8:6E:CF Arcx # Arcx Inc @@ -20345,6 +20631,7 @@ F8:81:1A Overkiz F8:8C:1C KaishunE # KAISHUN ELECTRONIC TECHNOLOGY CO., LTD. BEIJING F8:8D:EF Tenebrae # Tenebraex +F8:8E:85 Comtrend # COMTREND CORPORATION F8:8F:CA GoogleFi # Google Fiber, Inc F8:91:2A GlpGerma # GLP German Light Products GmbH F8:93:F3 Volans @@ -20397,6 +20684,7 @@ FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD FC:4D:D4 Universa # Universal Global Scientific Industrial Co., Ltd. FC:50:90 SimexSpZ # SIMEX Sp. z o.o. +FC:52:CE ControlI # Control iD FC:5B:24 WeibelSc # Weibel Scientific A/S FC:5B:26 Mikrobit # MikroBits FC:61:98 NecPerso # NEC Personal Products, Ltd @@ -20421,6 +20709,7 @@ FC:CF:62 Ibm # IBM Corp FC:D4:F2 CocaCola # The Coca Cola Company FC:D4:F6 MessanaA # Messana Air.Ray Conditioning s.r.l. +FC:D6:BD RobertBo # Robert Bosch GmbH FC:E1:92 SichuanJ # Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd FC:E2:3F ClayPaky # CLAY PAKY SPA FC:E5:57 Nokia # Nokia Corporation @@ -20434,7 +20723,7 @@ # # Well-known addresses. # -# $Id: manuf 42725 2012-05-20 14:34:01Z gerald $ +# $Id: manuf 43913 2012-07-22 15:04:40Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald [AT] wireshark.org>

@@ -41,7 +41,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.6.8, Copyright 1998-2012 Wireshark Development Team</string> + <string>1.6.9, 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.8</string> + <string>1.6.9</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.6.8</string> + <string>1.6.9</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>

@@ -42,7 +42,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -41,7 +41,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 41972 2012-04-06 17:43:35Z gerald $ +# $Id: Makefile.nmake 42858 2012-05-25 23:09:58Z gerald $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -105,32 +105,52 @@ /DGTK_DIR=$(GTK_DIR) \ /DGTK_LIB_DIR=$(GTK_LIB_DIR) \ /DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \ -!IFDEF NEED_LIBPNG_DLL - /DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \ - /DPNG_DLL=$(PNG_DLL) \ -!ENDIF -!IFDEF NEED_LIBJPEG_DLL - /DNEED_LIBJPEG_DLL=$(NEED_LIBJPEG_DLL) \ - /DJPEG_DLL=$(JPEG_DLL) \ -!ENDIF -!IFDEF NEED_LIBTIFF_DLL - /DNEED_LIBTIFF_DLL=$(NEED_LIBTIFF_DLL) \ - /DTIFF_DLL=$(TIFF_DLL) \ +!IFDEF NEED_CAIRO_DLL + /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ !ENDIF -!IFDEF NEED_FREETYPE_DLL - /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ - /DFREETYPE_DLL=$(FREETYPE_DLL) \ +!IFDEF NEED_EXPAT_DLL + /DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \ + /DEXPAT_DLL=$(EXPAT_DLL) \ +!ENDIF +!IFDEF NEED_FFI_DLL + /DNEED_FFI_DLL=$(NEED_FFI_DLL) \ + /DFFI_DLL=$(FFI_DLL) \ !ENDIF !IFDEF NEED_FONTCONFIG_DLL - /DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \ - /DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \ + /DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \ + /DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \ !ENDIF -!IFDEF NEED_EXPAT_DLL - /DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \ - /DEXPAT_DLL=$(EXPAT_DLL) \ +!IFDEF NEED_FREETYPE_DLL + /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ + /DFREETYPE_DLL=$(FREETYPE_DLL) \ !ENDIF -!IFDEF NEED_CAIRO_DLL - /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ +!IFDEF NEED_JASPER_DLL + /DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \ + /DJASPER_DLL=$(JASPER_DLL) \ +!ENDIF +!IFDEF NEED_JPEG_DLL + /DNEED_JPEG_DLL=$(NEED_JPEG_DLL) \ + /DJPEG_DLL=$(JPEG_DLL) \ +!ENDIF +!IFDEF NEED_LZMA_DLL + /DNEED_LZMA_DLL=$(NEED_LZMA_DLL) \ + /DLZMA_DLL=$(LZMA_DLL) \ +!ENDIF +!IFDEF NEED_PIXMAN_DLL + /DNEED_PIXMAN_DLL=$(NEED_PIXMAN_DLL) \ + /DPIXMAN_DLL=$(PIXMAN_DLL) \ +!ENDIF +!IFDEF NEED_PNG_DLL + /DNEED_PNG_DLL=$(NEED_PNG_DLL) \ + /DPNG_DLL=$(PNG_DLL) \ +!ENDIF +!IFDEF NEED_TIFF_DLL + /DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \ + /DTIFF_DLL=$(TIFF_DLL) \ +!ENDIF +!IFDEF NEED_XML_DLL + /DNEED_XML_DLL=$(NEED_XML_DLL) \ + /DXML_DLL=$(XML_DLL) \ !ENDIF !ENDIF /DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \

@@ -1,7 +1,7 @@ ; ; wireshark.nsi ; -; $Id: wireshark.nsi 42332 2012-04-29 03:40:30Z guy $ +; $Id: wireshark.nsi 42858 2012-05-25 23:09:58Z gerald $ ; Set the compression mechanism first. @@ -883,10 +883,10 @@ SetOutPath $INSTDIR\etc\gtk-2.0 File "${GTK_DIR}\etc\gtk-2.0\*.*" -!if ${WIRESHARK_TARGET_PLATFORM} == "win32" -SetOutPath $INSTDIR\etc\pango -File "${GTK_DIR}\etc\pango\pango.*" -!endif +#!if ${WIRESHARK_TARGET_PLATFORM} == "win32" +#SetOutPath $INSTDIR\etc\pango +#File "${GTK_DIR}\etc\pango\pango.*" +#!endif SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines File "..\..\wireshark-gtk2\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libpixmap.dll"

@@ -41,7 +41,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -42,7 +42,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -64,7 +64,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -92,7 +92,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -70,7 +70,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -94,7 +94,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -92,7 +92,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -116,7 +116,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -94,7 +94,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -92,7 +92,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -94,7 +94,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -92,7 +92,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -5,7 +5,7 @@ * * Author: Mike Harvey <michael.harvey@intel.com> * - * $Id: msg_dlmap.c 35590 2011-01-19 22:53:46Z jake $ + * $Id: msg_dlmap.c 42815 2012-05-23 21:54:53Z pascal $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -2092,6 +2092,7 @@ /* if there is a compressed ul-map, also decode that and include in the length */ guint offset = 0; proto_item *ti = NULL; + proto_item *ti_dlmap_ies = NULL; proto_item *generic_item = NULL; proto_tree *tree = NULL; proto_tree *ie_tree = NULL; @@ -2137,8 +2138,8 @@ /* DL-MAP IEs */ length -= 15; /* remaining length in bytes (11 bytes above + CRC at end) */ if (dl_ie_count) { - ti = proto_tree_add_text(tree, tvb, offset, length, "DL-MAP IEs (%d bytes)", length); - ie_tree = proto_item_add_subtree(ti, ett_dlmap_ie); + ti_dlmap_ies = proto_tree_add_text(tree, tvb, offset, length, "DL-MAP IEs (%d bytes)", length); + ie_tree = proto_item_add_subtree(ti_dlmap_ies, ett_dlmap_ie); length = BYTE_TO_NIB(mac_len - sizeof(mac_crc) - 1); /* convert length to nibbles */ @@ -2153,6 +2154,17 @@ } if (ulmap_appended) { + /* Replace the text of items to set the correct length in bytes.*/ + proto_item_set_text(ti, "Compressed DL-MAP (%u bytes)", NIB_ADDR(nib)); + proto_item_set_text(ti_dlmap_ies, "DL-MAP IEs (%u bytes)",NIB_ADDR(nib)- offset); + + /* set the length of items */ + proto_item_set_end(ti_dlmap_ies, tvb, NIB_ADDR(nib)); + proto_item_set_end(ti, tvb, NIB_ADDR(nib)); + + /* update the info column */ + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed UL-MAP"); + /* subtract 8 from lennib (CRC) */ nib += wimax_decode_ulmapc(base_tree, bufptr, nib, lennib - 8, tvb); }

@@ -5,7 +5,7 @@ * * Author: Mike Harvey <michael.harvey@intel.com> * - * $Id: msg_ulmap.c 35590 2011-01-19 22:53:46Z jake $ + * $Id: msg_ulmap.c 42815 2012-05-23 21:54:53Z pascal $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1960,7 +1960,7 @@ nib = offset; /* display MAC UL-MAP */ - ti = proto_tree_add_protocol_format(base_tree, proto_mac_mgmt_msg_ulmap_decoder, tvb, NIBHI(offset,length), "Compressed UL-MAP"); + ti = proto_tree_add_protocol_format(base_tree, proto_mac_mgmt_msg_ulmap_decoder, tvb, NIBHI(offset,length-offset), "Compressed UL-MAP (%u bytes)", NIB_ADDR(length-offset)); tree = proto_item_add_subtree(ti, ett_306); /* Decode and display the UL-MAP */ @@ -1974,7 +1974,7 @@ proto_tree_add_uint(tree, hf_ulmap_ofdma_sym, tvb, NIBHI(nib,2), data); /* added 2005 */ nib += 2; - ti = proto_tree_add_text(tree, tvb, NIBHI(nib,length-nib), "UL-MAP IEs"); + ti = proto_tree_add_text(tree, tvb, NIBHI(nib,length-nib), "UL-MAP IEs (%u bytes)", NIB_ADDR(length-nib)); ie_tree = proto_item_add_subtree(ti, ett_306_ul); while (nib < length-1) { nib += dissect_ulmap_ie(ie_tree, bufptr, nib, length-nib, tvb);

@@ -116,7 +116,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -8,7 +8,7 @@ # [wireshark] 2009-07-07: Updated FreeRadius 2.1.6 dictionary.3gpp # based upon the above specification. # -# $Id: dictionary.3gpp 29038 2009-07-09 15:59:02Z wmeier $ +# $Id: dictionary.3gpp 43867 2012-07-20 18:52:56Z gerald $ # VENDOR 3GPP 10415 @@ -43,8 +43,7 @@ ATTRIBUTE 3GPP-SGSN-MCC-MNC 18 string ATTRIBUTE 3GPP-Teardown-Indicator 19 octets - -ATTRIBUTE 3GGP-IMEISV 20 octets +ATTRIBUTE 3GPP-IMEISV 20 string ATTRIBUTE 3GPP-RAT-Type 21 integer ATTRIBUTE 3GPP-User-Location-Info 22 octets ATTRIBUTE 3GPP-MS-TimeZone 23 octets

@@ -1,6 +1,6 @@ /* rawshark.c * - * $Id: rawshark.c 38856 2011-09-02 00:16:14Z gerald $ + * $Id: rawshark.c 43867 2012-07-20 18:52:56Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -320,7 +320,7 @@ err = GetLastError(); if (err != ERROR_PIPE_BUSY) { - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, (LPTSTR) &err_str, 0, NULL); fprintf(stderr, "rawshark: \"%s\" could not be opened: %s (error %d)\n", pipe_name, utf_16to8(err_str), err); @@ -330,7 +330,7 @@ if (!WaitNamedPipe(utf_8to16(pipe_name), 30 * 1000)) { err = GetLastError(); - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, (LPTSTR) &err_str, 0, NULL); fprintf(stderr, "rawshark: \"%s\" could not be waited for: %s (error %d)\n", pipe_name, utf_16to8(err_str), err);

@@ -1,6 +1,6 @@ # This is a local copy of the IANA port-numbers file. # -# $Id: services 42725 2012-05-20 14:34:01Z gerald $ +# $Id: services 43913 2012-07-22 15:04:40Z 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-05-18 +# 2012-07-19 # # Note # @@ -60,8 +60,8 @@ # # This registry is also available in plain text. # -# Transport Registration Modification Service Known -# Service Name Port Number Protocol Description Assignee Contact Date Date Reference Code Unauthorized Assignment Notes +# Transport Registration Modification Service Known +# Service Name Port Number Protocol Description Assignee Contact Date Date Reference Code Unauthorized Assignment Notes # Uses # 0 tcp Reserved [Jon_Postel] [Jon_Postel] # 0 udp Reserved [Jon_Postel] [Jon_Postel] @@ -84,7 +84,7 @@ discard 9/tcp # Discard [Jon_Postel] [Jon_Postel] discard 9/udp # Discard [Jon_Postel] [Jon_Postel] discard 9/sctp # Discard [Randall_Stewart] [Randall_Stewart] [RFC4960] -discard 9/dccp # Discard [Eddie_Kohler] [Eddie_Kohler] [RFC4340] 1145656131 +discard 9/dccp # Discard [Eddie_Kohler] [Eddie_Kohler] [RFC4340] 1145656131 # 10 tcp Unassigned # 10 udp Unassigned systat 11/tcp # Active Users [Jon_Postel] [Jon_Postel] @@ -110,16 +110,16 @@ ftp-data 20/tcp # File Transfer [Default Data] [Jon_Postel] [Jon_Postel] ftp-data 20/udp # File Transfer [Default Data] [Jon_Postel] [Jon_Postel] ftp-data 20/sctp # FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] -ftp 21/tcp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> -ftp 21/udp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> -ftp 21/sctp # FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path> -ssh 22/tcp # The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> -# Protocol -ssh 22/udp # The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> -# Protocol -ssh 22/sctp # SSH [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> -telnet 23/tcp # Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> -telnet 23/udp # Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> +ftp 21/tcp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> +ftp 21/udp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> +ftp 21/sctp # FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path> +ssh 22/tcp # The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> +# Protocol +ssh 22/udp # The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> +# Protocol +ssh 22/sctp # SSH [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> +telnet 23/tcp # Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> +telnet 23/udp # Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> # 24 tcp any private mail system [Rick_Adams] [Rick_Adams] # 24 udp any private mail system [Rick_Adams] [Rick_Adams] smtp 25/tcp # Simple Mail Transfer [Jon_Postel] [Jon_Postel] @@ -212,7 +212,7 @@ # well-formed service name as # a replacement for "whois++". # This entry is an alias to "whoispp". This entry is now -whois++ 63/tcp # whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service +whois++ 63/tcp # whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service # discovery mechanisms. # whois++ # @@ -220,7 +220,7 @@ # well-formed service name as # a replacement for "whois++". # This entry is an alias to "whoispp". This entry is now -whois++ 63/udp # whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service +whois++ 63/udp # whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service # discovery mechanisms. covia 64/tcp # Communications Integrator [Dan_Smith] [Dan_Smith] # (CI) @@ -234,7 +234,7 @@ # well-formed service name as # a replacement for "sql*net". # This entry is an alias to "sql-net". This entry is now -sql*net 66/tcp # Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service +sql*net 66/tcp # Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service # discovery mechanisms. # Oracle SQL*NET # @@ -242,9 +242,9 @@ # well-formed service name as # a replacement for "sql*net". # This entry is an alias to "sql-net". This entry is now -sql*net 66/udp # Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service +sql*net 66/udp # Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service # discovery mechanisms. -bootps 67/tcp # Bootstrap Protocol Server [Bill_Croft] [Bill_Croft] [RFC951] Defined TXT keys: None +bootps 67/tcp # Bootstrap Protocol Server [Bill_Croft] [Bill_Croft] [RFC951] Defined TXT keys: None bootps 67/udp # Bootstrap Protocol Server bootpc 68/tcp # Bootstrap Protocol Client [Bill_Croft] [Bill_Croft] bootpc 68/udp # Bootstrap Protocol Client [Bill_Croft] [Bill_Croft] @@ -272,23 +272,23 @@ vettcp 78/udp # vettcp [Christopher_Leong] [Christopher_Leong] # Unauthorized # use by some -finger 79/tcp # Finger [David_Zimmerman] [David_Zimmerman] mail users +finger 79/tcp # Finger [David_Zimmerman] [David_Zimmerman] mail users # (see # [RFC4146] for # details) # Unauthorized # use by some -finger 79/udp # Finger [David_Zimmerman] [David_Zimmerman] mail users +finger 79/udp # Finger [David_Zimmerman] [David_Zimmerman] mail users # (see # [RFC4146] for # details) -http 80/tcp # World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to +http 80/tcp # World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to # document> -http 80/udp # World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to +http 80/udp # World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to # document> -www 80/tcp # World Wide Web HTTP This is a duplicate of the "http" service and should not be +www 80/tcp # World Wide Web HTTP This is a duplicate of the "http" service and should not be # used for discovery purposes. -www 80/udp # World Wide Web HTTP This is a duplicate of the "http" service and should not be +www 80/udp # World Wide Web HTTP This is a duplicate of the "http" service and should not be # used for discovery purposes. # This is a duplicate of the "http" service and should not be # used for discovery purposes. u=<username> p=<password> @@ -301,7 +301,7 @@ # "typical" web browser client software, and * is intented # primarily to be viewed by a human user. Of course, the # definition of "typical web browser" is subjective, and may -www-http 80/tcp # World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD +www-http 80/tcp # World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD # service type "http" can be understood as meaning # "human-readable HTML content served over HTTP". In some cases # other widely-supported content types may also be appropriate, @@ -325,7 +325,7 @@ # "typical" web browser client software, and * is intented # primarily to be viewed by a human user. Of course, the # definition of "typical web browser" is subjective, and may -www-http 80/udp # World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD +www-http 80/udp # World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD # service type "http" can be understood as meaning # "human-readable HTML content served over HTTP". In some cases # other widely-supported content types may also be appropriate, @@ -338,7 +338,7 @@ # DNS-SD service type, for example, XUL (XML User Interface # Language) transported over HTTP is advertised explicitly as # DNS-SD service type "xul-http". -http 80/sctp # HTTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path to +http 80/sctp # HTTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path to # document> # 81 Unassigned 2007-09-06 xfer 82/tcp # XFER Utility [Thomas_M_Smith] [Thomas_M_Smith] @@ -358,12 +358,12 @@ su-mit-tg 89/tcp # SU/MIT Telnet Gateway [Mark_Crispin] [Mark_Crispin] su-mit-tg 89/udp # SU/MIT Telnet Gateway [Mark_Crispin] [Mark_Crispin] # PORT 90 also -dnsix 90/tcp # DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used -# Token Map unofficially +dnsix 90/tcp # DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used +# Token Map unofficially # by Pointcast # PORT 90 also -dnsix 90/udp # DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used -# Token Map unofficially +dnsix 90/udp # DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used +# Token Map unofficially # by Pointcast mit-dov 91/tcp # MIT Dover Spooler [Eliot_Moss] [Eliot_Moss] mit-dov 91/udp # MIT Dover Spooler [Eliot_Moss] [Eliot_Moss] @@ -386,7 +386,7 @@ metagram 99/tcp # Metagram Relay [Geoff_Goodfellow] [Geoff_Goodfellow] metagram 99/udp # Metagram Relay [Geoff_Goodfellow] [Geoff_Goodfellow] # 100 -# 100 Unassigned 2012-03-21 Unauthorized +# 100 Unassigned 2012-03-21 Unauthorized # use by # 'newacct' hostname 101/tcp # NIC Host Name Server [Jon_Postel] [Jon_Postel] @@ -407,13 +407,13 @@ csnet-ns 105/udp # Mailbox Name Nameserver [Marvin_Solomon] [Marvin_Solomon] # 106 # Unauthorized -3com-tsmux 106/tcp # 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by +3com-tsmux 106/tcp # 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by # insecure # poppassd # protocol # 106 # Unauthorized -3com-tsmux 106/udp # 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by +3com-tsmux 106/udp # 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by # insecure # poppassd # protocol @@ -438,7 +438,7 @@ # ident 113 tcp auth 113/tcp # Authentication Service [Mike_St_Johns] [Mike_St_Johns] auth 113/udp # Authentication Service [Mike_St_Johns] [Mike_St_Johns] -# 114 unassigned Deprecated June 2004 +# 114 unassigned Deprecated June 2004 sftp 115/tcp # Simple File Transfer [Mark_Lottor] [Mark_Lottor] # Protocol sftp 115/udp # Simple File Transfer [Mark_Lottor] [Mark_Lottor] @@ -470,11 +470,11 @@ locus-map 125/udp # Locus PC-Interface Net Map [Eric_Peterson] [Eric_Peterson] # Ser # Port 126 Previously assigned to application below unitary -nxedit 126/tcp # NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary +nxedit 126/tcp # NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary # Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously # assigned to application above # Port 126 Previously assigned to application below unitary -nxedit 126/udp # NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary +nxedit 126/udp # NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary # Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously # assigned to application above locus-con 127/tcp # Locus PC-Interface Conn [Eric_Peterson] [Eric_Peterson] @@ -585,7 +585,7 @@ # well-formed service name as # a replacement for "cl/1". # This entry is an alias to "cl-1". This entry is now historic, -cl/1 172/tcp # Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery +cl/1 172/tcp # Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery # mechanisms. # Network Innovations CL/1 # @@ -593,7 +593,7 @@ # well-formed service name as # a replacement for "cl/1". # This entry is an alias to "cl-1". This entry is now historic, -cl/1 172/udp # Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery +cl/1 172/udp # Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery # mechanisms. xyplex-mux 173/tcp # Xyplex [Bob_Stewart] [Bob_Stewart] xyplex-mux 173/udp # Xyplex [Bob_Stewart] [Bob_Stewart] @@ -698,7 +698,7 @@ # well-formed service name as # a replacement for "z39.50". # This entry is an alias to "z39-50". This entry is now -z39.50 210/tcp # ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service +z39.50 210/tcp # ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service # discovery mechanisms. # ANSI Z39.50 # @@ -706,7 +706,7 @@ # well-formed service name as # a replacement for "z39.50". # This entry is an alias to "z39-50". This entry is now -z39.50 210/udp # ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service +z39.50 210/udp # ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service # discovery mechanisms. # Texas Instruments 914C/G # Terminal @@ -714,8 +714,8 @@ # IANA assigned this # well-formed service name as # a replacement for "914c/g". -# Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now -914c/g 211/tcp # Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service +# Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now +914c/g 211/tcp # Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service # discovery mechanisms. # Texas Instruments 914C/G # Terminal @@ -723,8 +723,8 @@ # IANA assigned this # well-formed service name as # a replacement for "914c/g". -# Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now -914c/g 211/udp # Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service +# Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now +914c/g 211/udp # Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service # discovery mechanisms. anet 212/tcp # ATEXSSTR [Jim_Taylor] [Jim_Taylor] anet 212/udp # ATEXSSTR [Jim_Taylor] [Jim_Taylor] @@ -760,8 +760,8 @@ # Center cdc 223/udp # Certificate Distribution [Kannan_Alagappan] [Kannan_Alagappan] # Center -masqdialer 224/tcp # masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" -masqdialer 224/udp # masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" +masqdialer 224/tcp # masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" +masqdialer 224/udp # masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" # 225-241 Reserved [Jon_Postel] [Jon_Postel] direct 242/tcp # Direct [Herb_Sutter] [Herb_Sutter] direct 242/udp # Direct [Herb_Sutter] [Herb_Sutter] @@ -780,7 +780,7 @@ # a replacement for # "subntbcst_tftp". # This entry is an alias to "subntbcst-tftp". This entry is now -subntbcst_tftp 247/tcp # SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service +subntbcst_tftp 247/tcp # SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service # discovery mechanisms. # SUBNTBCST_TFTP # @@ -789,7 +789,7 @@ # a replacement for # "subntbcst_tftp". # This entry is an alias to "subntbcst-tftp". This entry is now -subntbcst_tftp 247/udp # SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service +subntbcst_tftp 247/udp # SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service # discovery mechanisms. bhfhs 248/tcp # bhfhs [John_Kelly] [John_Kelly] bhfhs 248/udp # bhfhs [John_Kelly] [John_Kelly] @@ -907,15 +907,15 @@ matip-type-a 350/udp # MATIP Type A [Alain_Robert] [Alain_Robert] [RFC2351] matip-type-b 351/tcp # MATIP Type B [Alain_Robert] [Alain_Robert] [RFC2351] matip-type-b 351/udp # MATIP Type B [Alain_Robert] [Alain_Robert] [RFC2351] -bhoetty 351/tcp # bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added +bhoetty 351/tcp # bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added # 5/21/97) -bhoetty 351/udp # bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added +bhoetty 351/udp # bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added # 5/21/97) -dtag-ste-sb 352/tcp # DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) -dtag-ste-sb 352/udp # DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) -bhoedap4 352/tcp # bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added +dtag-ste-sb 352/tcp # DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) +dtag-ste-sb 352/udp # DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) +bhoedap4 352/tcp # bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added # 5/21/97) -bhoedap4 352/udp # bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added +bhoedap4 352/udp # bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added # 5/21/97) ndsauth 353/tcp # NDSAUTH [Jayakumar_Ramalingam] [Jayakumar_Ramalingam] ndsauth 353/udp # NDSAUTH [Jayakumar_Ramalingam] [Jayakumar_Ramalingam] @@ -946,7 +946,7 @@ # a replacement for # "rsvp_tunnel". # This entry is an alias to "rsvp-tunnel". This entry is now -rsvp_tunnel 363/tcp # RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service +rsvp_tunnel 363/tcp # RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service # discovery mechanisms. # RSVP Tunnel # @@ -955,7 +955,7 @@ # a replacement for # "rsvp_tunnel". # This entry is an alias to "rsvp-tunnel". This entry is now -rsvp_tunnel 363/udp # RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service +rsvp_tunnel 363/udp # RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service # discovery mechanisms. aurora-cmgr 364/tcp # Aurora CMGR [Philip_Budne] [Philip_Budne] aurora-cmgr 364/udp # Aurora CMGR [Philip_Budne] [Philip_Budne] @@ -1047,8 +1047,8 @@ # Non-Control over TCP iso-tsap-c2 399/udp # ISO Transport Class 2 [Yanick_Pouffary] [Yanick_Pouffary] # Non-Control over UDP -osb-sd 400/tcp # Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions -osb-sd 400/udp # Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions +osb-sd 400/tcp # Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions +osb-sd 400/udp # Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions ups 401/tcp # Uninterruptible Power Supply [Charles_Bennett] [Charles_Bennett] 2008-08-29 ups 401/udp # Uninterruptible Power Supply [Charles_Bennett] [Charles_Bennett] 2008-08-29 genie 402/tcp # Genie Protocol [Mark_Hankin] [Mark_Hankin] @@ -1123,7 +1123,7 @@ # well-formed service name as # a replacement for "ocs_cmu". # This entry is an alias to "ocs-cmu". This entry is now -ocs_cmu 428/tcp # OCS_CMU historic, not usable for use with many common service +ocs_cmu 428/tcp # OCS_CMU historic, not usable for use with many common service # discovery mechanisms. # OCS_CMU # @@ -1131,7 +1131,7 @@ # well-formed service name as # a replacement for "ocs_cmu". # This entry is an alias to "ocs-cmu". This entry is now -ocs_cmu 428/udp # OCS_CMU historic, not usable for use with many common service +ocs_cmu 428/udp # OCS_CMU historic, not usable for use with many common service # discovery mechanisms. # OCS_AMU # @@ -1139,7 +1139,7 @@ # well-formed service name as # a replacement for "ocs_amu". # This entry is an alias to "ocs-amu". This entry is now -ocs_amu 429/tcp # OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service +ocs_amu 429/tcp # OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service # discovery mechanisms. # OCS_AMU # @@ -1147,7 +1147,7 @@ # well-formed service name as # a replacement for "ocs_amu". # This entry is an alias to "ocs-amu". This entry is now -ocs_amu 429/udp # OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service +ocs_amu 429/udp # OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service # discovery mechanisms. utmpsd 430/tcp # UTMPSD utmpsd 430/udp # UTMPSD @@ -1180,7 +1180,7 @@ # a replacement for # "cvc_hostd". # This entry is an alias to "cvc-hostd". This entry is now -cvc_hostd 442/tcp # cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service +cvc_hostd 442/tcp # cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service # discovery mechanisms. # cvc_hostd # @@ -1189,7 +1189,7 @@ # a replacement for # "cvc_hostd". # This entry is an alias to "cvc-hostd". This entry is now -cvc_hostd 442/udp # cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service +cvc_hostd 442/udp # cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service # discovery mechanisms. https 443/tcp # http protocol over TLS/SSL [Kipp_E_B_Hickman] [Kipp_E_B_Hickman] https 443/udp # http protocol over TLS/SSL [Kipp_E_B_Hickman] [Kipp_E_B_Hickman] @@ -1465,8 +1465,8 @@ dhcpv6-client 546/udp # DHCPv6 Client dhcpv6-server 547/tcp # DHCPv6 Server [Jim_Bound] [Jim_Bound] dhcpv6-server 547/udp # DHCPv6 Server [Jim_Bound] [Jim_Bound] -afpovertcp 548/tcp # AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> -afpovertcp 548/udp # AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> +afpovertcp 548/tcp # AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> +afpovertcp 548/udp # AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> idfp 549/tcp # IDFP [Ramana_Kovi] [Ramana_Kovi] idfp 549/udp # IDFP [Ramana_Kovi] [Ramana_Kovi] new-rwho 550/tcp # new-who [n/a] @@ -1543,7 +1543,7 @@ philips-vc 583/udp # Philips Video-Conferencing [Janna_Chang] [Janna_Chang] keyserver 584/tcp # Key Server [Gary_Howland] [Gary_Howland] keyserver 584/udp # Key Server [Gary_Howland] [Gary_Howland] -# 585 De-registered 2006-04-25 Use of 585 is not recommended, use 993 instead +# 585 De-registered 2006-04-25 Use of 585 is not recommended, use 993 instead password-chg 586/tcp # Password Change password-chg 586/udp # Password Change submission 587/tcp # Message Submission 2011-11-17 [RFC6409] @@ -1642,7 +1642,7 @@ # well-formed service name as # a replacement for "dec_dlm". # This entry is an alias to "dec-dlm". This entry is now -dec_dlm 625/tcp # DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service +dec_dlm 625/tcp # DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service # discovery mechanisms. # DEC DLM # @@ -1650,7 +1650,7 @@ # well-formed service name as # a replacement for "dec_dlm". # This entry is an alias to "dec-dlm". This entry is now -dec_dlm 625/udp # DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service +dec_dlm 625/udp # DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service # discovery mechanisms. asia 626/tcp # ASIA [Michael_Dasenbrock] [Michael_Dasenbrock] asia 626/udp # ASIA [Michael_Dasenbrock] [Michael_Dasenbrock] @@ -1662,9 +1662,9 @@ 3com-amp3 629/udp # 3Com AMP3 [Prakash_Banthia] [Prakash_Banthia] rda 630/tcp # RDA [John_Hadjioannou] [John_Hadjioannou] rda 630/udp # RDA [John_Hadjioannou] [John_Hadjioannou] -ipp 631/tcp # IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. +ipp 631/tcp # IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. # Protocol) -ipp 631/udp # IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. +ipp 631/udp # IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. # Protocol) bmpp 632/tcp # bmpp [Troy_Rollo] [Troy_Rollo] bmpp 632/udp # bmpp [Troy_Rollo] [Troy_Rollo] @@ -1963,7 +1963,7 @@ # 786 Unassigned 2002-05-08 # 787 Unassigned 2002-10-08 # Unauthorized -# 788-799 Unassigned Use Known on +# 788-799 Unassigned Use Known on # port 796 # IANA assigned this mdbs-daemon 800/tcp # well-formed service name as @@ -2024,7 +2024,7 @@ # a replacement for # "iclcnet_svinfo". # This entry is an alias to "iclcnet-svinfo". This entry is now -iclcnet_svinfo 887/tcp # ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service +iclcnet_svinfo 887/tcp # ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service # discovery mechanisms. # ICL coNETion server info # @@ -2033,11 +2033,11 @@ # a replacement for # "iclcnet_svinfo". # This entry is an alias to "iclcnet-svinfo". This entry is now -iclcnet_svinfo 887/udp # ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service +iclcnet_svinfo 887/udp # ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service # discovery mechanisms. accessbuilder 888/tcp # AccessBuilder [Steve_Sweeney] [Steve_Sweeney] accessbuilder 888/udp # AccessBuilder [Steve_Sweeney] [Steve_Sweeney] -cddbp 888/tcp # CD Database Protocol [Steve_Scherf] [Steve_Scherf] This entry records an unassigned but widespread use +cddbp 888/tcp # CD Database Protocol [Steve_Scherf] [Steve_Scherf] This entry records an unassigned but widespread use # 889-899 Unassigned omginitialrefs 900/tcp # OMG Initial Refs [Christian_Callsen] [Christian_Callsen] omginitialrefs 900/udp # OMG Initial Refs [Christian_Callsen] [Christian_Callsen] @@ -2078,7 +2078,7 @@ telnets 992/udp # telnet protocol over TLS/SSL imaps 993/tcp # imap4 protocol over TLS/SSL imaps 993/udp # imap4 protocol over TLS/SSL -# 994 tcp Reserved 2011-08-31 (previous contact was[Christopher_Allen]) +# 994 tcp Reserved 2011-08-31 (previous contact was[Christopher_Allen]) # 994 udp Reserved pop3s 995/tcp # pop3 protocol over TLS/SSL [Gordon_Mangione] [Gordon_Mangione] # (was spop3) @@ -2179,7 +2179,7 @@ ddt 1052/tcp # Dynamic DNS Tools [Remi_Lefebvre] [Remi_Lefebvre] ddt 1052/udp # Dynamic DNS Tools [Remi_Lefebvre] [Remi_Lefebvre] # Unauthorized -remote-as 1053/tcp # Remote Assistant (RA) [Roman_Kriis] [Roman_Kriis] Use Known on +remote-as 1053/tcp # Remote Assistant (RA) [Roman_Kriis] [Roman_Kriis] Use Known on # port 1053 remote-as 1053/udp # Remote Assistant (RA) [Roman_Kriis] [Roman_Kriis] brvread 1054/tcp # BRVREAD [A_Boninn] [A_Boninn] @@ -2215,8 +2215,8 @@ # well-formed service name as # a replacement for # "instl_boots". -# Installation Bootstrap This entry is an alias to "instl-boots". This entry is now -instl_boots 1067/tcp # Proto. Serv. historic, not usable for use with many common service +# Installation Bootstrap This entry is an alias to "instl-boots". This entry is now +instl_boots 1067/tcp # Proto. Serv. historic, not usable for use with many common service # discovery mechanisms. # Installation Bootstrap # Proto. Serv. @@ -2225,8 +2225,8 @@ # well-formed service name as # a replacement for # "instl_boots". -# Installation Bootstrap This entry is an alias to "instl-boots". This entry is now -instl_boots 1067/udp # Proto. Serv. historic, not usable for use with many common service +# Installation Bootstrap This entry is an alias to "instl-boots". This entry is now +instl_boots 1067/udp # Proto. Serv. historic, not usable for use with many common service # discovery mechanisms. # Installation Bootstrap # Proto. Cli. @@ -2235,8 +2235,8 @@ # well-formed service name as # a replacement for # "instl_bootc". -# Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now -instl_bootc 1068/tcp # Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service +# Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now +instl_bootc 1068/tcp # Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service # discovery mechanisms. # Installation Bootstrap # Proto. Cli. @@ -2245,8 +2245,8 @@ # well-formed service name as # a replacement for # "instl_bootc". -# Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now -instl_bootc 1068/udp # Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service +# Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now +instl_bootc 1068/udp # Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service # discovery mechanisms. cognex-insight 1069/tcp # COGNEX-INSIGHT [Steve_Olson] [Steve_Olson] cognex-insight 1069/udp # COGNEX-INSIGHT [Steve_Olson] [Steve_Olson] @@ -2416,7 +2416,7 @@ # a replacement for # "encrypted_admin". # This entry is an alias to "encrypted-admin". This entry is -encrypted_admin 1138/tcp # encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service +encrypted_admin 1138/tcp # encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service # discovery mechanisms. # encrypted admin requests # @@ -2425,7 +2425,7 @@ # a replacement for # "encrypted_admin". # This entry is an alias to "encrypted-admin". This entry is -encrypted_admin 1138/udp # encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service +encrypted_admin 1138/udp # encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service # discovery mechanisms. evm 1139/tcp # Enterprise Virtual Manager [Thomas_Hennessy] [Thomas_Hennessy] 2007-10-04 evm 1139/udp # Enterprise Virtual Manager [Thomas_Hennessy] [Thomas_Hennessy] 2007-10-04 @@ -2621,8 +2621,8 @@ periscope 1230/udp # Periscope [Kevin_Madden] [Kevin_Madden] menandmice-lpm 1231/tcp # menandmice-lpm [Sigfus_Magnusson] [Sigfus_Magnusson] menandmice-lpm 1231/udp # menandmice-lpm [Sigfus_Magnusson] [Sigfus_Magnusson] -# 1232 tcp unassigned Microsoft (unoffically) using 1232 -# 1232 udp unassigned Microsoft (unoffically) using 1232 +# 1232 tcp unassigned Microsoft (unoffically) using 1232 +# 1232 udp unassigned Microsoft (unoffically) using 1232 univ-appserver 1233/tcp # Universal App Server [Tim_Sent] [Tim_Sent] univ-appserver 1233/udp # Universal App Server [Tim_Sent] [Tim_Sent] search-agent 1234/tcp # Infoseek Search Agent [Jackie_Wu] [Jackie_Wu] @@ -2794,7 +2794,7 @@ # a replacement for # "bmc_patroldb". # This entry is an alias to "bmc-patroldb". This entry is now -bmc_patroldb 1313/tcp # BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service +bmc_patroldb 1313/tcp # BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service # discovery mechanisms. # BMC_PATROLDB # @@ -2803,7 +2803,7 @@ # a replacement for # "bmc_patroldb". # This entry is an alias to "bmc-patroldb". This entry is now -bmc_patroldb 1313/udp # BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service +bmc_patroldb 1313/udp # BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service # discovery mechanisms. pdps 1314/tcp # Photoscript Distributed [Les_Klein] [Les_Klein] # Printing System @@ -2965,7 +2965,7 @@ # well-formed service name as # a replacement for "udt_os". # This entry is an alias to "udt-os". This entry is now -udt_os 1382/tcp # udt_os historic, not usable for use with many common service +udt_os 1382/tcp # udt_os historic, not usable for use with many common service # discovery mechanisms. # udt_os # @@ -2973,7 +2973,7 @@ # well-formed service name as # a replacement for "udt_os". # This entry is an alias to "udt-os". This entry is now -udt_os 1382/udp # udt_os historic, not usable for use with many common service +udt_os 1382/udp # udt_os historic, not usable for use with many common service # discovery mechanisms. gwha 1383/tcp # GW Hannaway Network License [J_Gabriel_Foster] [J_Gabriel_Foster] # Manager @@ -2990,8 +2990,8 @@ # well-formed service name as # a replacement for # "atex_elmd". -# Atex Publishing License This entry is an alias to "atex-elmd". This entry is now -atex_elmd 1385/tcp # Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service +# Atex Publishing License This entry is an alias to "atex-elmd". This entry is now +atex_elmd 1385/tcp # Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service # discovery mechanisms. # Atex Publishing License # Manager @@ -3000,8 +3000,8 @@ # well-formed service name as # a replacement for # "atex_elmd". -# Atex Publishing License This entry is an alias to "atex-elmd". This entry is now -atex_elmd 1385/udp # Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service +# Atex Publishing License This entry is an alias to "atex-elmd". This entry is now +atex_elmd 1385/udp # Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service # discovery mechanisms. checksum 1386/tcp # CheckSum License Manager [Andreas_Glocker] [Andreas_Glocker] checksum 1386/udp # CheckSum License Manager [Andreas_Glocker] [Andreas_Glocker] @@ -3078,7 +3078,7 @@ # a replacement for # "novell-lu6.2". # This entry is an alias to "novell-lu6-2". This entry is now -novell-lu6.2 1416/tcp # Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service +novell-lu6.2 1416/tcp # Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service # discovery mechanisms. # Novell LU6.2 # @@ -3087,7 +3087,7 @@ # a replacement for # "novell-lu6.2". # This entry is an alias to "novell-lu6-2". This entry is now -novell-lu6.2 1416/udp # Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service +novell-lu6.2 1416/udp # Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service # discovery mechanisms. timbuktu-srv1 1417/tcp # Timbuktu Service 1 Port timbuktu-srv1 1417/udp # Timbuktu Service 1 Port @@ -3188,7 +3188,7 @@ # a replacement for # "interhdl_elmd". # This entry is an alias to "interhdl-elmd". This entry is now -interhdl_elmd 1454/tcp # interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service +interhdl_elmd 1454/tcp # interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service # discovery mechanisms. # interHDL License Manager # @@ -3197,7 +3197,7 @@ # a replacement for # "interhdl_elmd". # This entry is an alias to "interhdl-elmd". This entry is now -interhdl_elmd 1454/udp # interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service +interhdl_elmd 1454/udp # interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service # discovery mechanisms. esl-lm 1455/tcp # ESL License Manager [Abel_Chou] [Abel_Chou] esl-lm 1455/udp # ESL License Manager [Abel_Chou] [Abel_Chou] @@ -3222,7 +3222,7 @@ # a replacement for # "ibm_wrless_lan". # This entry is an alias to "ibm-wrless-lan". This entry is now -ibm_wrless_lan 1461/tcp # IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service +ibm_wrless_lan 1461/tcp # IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service # discovery mechanisms. # IBM Wireless LAN # @@ -3231,7 +3231,7 @@ # a replacement for # "ibm_wrless_lan". # This entry is an alias to "ibm-wrless-lan". This entry is now -ibm_wrless_lan 1461/udp # IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service +ibm_wrless_lan 1461/udp # IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service # discovery mechanisms. world-lm 1462/tcp # World License Manager [Michael_S_Amirault] [Michael_S_Amirault] world-lm 1462/udp # World License Manager [Michael_S_Amirault] [Michael_S_Amirault] @@ -3243,7 +3243,7 @@ # well-formed service name as # a replacement for "msl_lmd". # This entry is an alias to "msl-lmd". This entry is now -msl_lmd 1464/tcp # MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service +msl_lmd 1464/tcp # MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service # discovery mechanisms. # MSL License Manager # @@ -3251,7 +3251,7 @@ # well-formed service name as # a replacement for "msl_lmd". # This entry is an alias to "msl-lmd". This entry is now -msl_lmd 1464/udp # MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service +msl_lmd 1464/udp # MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service # discovery mechanisms. pipes 1465/tcp # Pipes Platform [Mark_Farlin] [Mark_Farlin] pipes 1465/udp # Pipes Platform [Mark_Farlin] [Mark_Farlin] @@ -3306,7 +3306,7 @@ # a replacement for # "nms_topo_serv". # This entry is an alias to "nms-topo-serv". This entry is now -nms_topo_serv 1486/tcp # nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service +nms_topo_serv 1486/tcp # nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service # discovery mechanisms. # nms_topo_serv # @@ -3315,7 +3315,7 @@ # a replacement for # "nms_topo_serv". # This entry is an alias to "nms-topo-serv". This entry is now -nms_topo_serv 1486/udp # nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service +nms_topo_serv 1486/udp # nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service # discovery mechanisms. localinfosrvr 1487/tcp # LocalInfoSrvr [Brian_Matthews_2] [Brian_Matthews_2] localinfosrvr 1487/udp # LocalInfoSrvr [Brian_Matthews_2] [Brian_Matthews_2] @@ -3335,7 +3335,7 @@ # a replacement for # "netmap_lm". # This entry is an alias to "netmap-lm". This entry is now -netmap_lm 1493/tcp # netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service +netmap_lm 1493/tcp # netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service # discovery mechanisms. # netmap_lm # @@ -3344,7 +3344,7 @@ # a replacement for # "netmap_lm". # This entry is an alias to "netmap-lm". This entry is now -netmap_lm 1493/udp # netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service +netmap_lm 1493/udp # netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service # discovery mechanisms. ica 1494/tcp # ica [John_Richardson] [John_Richardson] ica 1494/udp # ica [John_Richardson] [John_Richardson] @@ -3500,8 +3500,8 @@ # well-formed service name as # a replacement for # "veritas_pbx". -# VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now -veritas_pbx 1556/tcp # Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service +# VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now +veritas_pbx 1556/tcp # Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service # discovery mechanisms. # VERITAS Private Branch # Exchange @@ -3510,8 +3510,8 @@ # well-formed service name as # a replacement for # "veritas_pbx". -# VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now -veritas_pbx 1556/udp # Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service +# VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now +veritas_pbx 1556/udp # Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service # discovery mechanisms. arbortext-lm 1557/tcp # ArborText License Manager [David_J_Wilson] [David_J_Wilson] arbortext-lm 1557/udp # ArborText License Manager [David_J_Wilson] [David_J_Wilson] @@ -3580,7 +3580,7 @@ # a replacement for # "pra_elmd". # This entry is an alias to "pra-elmd". This entry is now -pra_elmd 1587/tcp # pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service +pra_elmd 1587/tcp # pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service # discovery mechanisms. # pra_elmd # @@ -3589,7 +3589,7 @@ # a replacement for # "pra_elmd". # This entry is an alias to "pra-elmd". This entry is now -pra_elmd 1587/udp # pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service +pra_elmd 1587/udp # pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service # discovery mechanisms. triquest-lm 1588/tcp # triquest-lm [Nand_Kumar] [Nand_Kumar] triquest-lm 1588/udp # triquest-lm [Nand_Kumar] [Nand_Kumar] @@ -3736,7 +3736,7 @@ # a replacement for # "shiva_confsrvr". # This entry is an alias to "shiva-confsrvr". This entry is now -shiva_confsrvr 1651/tcp # shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service +shiva_confsrvr 1651/tcp # shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service # discovery mechanisms. # shiva_confsrvr # @@ -3745,7 +3745,7 @@ # a replacement for # "shiva_confsrvr". # This entry is an alias to "shiva-confsrvr". This entry is now -shiva_confsrvr 1651/udp # shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service +shiva_confsrvr 1651/udp # shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service # discovery mechanisms. xnmp 1652/tcp # xnmp [Ali_Saleh] [Ali_Saleh] xnmp 1652/udp # xnmp [Ali_Saleh] [Ali_Saleh] @@ -4007,12 +4007,7 @@ kmscontrol 1773/udp # KMSControl [Roy_Chastain] [Roy_Chastain] global-dtserv 1774/tcp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] global-dtserv 1774/udp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] -# IANA assigned this -- 1775/tcp # well-formed service name as -# a replacement for "#". -# This entry is an alias to "-". This entry is now historic, -# 1775/tcp # not usable for use with many common service discovery -# mechanisms. +# 1775 Unassigned femis 1776/tcp # Federal Emergency Management [Larry_Gerhardstein] [Larry_Gerhardstein] # Information System femis 1776/udp # Federal Emergency Management [Larry_Gerhardstein] [Larry_Gerhardstein] @@ -4263,8 +4258,8 @@ elad 1893/udp # ELAD Protocol [Franco_Milan] [Franco_Milan] o2server-port 1894/tcp # O2Server Port [Tim_Howard] [Tim_Howard] o2server-port 1894/udp # O2Server Port [Tim_Howard] [Tim_Howard] -# 1895 tcp unassigned Microsoft (unoffically) using 1895 -# 1895 udp unassigned Microsoft (unoffically) using 1895 +# 1895 tcp unassigned Microsoft (unoffically) using 1895 +# 1895 udp unassigned Microsoft (unoffically) using 1895 b-novative-ls 1896/tcp # b-novative license server [Matthias_Riese] [Matthias_Riese] b-novative-ls 1896/udp # b-novative license server [Matthias_Riese] [Matthias_Riese] metaagent 1897/tcp # MetaAgent [Marie_France_Dubreui] [Marie_France_Dubreui] @@ -4477,16 +4472,16 @@ tr-rsrb-p2 1988/udp # cisco RSRB Priority 2 port tr-rsrb-p3 1989/tcp # cisco RSRB Priority 3 port tr-rsrb-p3 1989/udp # cisco RSRB Priority 3 port -mshnet 1989/tcp # MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use -mshnet 1989/udp # MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use +mshnet 1989/tcp # MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use +mshnet 1989/udp # MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use stun-p1 1990/tcp # cisco STUN Priority 1 port stun-p1 1990/udp # cisco STUN Priority 1 port stun-p2 1991/tcp # cisco STUN Priority 2 port stun-p2 1991/udp # cisco STUN Priority 2 port stun-p3 1992/tcp # cisco STUN Priority 3 port stun-p3 1992/udp # cisco STUN Priority 3 port -ipsendmsg 1992/tcp # IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use -ipsendmsg 1992/udp # IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use +ipsendmsg 1992/tcp # IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use +ipsendmsg 1992/udp # IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use snmp-tcp-port 1993/tcp # cisco SNMP TCP port snmp-tcp-port 1993/udp # cisco SNMP TCP port stun-port 1994/tcp # cisco serial tunnel port @@ -4585,8 +4580,8 @@ # imsldoc 2035 udp e-dpnet 2036/tcp # Ethernet WS DP network [Peter_Kaever] [Peter_Kaever] 2005-08 e-dpnet 2036/udp # Ethernet WS DP network [Peter_Kaever] [Peter_Kaever] 2005-08 -applus 2037/tcp # APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server -applus 2037/udp # APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server +applus 2037/tcp # APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server +applus 2037/udp # APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server # objectmanager 2038 tcp # objectmanager 2038 udp prizma 2039/tcp # Prizma Monitoring Service [Dotan_Ofek] [Dotan_Ofek] 2005-12 @@ -4613,11 +4608,11 @@ # shilp 2049/tcp # <== NOTE Conflict on 2049 ! # Excluded by ./tools/make-services.pl # shilp 2049/udp # <== NOTE Conflict on 2049 ! -nfs 2049/tcp # Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> +nfs 2049/tcp # Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> # Microsystems -nfs 2049/udp # Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> +nfs 2049/udp # Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> # Microsystems -nfs 2049/sctp # Network File System [RFC5665] Defined TXT keys: path=<path to mount point> +nfs 2049/sctp # Network File System [RFC5665] Defined TXT keys: path=<path to mount point> av-emb-config 2050/tcp # Avaya EMB Config Port [John_Yeager] [John_Yeager] av-emb-config 2050/udp # Avaya EMB Config Port [John_Yeager] [John_Yeager] epnsdp 2051/tcp # EPNSDP [Hiroyasu_Ogata] [Hiroyasu_Ogata] @@ -4694,10 +4689,9 @@ infowave 2082/udp # Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku] # The TCP port 2083 was already previously assigned by IANA for # "RadSec", an early implementation of RADIUS/TLS, prior to -radsec 2083/tcp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 [RFC-ietf-radext-radsec-12] issuance of this RFC. This early implementation can be +radsec 2083/tcp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 [RFC6614] issuance of this RFC. This early implementation can be # configured to be compatible to RADIUS/TLS as specified by the -# IETF. See [RFC-ietf-radext-radsec-12], Appendix A for -# details. +# IETF. See [RFC6614], Appendix A for details. radsec 2083/udp # Secure Radius Service [Mike_McCauley] [Mike_McCauley] 2005-05 sunclustergeo 2084/tcp # SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11 sunclustergeo 2084/udp # SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11 @@ -5018,21 +5012,21 @@ rockwell-csp1 2221/udp # Rockwell CSP1 [Brian_Batke] [Brian_Batke] # EtherNet/IP I/O # -EtherNet-IP-1 2222/tcp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 +EtherNet-IP-1 2222/tcp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 # well-formed service name as # a replacement for # "EtherNet/IP-1". # New contact added for port 2222 on 2008-02-01 This entry is -EtherNet/IP-1 2222/tcp # EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not +EtherNet/IP-1 2222/tcp # EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not # usable for use with many common service discovery mechanisms. # EtherNet/IP I/O # -EtherNet-IP-1 2222/udp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 +EtherNet-IP-1 2222/udp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 # well-formed service name as # a replacement for # "EtherNet/IP-1". # New contact added for port 2222 on 2008-02-01 This entry is -EtherNet/IP-1 2222/udp # EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not +EtherNet/IP-1 2222/udp # EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not # usable for use with many common service discovery mechanisms. rockwell-csp2 2223/tcp # Rockwell CSP2 [Brian_Batke] [Brian_Batke] rockwell-csp2 2223/udp # Rockwell CSP2 [Brian_Batke] [Brian_Batke] @@ -5274,8 +5268,8 @@ 3d-nfsd 2323/udp # 3d-nfsd [Mike_Sherrill] [Mike_Sherrill] cosmocall 2324/tcp # Cosmocall [Steve_Dellutri] [Steve_Dellutri] cosmocall 2324/udp # Cosmocall [Steve_Dellutri] [Steve_Dellutri] -ansysli 2325/tcp # ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 -ansysli 2325/udp # ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 +ansysli 2325/tcp # ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 +ansysli 2325/udp # ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 idcp 2326/tcp # IDCP [Keisokugiken_Corp] [Keisokugiken_Corp] idcp 2326/udp # IDCP [Keisokugiken_Corp] [Keisokugiken_Corp] xingcsm 2327/tcp # xingcsm [Dave_Spencer] [Dave_Spencer] @@ -5311,7 +5305,7 @@ # a replacement for # "wrs_registry". # This entry is an alias to "wrs-registry". This entry is now -wrs_registry 2340/tcp # WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service +wrs_registry 2340/tcp # WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service # discovery mechanisms. # WRS Registry # @@ -5320,7 +5314,7 @@ # a replacement for # "wrs_registry". # This entry is an alias to "wrs-registry". This entry is now -wrs_registry 2340/udp # WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service +wrs_registry 2340/udp # WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service # discovery mechanisms. xiostatus 2341/tcp # XIO Status [Randy_Maas] [Randy_Maas] xiostatus 2341/udp # XIO Status [Randy_Maas] [Randy_Maas] @@ -5339,7 +5333,7 @@ # a replacement for # "redstorm_join". # This entry is an alias to "redstorm-join". This entry is now -redstorm_join 2346/tcp # Game Connection Port historic, not usable for use with many common service +redstorm_join 2346/tcp # Game Connection Port historic, not usable for use with many common service # discovery mechanisms. # Game Connection Port # @@ -5348,7 +5342,7 @@ # a replacement for # "redstorm_join". # This entry is an alias to "redstorm-join". This entry is now -redstorm_join 2346/udp # Game Connection Port historic, not usable for use with many common service +redstorm_join 2346/udp # Game Connection Port historic, not usable for use with many common service # discovery mechanisms. # Game Announcement and # Location @@ -5357,8 +5351,8 @@ # well-formed service name as # a replacement for # "redstorm_find". -# Game Announcement and This entry is an alias to "redstorm-find". This entry is now -redstorm_find 2347/tcp # Location historic, not usable for use with many common service +# Game Announcement and This entry is an alias to "redstorm-find". This entry is now +redstorm_find 2347/tcp # Location historic, not usable for use with many common service # discovery mechanisms. # Game Announcement and # Location @@ -5367,8 +5361,8 @@ # well-formed service name as # a replacement for # "redstorm_find". -# Game Announcement and This entry is an alias to "redstorm-find". This entry is now -redstorm_find 2347/udp # Location historic, not usable for use with many common service +# Game Announcement and This entry is an alias to "redstorm-find". This entry is now +redstorm_find 2347/udp # Location historic, not usable for use with many common service # discovery mechanisms. # Information to query for # game status @@ -5377,8 +5371,8 @@ # well-formed service name as # a replacement for # "redstorm_info". -# Information to query for This entry is an alias to "redstorm-info". This entry is now -redstorm_info 2348/tcp # game status historic, not usable for use with many common service +# Information to query for This entry is an alias to "redstorm-info". This entry is now +redstorm_info 2348/tcp # game status historic, not usable for use with many common service # discovery mechanisms. # Information to query for # game status @@ -5387,8 +5381,8 @@ # well-formed service name as # a replacement for # "redstorm_info". -# Information to query for This entry is an alias to "redstorm-info". This entry is now -redstorm_info 2348/udp # game status historic, not usable for use with many common service +# Information to query for This entry is an alias to "redstorm-info". This entry is now +redstorm_info 2348/udp # game status historic, not usable for use with many common service # discovery mechanisms. # Diagnostics Port # @@ -5397,7 +5391,7 @@ # a replacement for # "redstorm_diag". # This entry is an alias to "redstorm-diag". This entry is now -redstorm_diag 2349/tcp # Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service +redstorm_diag 2349/tcp # Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service # discovery mechanisms. # Diagnostics Port # @@ -5406,7 +5400,7 @@ # a replacement for # "redstorm_diag". # This entry is an alias to "redstorm-diag". This entry is now -redstorm_diag 2349/udp # Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service +redstorm_diag 2349/udp # Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service # discovery mechanisms. psbserver 2350/tcp # Pharos Booking Server psbserver 2350/udp # Pharos Booking Server @@ -5446,13 +5440,13 @@ service-ctrl 2367/udp # Service Control [Humberto_Sanchez] [Humberto_Sanchez] opentable 2368/tcp # OpenTable [Brett_Goldstein] [Brett_Goldstein] opentable 2368/udp # OpenTable [Brett_Goldstein] [Brett_Goldstein] -# 2369 Unassigned De-registered (28 March 2006) +# 2369 Unassigned De-registered (28 March 2006) # Port 2370 -l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially +l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially # used by # Compaq # Port 2370 -l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially +l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially # used by # Compaq worldwire 2371/tcp # Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] @@ -5499,7 +5493,7 @@ # a replacement for # "lan900_remote". # This entry is an alias to "lan900-remote". This entry is now -lan900_remote 2395/tcp # LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service +lan900_remote 2395/tcp # LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service # discovery mechanisms. # LAN900 Remote # @@ -5508,7 +5502,7 @@ # a replacement for # "lan900_remote". # This entry is an alias to "lan900-remote". This entry is now -lan900_remote 2395/udp # LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service +lan900_remote 2395/udp # LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service # discovery mechanisms. wusage 2396/tcp # Wusage [Thomas_Boutell] [Thomas_Boutell] wusage 2396/udp # Wusage [Thomas_Boutell] [Thomas_Boutell] @@ -5540,7 +5534,7 @@ orion 2407/udp # Orion [Matthew_Horoschun] [Matthew_Horoschun] railgun-webaccl 2408/tcp # CloudFlare Railgun Web [CloudFlare] [John_Graham_Cumming] 2012-03-09 # Acceleration Protocol -# 2408 udp Reserved 2012-03-09 This entry is being removed on 2012-03-09. +# 2408 udp Reserved 2012-03-09 This entry is being removed on 2012-03-09. sns-protocol 2409/tcp # SNS Protocol [Amir_Blich] [Amir_Blich] sns-protocol 2409/udp # SNS Protocol [Amir_Blich] [Amir_Blich] vrts-registry 2410/tcp # VRTS Registry [Pranay_Varma] [Pranay_Varma] @@ -5627,7 +5621,7 @@ # a replacement for # "bues_service". # This entry is an alias to "bues-service". This entry is now -bues_service 2446/tcp # bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service +bues_service 2446/tcp # bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service # discovery mechanisms. # bues_service # @@ -5636,7 +5630,7 @@ # a replacement for # "bues_service". # This entry is an alias to "bues-service". This entry is now -bues_service 2446/udp # bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service +bues_service 2446/udp # bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service # discovery mechanisms. ovwdb 2447/tcp # OpenView NNM daemon [Eric_Pulsipher_2] [Eric_Pulsipher_2] ovwdb 2447/udp # OpenView NNM daemon [Eric_Pulsipher_2] [Eric_Pulsipher_2] @@ -5820,7 +5814,7 @@ # well-formed service name as # a replacement for "ncr_ccl". # This entry is an alias to "ncr-ccl". This entry is now -ncr_ccl 2528/tcp # NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service +ncr_ccl 2528/tcp # NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service # discovery mechanisms. # NCR CCL # @@ -5828,7 +5822,7 @@ # well-formed service name as # a replacement for "ncr_ccl". # This entry is an alias to "ncr-ccl". This entry is now -ncr_ccl 2528/udp # NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service +ncr_ccl 2528/udp # NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service # discovery mechanisms. utsftp 2529/tcp # UTS FTP [David_Moore] [David_Moore] utsftp 2529/udp # UTS FTP [David_Moore] [David_Moore] @@ -6061,8 +6055,8 @@ # well-formed service name as # a replacement for # "sai_sentlm". -# Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now -sai_sentlm 2640/tcp # Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service +# Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now +sai_sentlm 2640/tcp # Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service # discovery mechanisms. # Sabbagh Associates Licence # Manager @@ -6071,8 +6065,8 @@ # well-formed service name as # a replacement for # "sai_sentlm". -# Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now -sai_sentlm 2640/udp # Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service +# Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now +sai_sentlm 2640/udp # Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service # discovery mechanisms. hdl-srv 2641/tcp # HDL Server [David_Ely] [David_Ely] hdl-srv 2641/udp # HDL Server [David_Ely] [David_Ely] @@ -6107,7 +6101,7 @@ # a replacement for # "corel_vncadmin". # This entry is an alias to "corel-vncadmin". This entry is now -corel_vncadmin 2654/tcp # Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service +corel_vncadmin 2654/tcp # Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service # discovery mechanisms. # Corel VNC Admin # @@ -6116,7 +6110,7 @@ # a replacement for # "corel_vncadmin". # This entry is an alias to "corel-vncadmin". This entry is now -corel_vncadmin 2654/udp # Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service +corel_vncadmin 2654/udp # Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service # discovery mechanisms. unglue 2655/tcp # UNIX Nt Glue [Peter_Santoro] [Peter_Santoro] unglue 2655/udp # UNIX Nt Glue [Peter_Santoro] [Peter_Santoro] @@ -6193,8 +6187,8 @@ itinternet 2691/udp # ITInternet ISM Server [Ron_Ehli] [Ron_Ehli] admins-lms 2692/tcp # Admins LMS [Dagfinn_Saether] [Dagfinn_Saether] admins-lms 2692/udp # Admins LMS [Dagfinn_Saether] [Dagfinn_Saether] -# 2693 tcp Unassigned (Removed 2004-2-6) -# 2693 udp Unassigned (Removed 2004-2-6) +# 2693 tcp Unassigned (Removed 2004-2-6) +# 2693 udp Unassigned (Removed 2004-2-6) pwrsevent 2694/tcp # pwrsevent [Yoshinobu_Nakamura] [Yoshinobu_Nakamura] pwrsevent 2694/udp # pwrsevent [Yoshinobu_Nakamura] [Yoshinobu_Nakamura] vspread 2695/tcp # VSPREAD [Sumitake_kobayashi] [Sumitake_kobayashi] @@ -6668,7 +6662,7 @@ # a replacement for # "elvin_server". # This entry is an alias to "elvin-server". This entry is now -elvin_server 2916/tcp # Elvin Server historic, not usable for use with many common service +elvin_server 2916/tcp # Elvin Server historic, not usable for use with many common service # discovery mechanisms. # Elvin Server # @@ -6677,7 +6671,7 @@ # a replacement for # "elvin_server". # This entry is an alias to "elvin-server". This entry is now -elvin_server 2916/udp # Elvin Server historic, not usable for use with many common service +elvin_server 2916/udp # Elvin Server historic, not usable for use with many common service # discovery mechanisms. # Elvin Client # @@ -6686,7 +6680,7 @@ # a replacement for # "elvin_client". # This entry is an alias to "elvin-client". This entry is now -elvin_client 2917/tcp # Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service +elvin_client 2917/tcp # Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service # discovery mechanisms. # Elvin Client # @@ -6695,7 +6689,7 @@ # a replacement for # "elvin_client". # This entry is an alias to "elvin-client". This entry is now -elvin_client 2917/udp # Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service +elvin_client 2917/udp # Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service # discovery mechanisms. kastenchasepad 2918/tcp # Kasten Chase Pad [Marc_Gauthier] [Marc_Gauthier] kastenchasepad 2918/udp # Kasten Chase Pad [Marc_Gauthier] [Marc_Gauthier] @@ -6879,13 +6873,13 @@ remoteware-un 2999/udp # RemoteWare Unassigned [Tim_Farley] [Tim_Farley] hbci 3000/tcp # HBCI [Kurt_Haubner] [Kurt_Haubner] hbci 3000/udp # HBCI [Kurt_Haubner] [Kurt_Haubner] -remoteware-cl 3000/tcp # RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use -remoteware-cl 3000/udp # RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use +remoteware-cl 3000/tcp # RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use +remoteware-cl 3000/udp # RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use # 3001 Unassigned 2006-05-25 exlm-agent 3002/tcp # EXLM Agent [Randy_Martin] [Randy_Martin] exlm-agent 3002/udp # EXLM Agent [Randy_Martin] [Randy_Martin] -remoteware-srv 3002/tcp # RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use -remoteware-srv 3002/udp # RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use +remoteware-srv 3002/tcp # RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use +remoteware-srv 3002/udp # RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use cgms 3003/tcp # CGMS [Corey_Clinton] [Corey_Clinton] 2011-02-02 cgms 3003/udp # CGMS [Corey_Clinton] [Corey_Clinton] 2011-02-02 csoftragent 3004/tcp # Csoft Agent [Nedelcho_Stanev_2] [Nedelcho_Stanev_2] @@ -6917,7 +6911,7 @@ # a replacement for # "broker_service". # This entry is an alias to "broker-service". This entry is now -broker_service 3014/tcp # Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service +broker_service 3014/tcp # Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service # discovery mechanisms. # Broker Service # @@ -6926,7 +6920,7 @@ # a replacement for # "broker_service". # This entry is an alias to "broker-service". This entry is now -broker_service 3014/udp # Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service +broker_service 3014/udp # Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service # discovery mechanisms. nati-dstp 3015/tcp # NATI DSTP [Paul_Austin] [Paul_Austin] nati-dstp 3015/udp # NATI DSTP [Paul_Austin] [Paul_Austin] @@ -6937,7 +6931,7 @@ # a replacement for # "notify_srvr". # This entry is an alias to "notify-srvr". This entry is now -notify_srvr 3016/tcp # Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service +notify_srvr 3016/tcp # Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service # discovery mechanisms. # Notify Server # @@ -6946,7 +6940,7 @@ # a replacement for # "notify_srvr". # This entry is an alias to "notify-srvr". This entry is now -notify_srvr 3016/udp # Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service +notify_srvr 3016/udp # Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service # discovery mechanisms. # Event Listener # @@ -6955,7 +6949,7 @@ # a replacement for # "event_listener". # This entry is an alias to "event-listener". This entry is now -event_listener 3017/tcp # Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service +event_listener 3017/tcp # Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service # discovery mechanisms. # Event Listener # @@ -6964,7 +6958,7 @@ # a replacement for # "event_listener". # This entry is an alias to "event-listener". This entry is now -event_listener 3017/udp # Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service +event_listener 3017/udp # Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service # discovery mechanisms. # Service Registry # @@ -6973,7 +6967,7 @@ # a replacement for # "srvc_registry". # This entry is an alias to "srvc-registry". This entry is now -srvc_registry 3018/tcp # Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service +srvc_registry 3018/tcp # Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service # discovery mechanisms. # Service Registry # @@ -6982,7 +6976,7 @@ # a replacement for # "srvc_registry". # This entry is an alias to "srvc-registry". This entry is now -srvc_registry 3018/udp # Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service +srvc_registry 3018/udp # Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service # discovery mechanisms. # Resource Manager # @@ -6991,7 +6985,7 @@ # a replacement for # "resource_mgr". # This entry is an alias to "resource-mgr". This entry is now -resource_mgr 3019/tcp # Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service +resource_mgr 3019/tcp # Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service # discovery mechanisms. # Resource Manager # @@ -7000,7 +6994,7 @@ # a replacement for # "resource_mgr". # This entry is an alias to "resource-mgr". This entry is now -resource_mgr 3019/udp # Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service +resource_mgr 3019/udp # Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service # discovery mechanisms. cifs 3020/tcp # CIFS [Paul_Leach] [Paul_Leach] cifs 3020/udp # CIFS [Paul_Leach] [Paul_Leach] @@ -7016,7 +7010,7 @@ # well-formed service name as # a replacement for "nds_sso". # This entry is an alias to "nds-sso". This entry is now -nds_sso 3024/tcp # NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service +nds_sso 3024/tcp # NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service # discovery mechanisms. # NDS_SSO # @@ -7024,7 +7018,7 @@ # well-formed service name as # a replacement for "nds_sso". # This entry is an alias to "nds-sso". This entry is now -nds_sso 3024/udp # NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service +nds_sso 3024/udp # NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service # discovery mechanisms. arepa-raft 3025/tcp # Arepa Raft [Stuart_Schaefer] [Stuart_Schaefer] arepa-raft 3025/udp # Arepa Raft [Stuart_Schaefer] [Stuart_Schaefer] @@ -7037,7 +7031,7 @@ # a replacement for # "LiebDevMgmt_C". # This entry is an alias to "LiebDevMgmt-C". This entry is now -LiebDevMgmt_C 3027/tcp # LiebDevMgmt_C historic, not usable for use with many common service +LiebDevMgmt_C 3027/tcp # LiebDevMgmt_C historic, not usable for use with many common service # discovery mechanisms. # LiebDevMgmt_C # @@ -7046,7 +7040,7 @@ # a replacement for # "LiebDevMgmt_C". # This entry is an alias to "LiebDevMgmt-C". This entry is now -LiebDevMgmt_C 3027/udp # LiebDevMgmt_C historic, not usable for use with many common service +LiebDevMgmt_C 3027/udp # LiebDevMgmt_C historic, not usable for use with many common service # discovery mechanisms. # LiebDevMgmt_DM # @@ -7055,7 +7049,7 @@ # a replacement for # "LiebDevMgmt_DM". # This entry is an alias to "LiebDevMgmt-DM". This entry is now -LiebDevMgmt_DM 3028/tcp # LiebDevMgmt_DM historic, not usable for use with many common service +LiebDevMgmt_DM 3028/tcp # LiebDevMgmt_DM historic, not usable for use with many common service # discovery mechanisms. # LiebDevMgmt_DM # @@ -7064,7 +7058,7 @@ # a replacement for # "LiebDevMgmt_DM". # This entry is an alias to "LiebDevMgmt-DM". This entry is now -LiebDevMgmt_DM 3028/udp # LiebDevMgmt_DM historic, not usable for use with many common service +LiebDevMgmt_DM 3028/udp # LiebDevMgmt_DM historic, not usable for use with many common service # discovery mechanisms. # LiebDevMgmt_A # @@ -7073,7 +7067,7 @@ # a replacement for # "LiebDevMgmt_A". # This entry is an alias to "LiebDevMgmt-A". This entry is now -LiebDevMgmt_A 3029/tcp # LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service +LiebDevMgmt_A 3029/tcp # LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service # discovery mechanisms. # LiebDevMgmt_A # @@ -7082,7 +7076,7 @@ # a replacement for # "LiebDevMgmt_A". # This entry is an alias to "LiebDevMgmt-A". This entry is now -LiebDevMgmt_A 3029/udp # LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service +LiebDevMgmt_A 3029/udp # LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service # discovery mechanisms. arepa-cas 3030/tcp # Arepa Cas [Stuart_Schaefer] [Stuart_Schaefer] arepa-cas 3030/udp # Arepa Cas [Stuart_Schaefer] [Stuart_Schaefer] @@ -7134,7 +7128,7 @@ # well-formed service name as # a replacement for "gds_db". # This entry is an alias to "gds-db". This entry is now -gds_db 3050/tcp # gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service +gds_db 3050/tcp # gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service # discovery mechanisms. # gds_db # @@ -7142,7 +7136,7 @@ # well-formed service name as # a replacement for "gds_db". # This entry is an alias to "gds-db". This entry is now -gds_db 3050/udp # gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service +gds_db 3050/udp # gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service # discovery mechanisms. galaxy-server 3051/tcp # Galaxy Server [Michael_Andre] [Michael_Andre] galaxy-server 3051/udp # Galaxy Server [Michael_Andre] [Michael_Andre] @@ -7209,7 +7203,7 @@ # a replacement for # "stm_pproc". # This entry is an alias to "stm-pproc". This entry is now -stm_pproc 3080/tcp # stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service +stm_pproc 3080/tcp # stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service # discovery mechanisms. # stm_pproc # @@ -7218,7 +7212,7 @@ # a replacement for # "stm_pproc". # This entry is an alias to "stm-pproc". This entry is now -stm_pproc 3080/udp # stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service +stm_pproc 3080/udp # stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service # discovery mechanisms. tl1-lv 3081/tcp # TL1-LV tl1-lv 3081/udp # TL1-LV @@ -7351,11 +7345,11 @@ tarantella 3144/tcp # Tarantella [Roger_Binns] [Roger_Binns] tarantella 3144/udp # Tarantella [Roger_Binns] [Roger_Binns] # UNAUTHORIZED -csi-lfap 3145/tcp # CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port +csi-lfap 3145/tcp # CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port # 3145 by # zftpserver # UNAUTHORIZED -csi-lfap 3145/udp # CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port +csi-lfap 3145/udp # CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port # 3145 by # zftpserver bears-02 3146/tcp # bears-02 [Bruce_McKinnon_2] [Bruce_McKinnon_2] @@ -7695,7 +7689,7 @@ pdrncs 3299/tcp # pdrncs [Paul_Wissenbach] [Paul_Wissenbach] pdrncs 3299/udp # pdrncs [Paul_Wissenbach] [Paul_Wissenbach] # 3300-3301 -# 3300-3301 unassigned Unauthorized +# 3300-3301 unassigned Unauthorized # Use by SAP # R/3 mcs-fastmail 3302/tcp # MCS Fastmail [Patti_Jo_Newsom] [Patti_Jo_Newsom] @@ -7893,7 +7887,7 @@ # a replacement for # "printer_agent". # This entry is an alias to "printer-agent". This entry is now -printer_agent 3396/tcp # Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service +printer_agent 3396/tcp # Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service # discovery mechanisms. # Printer Agent # @@ -7902,7 +7896,7 @@ # a replacement for # "printer_agent". # This entry is an alias to "printer-agent". This entry is now -printer_agent 3396/udp # Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service +printer_agent 3396/udp # Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service # discovery mechanisms. cloanto-lm 3397/tcp # Cloanto License Manager [Takeo_Sato] [Takeo_Sato] 2010-04-30 cloanto-lm 3397/udp # Cloanto License Manager [Takeo_Sato] [Takeo_Sato] 2010-04-30 @@ -8167,9 +8161,9 @@ mc3ss 3521/tcp # Telequip Labs MC3SS [Michael_Sparks] [Michael_Sparks] 2002-06 mc3ss 3521/udp # Telequip Labs MC3SS [Michael_Sparks] [Michael_Sparks] 2002-06 # NFS service for the domain -# nfs-domainroot tcp root, the root of an [IESG] [IETF_Chair] 2012-04-24 [draft-ietf-nfsv4-federated-fs-dns-srv-namespace-13] Defined TXT keys: none +# nfs-domainroot tcp root, the root of an [IESG] [IETF_Chair] 2012-04-24 [RFC6641] Defined TXT keys: None # organization's published -# file name space. +# file namespace. nssocketport 3522/tcp # DO over NSSocketPort [Douglas_Davidson] [Douglas_Davidson] 2002-06 nssocketport 3522/udp # DO over NSSocketPort [Douglas_Davidson] [Douglas_Davidson] 2002-06 odeumservlink 3523/tcp # Odeum Serverlink [Mads_Peter_Back] [Mads_Peter_Back] 2002-06 @@ -8394,8 +8388,8 @@ cs-remote-db 3630/udp # C&S Remote Database Port cs-services 3631/tcp # C&S Web Services Port [Computer_Software_Gm] [Computer_Software_Gm] 2002-10 cs-services 3631/udp # C&S Web Services Port [Computer_Software_Gm] [Computer_Software_Gm] 2002-10 -distcc 3632/tcp # distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None -distcc 3632/udp # distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None +distcc 3632/tcp # distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None +distcc 3632/udp # distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None wacp 3633/tcp # Wyrnix AIS port [Harry_T_Vennik] [Harry_T_Vennik] 2002-11 wacp 3633/udp # Wyrnix AIS port [Harry_T_Vennik] [Harry_T_Vennik] 2002-11 hlibmgr 3634/tcp # hNTSP Library Manager [Kenji_Tetsuyama] [Kenji_Tetsuyama] 2002-11 @@ -8514,10 +8508,10 @@ simple-push 3687/udp # simple-push simple-push-s 3688/tcp # simple-push Secure [C_Enrique_Ortiz] [C_Enrique_Ortiz] 2003-01 simple-push-s 3688/udp # simple-push Secure [C_Enrique_Ortiz] [C_Enrique_Ortiz] 2003-01 -daap 3689/tcp # Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, -# Protocol (iTunes) Database ID, Machine Name, Password -daap 3689/udp # Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, -# Protocol (iTunes) Database ID, Machine Name, Password +daap 3689/tcp # Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, +# Protocol (iTunes) Database ID, Machine Name, Password +daap 3689/udp # Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, +# Protocol (iTunes) Database ID, Machine Name, Password svn 3690/tcp # Subversion [Greg_Hudson_2] [Greg_Hudson_2] 2003-01 svn 3690/udp # Subversion [Greg_Hudson_2] [Greg_Hudson_2] 2003-01 magaya-network 3691/tcp # Magaya Network Port [Jesus_David_Rodrigue] [Jesus_David_Rodrigue] 2003-02 @@ -8816,8 +8810,8 @@ # Service dvapps 3831/udp # Docsvault Application [Ketul_Patel] [Ketul_Patel] 2006-10 # Service -xxnetserver 3832/tcp # xxNETserver [Lawrence_R_Bulduc] [Lawrence_R_Bulduc] 2006-10 -xxnetserver 3832/udp # xxNETserver [Lawrence_R_Bulduc] [Lawrence_R_Bulduc] 2006-10 +xxnetserver 3832/tcp # xxNETserver [XXT_LLC] [Matt_Ferrari] 2006-10 2012-07-12 +xxnetserver 3832/udp # xxNETserver [XXT_LLC] [Matt_Ferrari] 2006-10 2012-07-12 aipn-auth 3833/tcp # AIPN LS Authentication [Qiang_Zhang] [Qiang_Zhang] 2006-10 aipn-auth 3833/udp # AIPN LS Authentication [Qiang_Zhang] [Qiang_Zhang] 2006-10 spectardata 3834/tcp # Spectar Data Stream Service @@ -8888,7 +8882,7 @@ asap-udp 3863/udp # asap udp port [RFC5352] asap-sctp 3863/sctp # asap sctp [RFC5352] asap-tcp-tls 3864/tcp # asap/tls tcp port [RFC5352] -# 3864 udp Reserved This entry has been removed on 2006-06-23. +# 3864 udp Reserved This entry has been removed on 2006-06-23. asap-sctp-tls 3864/sctp # asap-sctp/tls [RFC5352] xpl 3865/tcp # xpl automation protocol [Ian_Lowe] [Ian_Lowe] 2003-08 xpl 3865/udp # xpl automation protocol [Ian_Lowe] [Ian_Lowe] 2003-08 @@ -8920,7 +8914,7 @@ # a replacement for # "dl_agent". # This entry is an alias to "dl-agent". This entry is now -dl_agent 3876/tcp # DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service +dl_agent 3876/tcp # DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service # discovery mechanisms. # DirectoryLockdown Agent # @@ -8929,7 +8923,7 @@ # a replacement for # "dl_agent". # This entry is an alias to "dl-agent". This entry is now -dl_agent 3876/udp # DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service +dl_agent 3876/udp # DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service # discovery mechanisms. xmpcr-interface 3877/tcp # XMPCR Interface Port [Christopher_Carlson] [Christopher_Carlson] 2003-10 xmpcr-interface 3877/udp # XMPCR Interface Port [Christopher_Carlson] [Christopher_Carlson] 2003-10 @@ -8989,7 +8983,7 @@ # well-formed service name as # a replacement for "udt_os". # This entry is an alias to "udt-os". This entry is now -udt_os 3900/tcp # Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service +udt_os 3900/tcp # Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service # discovery mechanisms. # Unidata UDT OS # @@ -8997,7 +8991,7 @@ # well-formed service name as # a replacement for "udt_os". # This entry is an alias to "udt-os". This entry is now -udt_os 3900/udp # Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service +udt_os 3900/udp # Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service # discovery mechanisms. nimsh 3901/tcp # NIM Service Handler [Paul_B_Finley] [Paul_B_Finley] 2003-10 nimsh 3901/udp # NIM Service Handler [Paul_B_Finley] [Paul_B_Finley] 2003-10 @@ -9082,7 +9076,7 @@ # a replacement for # "dbcontrol_agent". # This entry is an alias to "dbcontrol-agent". This entry is -dbcontrol_agent 3938/tcp # Oracle dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service +dbcontrol_agent 3938/tcp # Oracle dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service # discovery mechanisms. # Oracel dbControl Agent po # @@ -9091,7 +9085,7 @@ # a replacement for # "dbcontrol_agent". # This entry is an alias to "dbcontrol-agent". This entry is -dbcontrol_agent 3938/udp # Oracel dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service +dbcontrol_agent 3938/udp # Oracel dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service # discovery mechanisms. aamp 3939/tcp # Anti-virus Application [In_sik_Choi] [In_sik_Choi] 2002-02 # Management Port @@ -9171,13 +9165,13 @@ landmarks 3969/udp # Landmark Messages [Petri_Rauhala] [Petri_Rauhala] 2005-08 # Defined TXT keys: # txtvers -lanrevagent 3970/tcp # LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> +lanrevagent 3970/tcp # LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> # vers=<version of LANrev Agent> # build=<build number of LANrev Agent> # id=<agent identifier> # Defined TXT keys: # txtvers -lanrevagent 3970/udp # LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> +lanrevagent 3970/udp # LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> # vers=<version of LANrev Agent> # build=<build number of LANrev Agent> # id=<agent identifier> @@ -9224,7 +9218,7 @@ # a replacement for # "mapper-ws_ethd". # This entry is an alias to "mapper-ws-ethd". This entry is now -mapper-ws_ethd 3986/tcp # MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service +mapper-ws_ethd 3986/tcp # MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service # discovery mechanisms. # MAPPER workstation server # @@ -9233,7 +9227,7 @@ # a replacement for # "mapper-ws_ethd". # This entry is an alias to "mapper-ws-ethd". This entry is now -mapper-ws_ethd 3986/udp # MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service +mapper-ws_ethd 3986/udp # MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service # discovery mechanisms. centerline 3987/tcp # Centerline [Mark_Simpson] [Mark_Simpson] centerline 3987/udp # Centerline [Mark_Simpson] [Mark_Simpson] @@ -9264,9 +9258,9 @@ # service nvcnet 3999/udp # Norman distributes scanning [Kristian_A_Bognaes] [Kristian_A_Bognaes] 2007-11-06 # service -terabase 4000/tcp # Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ +terabase 4000/tcp # Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ # <www.icq.com> -terabase 4000/udp # Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ +terabase 4000/udp # Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ # <www.icq.com> newoak 4001/tcp # NewOak [Jim_Philippou] [Jim_Philippou] newoak 4001/udp # NewOak [Jim_Philippou] [Jim_Philippou] @@ -9326,8 +9320,8 @@ dtserver-port 4028/udp # DTServer Port [Stephen_Aikins] [Stephen_Aikins] ip-qsig 4029/tcp # IP Q signaling protocol [Toru_Tachibana] [Toru_Tachibana] ip-qsig 4029/udp # IP Q signaling protocol [Toru_Tachibana] [Toru_Tachibana] -jdmn-port 4030/tcp # Accell/JSP Daemon Port [Art_Grand] [Art_Grand] -jdmn-port 4030/udp # Accell/JSP Daemon Port [Art_Grand] [Art_Grand] +jdmn-port 4030/tcp # Accell/JSP Daemon Port [Daegis_Inc] [Chris_Anderson] 2012-07-12 +jdmn-port 4030/udp # Accell/JSP Daemon Port [Daegis_Inc] [Chris_Anderson] 2012-07-12 suucp 4031/tcp # UUCP over SSL [Harald_Welte] [Harald_Welte] suucp 4031/udp # UUCP over SSL [Harald_Welte] [Harald_Welte] vrts-auth-port 4032/tcp # VERITAS Authorization [Stefan_Winkel] [Stefan_Winkel] @@ -9361,11 +9355,11 @@ ltp 4044/tcp # Location Tracking Protocol ltp 4044/udp # Location Tracking Protocol # UNAUTHORIZED -npp 4045/tcp # Network Paging Protocol USE: Port +npp 4045/tcp # Network Paging Protocol USE: Port # 4045 used by # NFS # UNAUTHORIZED -npp 4045/udp # Network Paging Protocol USE: Port +npp 4045/udp # Network Paging Protocol USE: Port # 4045 used by # NFS acp-proto 4046/tcp # Accounting Protocol @@ -9410,8 +9404,8 @@ # well-formed service name as # a replacement for # "dsmeter_iatc". -# DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now -dsmeter_iatc 4060/tcp # Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service +# DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now +dsmeter_iatc 4060/tcp # Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service # discovery mechanisms. # DSMETER Inter-Agent Transfer # Channel @@ -9420,8 +9414,8 @@ # well-formed service name as # a replacement for # "dsmeter_iatc". -# DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now -dsmeter_iatc 4060/udp # Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service +# DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now +dsmeter_iatc 4060/udp # Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service # discovery mechanisms. ice-location 4061/tcp # Ice Location Service (TCP) ice-location 4061/udp # Ice Location Service (TCP) @@ -9442,7 +9436,7 @@ # a replacement for # "avanti_cdp". # This entry is an alias to "avanti-cdp". This entry is now -avanti_cdp 4065/tcp # Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service +avanti_cdp 4065/tcp # Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service # discovery mechanisms. # Avanti Common Data # @@ -9451,7 +9445,7 @@ # a replacement for # "avanti_cdp". # This entry is an alias to "avanti-cdp". This entry is now -avanti_cdp 4065/udp # Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service +avanti_cdp 4065/udp # Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service # discovery mechanisms. pmas 4066/tcp # Performance Measurement and [Zenon_Fortuna] [Zenon_Fortuna] 2007-02 # Analysis @@ -9623,7 +9617,7 @@ # a replacement for # "nuts_dem". # This entry is an alias to "nuts-dem". This entry is now -nuts_dem 4132/tcp # NUTS Daemon historic, not usable for use with many common service +nuts_dem 4132/tcp # NUTS Daemon historic, not usable for use with many common service # discovery mechanisms. # NUTS Daemon # @@ -9632,7 +9626,7 @@ # a replacement for # "nuts_dem". # This entry is an alias to "nuts-dem". This entry is now -nuts_dem 4132/udp # NUTS Daemon historic, not usable for use with many common service +nuts_dem 4132/udp # NUTS Daemon historic, not usable for use with many common service # discovery mechanisms. # NUTS Bootp Server # @@ -9641,7 +9635,7 @@ # a replacement for # "nuts_bootp". # This entry is an alias to "nuts-bootp". This entry is now -nuts_bootp 4133/tcp # NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service +nuts_bootp 4133/tcp # NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service # discovery mechanisms. # NUTS Bootp Server # @@ -9650,7 +9644,7 @@ # a replacement for # "nuts_bootp". # This entry is an alias to "nuts-bootp". This entry is now -nuts_bootp 4133/udp # NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service +nuts_bootp 4133/udp # NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service # discovery mechanisms. nifty-hmi 4134/tcp # NIFTY-Serve HMI protocol [Ryuichi_Suzuki] [Ryuichi_Suzuki] nifty-hmi 4134/udp # NIFTY-Serve HMI protocol [Ryuichi_Suzuki] [Ryuichi_Suzuki] @@ -9677,8 +9671,8 @@ # well-formed service name as # a replacement for # "cedros_fds". -# Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now -cedros_fds 4140/tcp # System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service +# Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now +cedros_fds 4140/tcp # System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service # discovery mechanisms. # Cedros Fraud Detection # System @@ -9687,8 +9681,8 @@ # well-formed service name as # a replacement for # "cedros_fds". -# Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now -cedros_fds 4140/udp # System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service +# Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now +cedros_fds 4140/udp # System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service # discovery mechanisms. oirtgsvc 4141/tcp # Workflow Server oirtgsvc 4141/udp # Workflow Server @@ -9696,7 +9690,7 @@ oidocsvc 4142/udp # Document Server oidsr 4143/tcp # Document Replication [Norman_Brie] [Norman_Brie] oidsr 4143/udp # Document Replication [Norman_Brie] [Norman_Brie] -# 4144 Unassigned Compuserve (unoffically) is using port 4144 +# 4144 Unassigned Compuserve (unoffically) is using port 4144 vvr-control 4145/tcp # VVR Control [Ming_Xu] [Ming_Xu] vvr-control 4145/udp # VVR Control [Ming_Xu] [Ming_Xu] tgcconnect 4146/tcp # TGCConnect Beacon [Brian_Becker] [Brian_Becker] 2006-10 @@ -9718,7 +9712,7 @@ # a replacement for # "menandmice_noh". # This entry is an alias to "menandmice-noh". This entry is now -menandmice_noh 4151/tcp # Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service +menandmice_noh 4151/tcp # Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service # discovery mechanisms. # Men & Mice Remote Control # @@ -9727,7 +9721,7 @@ # a replacement for # "menandmice_noh". # This entry is an alias to "menandmice-noh". This entry is now -menandmice_noh 4151/udp # Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service +menandmice_noh 4151/udp # Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service # discovery mechanisms. # iDigTech Multiplex # @@ -9736,7 +9730,7 @@ # a replacement for # "idig_mux". # This entry is an alias to "idig-mux". This entry is now -idig_mux 4152/tcp # iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service +idig_mux 4152/tcp # iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service # discovery mechanisms. # iDigTech Multiplex # @@ -9745,7 +9739,7 @@ # a replacement for # "idig_mux". # This entry is an alias to "idig-mux". This entry is now -idig_mux 4152/udp # iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service +idig_mux 4152/udp # iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service # discovery mechanisms. mbl-battd 4153/tcp # MBL Remote Battery [Claudio_Procida] [Claudio_Procida] 2007-05 # Monitoring @@ -9832,8 +9826,8 @@ # well-formed service name as # a replacement for # "universe_suite". -# UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now -universe_suite 4184/tcp # SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service +# UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now +universe_suite 4184/tcp # SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service # discovery mechanisms. # UNIVERSE SUITE MESSAGE # SERVICE @@ -9842,8 +9836,8 @@ # well-formed service name as # a replacement for # "universe_suite". -# UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now -universe_suite 4184/udp # SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service +# UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now +universe_suite 4184/udp # SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service # discovery mechanisms. wcpp 4185/tcp # Woven Control Plane Protocol [Christopher_LILJENST] [Christopher_LILJENST] 2008-04-14 wcpp 4185/udp # Woven Control Plane Protocol [Christopher_LILJENST] [Christopher_LILJENST] 2008-04-14 @@ -9856,7 +9850,7 @@ # a replacement for # "csc_proxy". # This entry is an alias to "csc-proxy". This entry is now -csc_proxy 4187/tcp # Cascade Proxy [Matt_Craighead] [Matt_Craighead] 2008-09-11 historic, not usable for use with many common service +csc_proxy 4187/tcp # Cascade Proxy [Matt_Craighead] [Matt_Craighead] 2008-09-11 historic, not usable for use with many common service # discovery mechanisms. # 4187 udp Reserved vatata 4188/tcp # Vatata Peer to Peer Protocol [Song_Jian] [Song_Jian] 2008-09-15 @@ -9887,8 +9881,8 @@ # Protocol srcp 4303/udp # Simple Railroad Command [Matthias_Trute] [Matthias_Trute] 2007-01 # Protocol -owserver 4304/tcp # One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers -owserver 4304/udp # One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers +owserver 4304/tcp # One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers +owserver 4304/udp # One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers batman 4305/tcp # better approach to mobile [Simon_Wunderlich] [Simon_Wunderlich] 2007-08-30 # ad-hoc networking batman 4305/udp # better approach to mobile [Simon_Wunderlich] [Simon_Wunderlich] 2007-08-30 @@ -9991,8 +9985,8 @@ # well-formed service name as # a replacement for # "matrix_vnet". -# Matrix VNet Communication This entry is an alias to "matrix-vnet". This entry is now -matrix_vnet 4360/tcp # Protocol [Rehan_Mahmood] [Rehan_Mahmood] 2009-03-18 historic, not usable for use with many common service +# Matrix VNet Communication This entry is an alias to "matrix-vnet". This entry is now +matrix_vnet 4360/tcp # Protocol [Rehan_Mahmood] [Rehan_Mahmood] 2009-03-18 historic, not usable for use with many common service # discovery mechanisms. # 4360 udp Reserved # 4361 tcp Reserved @@ -10013,7 +10007,7 @@ # a replacement for # "elpro_tunnel". # This entry is an alias to "elpro-tunnel". This entry is now -elpro_tunnel 4370/tcp # ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service +elpro_tunnel 4370/tcp # ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service # discovery mechanisms. # ELPRO V2 Protocol Tunnel # @@ -10022,11 +10016,11 @@ # a replacement for # "elpro_tunnel". # This entry is an alias to "elpro-tunnel". This entry is now -elpro_tunnel 4370/udp # ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service +elpro_tunnel 4370/udp # ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service # discovery mechanisms. -l2c-control 4371/tcp # LAN2CAN Control [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 +l2c-control 4371/tcp # LAN2CAN Control [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 l2c-disc 4371/udp # LAN2CAN Discovery [Phil_Tolson] [Phil_Tolson] 2010-01-21 -l2c-data 4372/tcp # LAN2CAN Data [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 +l2c-data 4372/tcp # LAN2CAN Data [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 l2c-data 4372/udp # LAN2CAN Data [Phil_Tolson] [Phil_Tolson] 2010-01-21 remctl 4373/tcp # Remote Authenticated Command [Russ_Allbery] [Russ_Allbery] 2007-08-30 # Service @@ -10108,7 +10102,7 @@ # 4409 udp Reserved itwo-server 4410/tcp # RIB iTWO Application Server [Kristean_Heisler_2] [Kristean_Heisler_2] 2009-12-16 # 4410 udp Reserved -found 4411/tcp # Found Messaging Protocol [Found_Software] [John_Mitchell] 2012-04-11 Defined TXT keys: id, key +found 4411/tcp # Found Messaging Protocol [Found_Software] [John_Mitchell] 2012-04-11 Defined TXT keys: id, key # 4411 udp Reserved # 4412-4424 Unassigned netrockey6 4425/tcp # NetROCKEY6 SMART Plus [Feitian_Technologies] [Feitian_Technologies] 2010-09-15 @@ -10141,22 +10135,22 @@ pharos 4443/udp # Pharos [TeleConsult] [TeleConsult] # krb524 # assigned the -krb524 4444/tcp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used +krb524 4444/tcp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used # it without an # assignment # krb524 # assigned the -krb524 4444/udp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used +krb524 4444/udp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used # it without an # assignment # krb524 # assigned the -nv-video 4444/tcp # NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used +nv-video 4444/tcp # NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used # it without an # assignment # krb524 # assigned the -nv-video 4444/udp # NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used +nv-video 4444/udp # NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used # it without an # assignment upnotifyp 4445/tcp # UPNOTIFYP [Mark_Fox] [Mark_Fox] @@ -10211,7 +10205,7 @@ # 4489-4499 Unassigned ipsec-nat-t 4500/tcp # IPsec NAT-Traversal [RFC3947] ipsec-nat-t 4500/udp # IPsec NAT-Traversal [RFC3947] -# 4501 Unassigned [IANA] [IANA] De-registered 08 June 2001 +# 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 ehs 4535/tcp # Event Heap Server @@ -10275,7 +10269,7 @@ # domain any DNS domain name or IP address # extension alphanumeric, additionally '*', '#', '_', '+', '-' # context alphanumeric, additionally '_', '+', '-' -iax 4569/tcp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 +iax 4569/tcp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 # welcome alphanumeric, additionally '*', '#', '_', '+', '-' # voicemail alphanumeric, additionally '*', '#', '_', '+', '-' # reception alphanumeric, additionally '*', '#', '_', '+', '-' @@ -10290,7 +10284,7 @@ # domain any DNS domain name or IP address # extension alphanumeric, additionally '*', '#', '_', '+', '-' # context alphanumeric, additionally '_', '+', '-' -iax 4569/udp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 +iax 4569/udp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 # welcome alphanumeric, additionally '*', '#', '_', '+', '-' # voicemail alphanumeric, additionally '*', '#', '_', '+', '-' # reception alphanumeric, additionally '*', '#', '_', '+', '-' @@ -10496,8 +10490,8 @@ sia-ctrl-plane 4787/tcp # Architecture (SIA) [Shree_Murthy] [Shree_Murthy] 2009-10-29 # Control-Plane # 4787 udp Reserved -# eXtensible Messaging Client Defined TXT keys: txtvers=1 (as described in the draft) -xmcp 4788/tcp # Protocol [Cisco] [Glenn_Matthews] 2011-05-23 2011-10-25 protovers=<comma-separated list of major/minor versions +# eXtensible Messaging Client Defined TXT keys: txtvers=1 (as described in the draft) +xmcp 4788/tcp # Protocol [Cisco] [Glenn_Matthews] 2011-05-23 2011-10-25 protovers=<comma-separated list of major/minor versions # supported> (examples: "protovers=1.0" "protovers=1.1,2.0" # 4788 udp Reserved # 4789-4799 Unassigned @@ -10553,7 +10547,7 @@ # a replacement for # "contamac_icm". # This entry is an alias to "contamac-icm". This entry is now -contamac_icm 4846/tcp # Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service +contamac_icm 4846/tcp # Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service # discovery mechanisms. # Contamac ICM Service # @@ -10562,7 +10556,7 @@ # a replacement for # "contamac_icm". # This entry is an alias to "contamac-icm". This entry is now -contamac_icm 4846/udp # Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service +contamac_icm 4846/udp # Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service # discovery mechanisms. wfc 4847/tcp # Web Fresh Communication [Jonathan_Bastnagel] [Jonathan_Bastnagel] 2007-09-17 wfc 4847/udp # Web Fresh Communication [Jonathan_Bastnagel] [Jonathan_Bastnagel] 2007-09-17 @@ -10631,8 +10625,8 @@ # well-formed service name as # a replacement for # "flr_agent". -# FileLocator Remote Search This entry is an alias to "flr-agent". This entry is now -flr_agent 4901/tcp # Agent [David_Vest] [David_Vest] 2008-11-19 historic, not usable for use with many common service +# FileLocator Remote Search This entry is an alias to "flr-agent". This entry is now +flr_agent 4901/tcp # Agent [David_Vest] [David_Vest] 2008-11-19 historic, not usable for use with many common service # discovery mechanisms. # 4901 udp Reserved magiccontrol 4902/tcp # magicCONROL RF and Data [Andreas_Spalenski] [Andreas_Spalenski] 2008-11-24 @@ -10671,7 +10665,7 @@ dbsyncarbiter 4953/tcp # Synchronization Arbiter [Dave_Neudoerffer_2] [Dave_Neudoerffer_2] 2009-11-18 # 4953 udp Reserved # UNAUTHORIZED -# 4954-4968 Unassigned USE: port +# 4954-4968 Unassigned USE: port # 4967 by # Rockwell FTA ccss-qmm 4969/tcp # CCSS QMessageMonitor @@ -10694,9 +10688,9 @@ smar-se-port2 4988/udp # SMAR Ethernet Port 2 [Delcio_Prizon] [Delcio_Prizon] parallel 4989/tcp # Parallel for GAUSS (tm) [Matthew_Ford] [Matthew_Ford] 2003-03 parallel 4989/udp # Parallel for GAUSS (tm) [Matthew_Ford] [Matthew_Ford] 2003-03 -busycal 4990/tcp # BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary +busycal 4990/tcp # BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary # Protocol -busycal 4990/udp # BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary +busycal 4990/udp # BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary # Protocol vrt 4991/tcp # VITA Radio Transport [Sam_Bretheim] [Sam_Bretheim] 2009-01-08 vrt 4991/udp # VITA Radio Transport [Sam_Bretheim] [Sam_Bretheim] 2009-01-08 @@ -10859,9 +10853,9 @@ qcp 5082/udp # Qpur Communication Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 qfp 5083/tcp # Qpur File Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 qfp 5083/udp # Qpur File Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 -llrp 5084/tcp # EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol +llrp 5084/tcp # EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol # Protocol -llrp 5084/udp # EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol +llrp 5084/udp # EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol # Protocol encrypted-llrp 5085/tcp # EPCglobal Encrypted LLRP [Margaret_Wasserman] [Margaret_Wasserman] 2006-11 encrypted-llrp 5085/udp # EPCglobal Encrypted LLRP [Margaret_Wasserman] [Margaret_Wasserman] 2006-11 @@ -10912,7 +10906,7 @@ ppactivation 5134/tcp # PP ActivationServer [Ian_Bradley] [Ian_Bradley] 2009-10-14 # 5134 udp Reserved # Defined TXT keys: -erp-scale 5135/tcp # ERP-Scale [Ian_Bradley] [Ian_Bradley] 2009-10-14 RFC=<RFC destination and status> +erp-scale 5135/tcp # ERP-Scale [Ian_Bradley] [Ian_Bradley] 2009-10-14 RFC=<RFC destination and status> # Device=<Scale device and status> # 5135 udp Reserved # 5136 tcp Reserved @@ -10927,7 +10921,7 @@ # a replacement for # "rmonitor_secure". # This entry is an alias to "rmonitor-secure". This entry is -rmonitor_secure 5145/tcp # RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service +rmonitor_secure 5145/tcp # RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service # discovery mechanisms. # RMONITOR SECURE # @@ -10936,7 +10930,7 @@ # a replacement for # "rmonitor_secure". # This entry is an alias to "rmonitor-secure". This entry is -rmonitor_secure 5145/udp # RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service +rmonitor_secure 5145/udp # RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service # discovery mechanisms. social-alarm 5146/tcp # Social Alarm Service [Shaun_Byrne] [Shaun_Byrne] 2009-08-18 # 5146 udp Reserved @@ -10952,7 +10946,7 @@ # a replacement for # "esri_sde". # This entry is an alias to "esri-sde". This entry is now -esri_sde 5151/tcp # ESRI SDE Instance [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service +esri_sde 5151/tcp # ESRI SDE Instance [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service # discovery mechanisms. # ESRI SDE Remote Start # @@ -10961,7 +10955,7 @@ # a replacement for # "esri_sde". # This entry is an alias to "esri-sde". This entry is now -esri_sde 5151/udp # ESRI SDE Remote Start [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service +esri_sde 5151/udp # ESRI SDE Remote Start [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service # discovery mechanisms. sde-discovery 5152/tcp # ESRI SDE Instance Discovery [Peter_Aronson] [Peter_Aronson] sde-discovery 5152/udp # ESRI SDE Instance Discovery [Peter_Aronson] [Peter_Aronson] @@ -10995,7 +10989,7 @@ # a replacement for # "ife_icorp". # This entry is an alias to "ife-icorp". This entry is now -ife_icorp 5165/tcp # ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service +ife_icorp 5165/tcp # ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service # discovery mechanisms. # ife_1corp # @@ -11004,7 +10998,7 @@ # a replacement for # "ife_icorp". # This entry is an alias to "ife-icorp". This entry is now -ife_icorp 5165/udp # ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service +ife_icorp 5165/udp # ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service # discovery mechanisms. winpcs 5166/tcp # WinPCS Service Connection [Complan_Network_AS] [Complan_Network_AS] 2006-02 winpcs 5166/udp # WinPCS Service Connection [Complan_Network_AS] [Complan_Network_AS] 2006-02 @@ -11023,7 +11017,18 @@ aol-3 5193/udp # AmericaOnline3 [Bruce_Mackey] [Bruce_Mackey] cpscomm 5194/tcp # CipherPoint Config Service [CipherPoint] [CipherPoint] 2010-03-03 # 5194 udp Reserved -# 5195-5199 Unassigned +# The protocol is used by a +# license server and client +ampl-lic 5195/tcp # programs to control use of [AMPL_Optimization] [David_M_Gay] 2012-05-25 +# program licenses that float +# to networked machines +# 5195 udp Reserved +# The protocol is used by two +ampl-tableproxy 5196/tcp # programs that exchange [AMPL_Optimization] [David_M_Gay] 2012-05-25 +# "table" data used in the +# AMPL modeling language +# 5196 udp Reserved +# 5197-5199 Unassigned targus-getdata 5200/tcp # TARGUS GetData [John_Keaveney] [John_Keaveney] targus-getdata 5200/udp # TARGUS GetData [John_Keaveney] [John_Keaveney] targus-getdata1 5201/tcp # TARGUS GetData 1 [John_Keaveney] [John_Keaveney] @@ -11114,9 +11119,9 @@ transmit-port 5282/tcp # Marimba Transmitter Port [Johan_Eriksson] [Johan_Eriksson] 2002-04 transmit-port 5282/udp # Marimba Transmitter Port [Johan_Eriksson] [Johan_Eriksson] 2002-04 # 5283-5297 Unassigned -presence 5298/tcp # XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See +presence 5298/tcp # XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See # http://www.xmpp.org/registrar/linklocal.html -presence 5298/udp # XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See +presence 5298/udp # XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See # http://www.xmpp.org/registrar/linklocal.html nlg-data 5299/tcp # NLG Data Service [Andy_Shellam] [Andy_Shellam] 2008-02-19 nlg-data 5299/udp # NLG Data Service [Andy_Shellam] [Andy_Shellam] 2008-02-19 @@ -11313,7 +11318,7 @@ # 5444 by # as-mgtc, # AS400 ISeries -# 5444 Unassigned (IBM), w.32 +# 5444 Unassigned (IBM), w.32 # zotob worm # (None), # 'ppas' @@ -11369,7 +11374,7 @@ # USE: port # 5555 by # Intermec -personal-agent 5555/tcp # Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; +personal-agent 5555/tcp # Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; # UNAUTHORIZED # USE: Port # 5555 also @@ -11379,7 +11384,7 @@ # USE: port # 5555 by # Intermec -personal-agent 5555/udp # Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; +personal-agent 5555/udp # Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; # UNAUTHORIZED # USE: Port # 5555 also @@ -11400,7 +11405,12 @@ # Multicast sdt 5568/udp # Session Data Transport [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05 # Multicast -# 5569-5572 Unassigned +# PLASA E1.33, Remote Device +rdmnet-ctrl 5569/tcp # Management (RDM) controller [PLASA] [Simon_Newton] 2012-06-01 +# status notifications +rdmnet-device 5569/udp # PLASA E1.33, Remote Device [PLASA] [Simon_Newton] 2012-06-01 +# Management (RDM) messages +# 5570-5572 Unassigned sdmmp 5573/tcp # SAS Domain Management [Ron_Zuckerman] [Ron_Zuckerman] 2007-08-30 # Messaging Protocol sdmmp 5573/udp # SAS Domain Management [Ron_Zuckerman] [Ron_Zuckerman] 2007-08-30 @@ -11494,7 +11504,7 @@ vfmobile 5646/tcp # Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder] 2011-11-03 # 5646 udp Reserved # UNAUTHORIZED -# 5647-5670 Unassigned USE: Port +# 5647-5670 Unassigned USE: Port # 5666 used by # SAIC NRPE amqps 5671/tcp # amqp protocol over TLS/SSL [Ted_Ross_2] [Ted_Ross_2] 2008-03-26 @@ -11537,7 +11547,7 @@ qmvideo 5689/udp # QM video network management [Jamie_Lokier] [Jamie_Lokier] 2006-05 # protocol # 5690-5692 Unassigned -rbsystem 5693/tcp # Robert Bosch Data Transfer [Robert_Bosch_GmbH] [Klaus_Warth] 2011-08-01 +rbsystem 5693/tcp # Robert Bosch Data Transfer [Robert_Bosch_GmbH] [Klaus_Warth] 2011-08-01 2012-07-17 # 5693 udp Reserved # 5694-5695 Unassigned kmip 5696/tcp # Key Management [OASIS_KMIP_Technical_Committee] [Robin_Cover] 2011-07-25 @@ -11679,7 +11689,11 @@ # 5860-5862 Unassigned 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-5882 Unassigned +# 5864-5867 Unassigned +diameters 5868/tcp # Diameter over TLS/TCP [IESG] [IETF_Chair] [RFC-ietf-dime-rfc3588bis-34] +# 5868 udp Reserved +diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC-ietf-dime-rfc3588bis-34] +# 5869-5882 Unassigned jute 5883/tcp # Javascript Unit Test [Mark_Ethan_Trostler] [Mark_Ethan_Trostler] 2011-11-23 # Environment # 5884-5899 Unassigned @@ -11892,7 +11906,11 @@ # X-Formation lm-x 6200/udp # LM-X License Manager by [Henrik_Goldman] [Henrik_Goldman] 2006-10 # X-Formation -# 6201-6221 Unassigned +# 6201 tcp Reserved +# Management of service nodes +thermo-calc 6201/udp # in a processing grid for [Thermo-Calc_Software] [Thomas_Revesz] 2012-06-28 +# thermodynamic calculations +# 6202-6221 Unassigned radmind 6222/tcp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 radmind 6222/udp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 # 6223-6240 Unassigned @@ -11936,7 +11954,7 @@ # a replacement for # "bmc_ctd_ldap". # This entry is an alias to "bmc-ctd-ldap". This entry is now -bmc_ctd_ldap 6301/tcp # BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service +bmc_ctd_ldap 6301/tcp # BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service # discovery mechanisms. # BMC CONTROL-D LDAP SERVER # @@ -11945,7 +11963,7 @@ # a replacement for # "bmc_ctd_ldap". # This entry is an alias to "bmc-ctd-ldap". This entry is now -bmc_ctd_ldap 6301/udp # BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service +bmc_ctd_ldap 6301/udp # BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service # discovery mechanisms. # 6302-6305 Unassigned ufmp 6306/tcp # Unified Fabric Management [Albert_Berlovitch] [Albert_Berlovitch] 2009-12-17 @@ -11977,7 +11995,10 @@ hrd-ncs 6324/tcp # HR Device Network [Hall_Research] [Vishal_Dharmadhikari] 2011-11-29 # Configuration Service hrd-ns-disc 6324/udp # HR Device Network service [Hall_Research] [Vishal_Dharmadhikari] 2011-11-29 -# 6325-6342 Unassigned +dt-mgmtsvc 6325/tcp # Double-Take Management [Vision_Solutions] [James_Wilkinson2] 2012-06-06 +# Service +# 6325 udp Reserved +# 6326-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 @@ -12055,7 +12076,7 @@ # a replacement for # "sge_qmaster". # This entry is an alias to "sge-qmaster". This entry is now -sge_qmaster 6444/tcp # Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service +sge_qmaster 6444/tcp # Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Grid Engine Qmaster Service # @@ -12064,7 +12085,7 @@ # a replacement for # "sge_qmaster". # This entry is an alias to "sge-qmaster". This entry is now -sge_qmaster 6444/udp # Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service +sge_qmaster 6444/udp # Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Grid Engine Execution # Service @@ -12073,8 +12094,8 @@ # well-formed service name as # a replacement for # "sge_execd". -# Grid Engine Execution This entry is an alias to "sge-execd". This entry is now -sge_execd 6445/tcp # Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service +# Grid Engine Execution This entry is an alias to "sge-execd". This entry is now +sge_execd 6445/tcp # Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Grid Engine Execution # Service @@ -12083,8 +12104,8 @@ # well-formed service name as # a replacement for # "sge_execd". -# Grid Engine Execution This entry is an alias to "sge-execd". This entry is now -sge_execd 6445/udp # Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service +# Grid Engine Execution This entry is an alias to "sge-execd". This entry is now +sge_execd 6445/udp # Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service # discovery mechanisms. mysql-proxy 6446/tcp # MySQL Proxy [Kay_Roepke] [Kay_Roepke] 2009-04-22 mysql-proxy 6446/udp # MySQL Proxy [Kay_Roepke] [Kay_Roepke] 2009-04-22 @@ -12143,7 +12164,7 @@ # a replacement for # "boks_servc". # This entry is an alias to "boks-servc". This entry is now -boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Servc # @@ -12152,7 +12173,7 @@ # a replacement for # "boks_servc". # This entry is an alias to "boks-servc". This entry is now -boks_servc 6501/udp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_servc 6501/udp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Servm # @@ -12161,7 +12182,7 @@ # a replacement for # "boks_servm". # This entry is an alias to "boks-servm". This entry is now -boks_servm 6502/tcp # BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_servm 6502/tcp # BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Servm # @@ -12170,7 +12191,7 @@ # a replacement for # "boks_servm". # This entry is an alias to "boks-servm". This entry is now -boks_servm 6502/udp # BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_servm 6502/udp # BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Clntd # @@ -12179,7 +12200,7 @@ # a replacement for # "boks_clntd". # This entry is an alias to "boks-clntd". This entry is now -boks_clntd 6503/tcp # BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_clntd 6503/tcp # BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Clntd # @@ -12188,7 +12209,7 @@ # a replacement for # "boks_clntd". # This entry is an alias to "boks-clntd". This entry is now -boks_clntd 6503/udp # BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +boks_clntd 6503/udp # BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # 6504 Unassigned # BoKS Admin Private Port @@ -12198,7 +12219,7 @@ # a replacement for # "badm_priv". # This entry is an alias to "badm-priv". This entry is now -badm_priv 6505/tcp # BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +badm_priv 6505/tcp # BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Admin Private Port # @@ -12207,7 +12228,7 @@ # a replacement for # "badm_priv". # This entry is an alias to "badm-priv". This entry is now -badm_priv 6505/udp # BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +badm_priv 6505/udp # BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Admin Public Port # @@ -12216,7 +12237,7 @@ # a replacement for # "badm_pub". # This entry is an alias to "badm-pub". This entry is now -badm_pub 6506/tcp # BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +badm_pub 6506/tcp # BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Admin Public Port # @@ -12225,7 +12246,7 @@ # a replacement for # "badm_pub". # This entry is an alias to "badm-pub". This entry is now -badm_pub 6506/udp # BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +badm_pub 6506/udp # BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Dir Server, Private # Port @@ -12234,8 +12255,8 @@ # well-formed service name as # a replacement for # "bdir_priv". -# BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now -bdir_priv 6507/tcp # Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +# BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now +bdir_priv 6507/tcp # Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Dir Server, Private # Port @@ -12244,8 +12265,8 @@ # well-formed service name as # a replacement for # "bdir_priv". -# BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now -bdir_priv 6507/udp # Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +# BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now +bdir_priv 6507/udp # Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Dir Server, Public Port # @@ -12254,7 +12275,7 @@ # a replacement for # "bdir_pub". # This entry is an alias to "bdir-pub". This entry is now -bdir_pub 6508/tcp # BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +bdir_pub 6508/tcp # BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. # BoKS Dir Server, Public Port # @@ -12263,7 +12284,7 @@ # a replacement for # "bdir_pub". # This entry is an alias to "bdir-pub". This entry is now -bdir_pub 6508/udp # BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service +bdir_pub 6508/udp # BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service # discovery mechanisms. mgcs-mfp-port 6509/tcp # MGCS-MFP Port [Minoru_Ozaki] [Minoru_Ozaki] mgcs-mfp-port 6509/udp # MGCS-MFP Port [Minoru_Ozaki] [Minoru_Ozaki] @@ -12294,12 +12315,12 @@ sum 6551/tcp # Software Update Manager [Jan_Dirven] [Jan_Dirven] 2007-12-13 sum 6551/udp # Software Update Manager [Jan_Dirven] [Jan_Dirven] 2007-12-13 # 6552-6557 Unassigned -xdsxdm 6558/tcp # [Brian_Tackett] [Brian_Tackett] possible contact -xdsxdm 6558/udp # [Brian_Tackett] [Brian_Tackett] possible contact +xdsxdm 6558/tcp # [Brian_Tackett] [Brian_Tackett] possible contact +xdsxdm 6558/udp # [Brian_Tackett] [Brian_Tackett] possible contact # 6559-6565 Unassigned sane-port 6566/tcp # SANE Control Port [Henning_Meier_Geinit] [Henning_Meier_Geinit] 2002-10 sane-port 6566/udp # SANE Control Port [Henning_Meier_Geinit] [Henning_Meier_Geinit] 2002-10 -# 6567 Reserved 2007-01 2011-08-26 This entry has been removed on 2011-08-26. +# 6567 Reserved 2007-01 2011-08-26 This entry has been removed on 2011-08-26. # CanIt Storage Manager # canit-store 6568/tcp # IANA assigned this [David_F_Skoll] [David_F_Skoll] 2009-04-22 @@ -12307,7 +12328,7 @@ # a replacement for # "canit_store". # This entry is an alias to "canit-store". This entry is now -canit_store 6568/tcp # CanIt Storage Manager [David_F_Skoll] [David_F_Skoll] 2009-04-22 historic, not usable for use with many common service +canit_store 6568/tcp # CanIt Storage Manager [David_F_Skoll] [David_F_Skoll] 2009-04-22 historic, not usable for use with many common service # discovery mechanisms. rp-reputation 6568/udp # Roaring Penguin IP Address [David_F_Skoll] [David_F_Skoll] 2010-02-05 # Reputation Collection @@ -12325,7 +12346,7 @@ # 6584-6587 Unassigned # Unofficial # use of port -# 6588 Unassigned 6588 by +# 6588 Unassigned 6588 by # AnalogX and # Microsoft # 6589-6599 Unassigned @@ -12363,7 +12384,9 @@ # 6631 Unassigned 2004-05-28 mxodbc-connect 6632/tcp # eGenix mxODBC Connect [Marc_Andre_Lemburg] [Marc_Andre_Lemburg] 2009-11-13 # 6632 udp Reserved -# 6633-6654 Unassigned +# 6633 tcp Reserved +cisco-vpath-tun 6633/udp # Cisco vPath Services Overlay [Cisco2] [Surendra_Kumar] 2012-06-11 +# 6634-6654 Unassigned pcs-sf-ui-man 6655/tcp # PC SOFT - Software factory [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 # UI/manager # 6655 udp Reserved @@ -12388,7 +12411,7 @@ # a replacement for # "vision_server". # This entry is an alias to "vision-server". This entry is now -vision_server 6672/tcp # vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service +vision_server 6672/tcp # vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service # discovery mechanisms. # vision_server # @@ -12397,7 +12420,7 @@ # a replacement for # "vision_server". # This entry is an alias to "vision-server". This entry is now -vision_server 6672/udp # vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service +vision_server 6672/udp # vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service # discovery mechanisms. # vision_elmd # @@ -12406,7 +12429,7 @@ # a replacement for # "vision_elmd". # This entry is an alias to "vision-elmd". This entry is now -vision_elmd 6673/tcp # vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service +vision_elmd 6673/tcp # vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service # discovery mechanisms. # vision_elmd # @@ -12415,7 +12438,7 @@ # a replacement for # "vision_elmd". # This entry is an alias to "vision-elmd". This entry is now -vision_elmd 6673/udp # vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service +vision_elmd 6673/udp # vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service # discovery mechanisms. # 6674-6677 Unassigned vfbp 6678/tcp # Viscount Freedom Bridge [Chris_MacDonald] [Chris_MacDonald] 2011-03-16 @@ -12579,19 +12602,19 @@ ups-onlinet 7010/udp # onlinet uninterruptable [Jim_Thompson] [Jim_Thompson] # power supplies # Unauthorized -talon-disc 7011/tcp # Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG +talon-disc 7011/tcp # Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG # OpenAFS+OSD # system # Unauthorized -talon-disc 7011/udp # Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG +talon-disc 7011/udp # Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG # OpenAFS+OSD # system # Unauthorized -talon-engine 7012/tcp # Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG +talon-engine 7012/tcp # Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG # OpenAFS+OSD # system # Unauthorized -talon-engine 7012/udp # Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG +talon-engine 7012/udp # Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG # OpenAFS+OSD # system microtalon-dis 7013/tcp # Microtalon Discovery [Jim_Thompson] [Jim_Thompson] @@ -12707,7 +12730,7 @@ citrixuppg 7229/tcp # Citrix UPP Gateway [Gary_Barton] [Gary_Barton] 2011-02-24 # 7229 udp Reserved # 7230-7235 Unassigned -display 7236/tcp # Wi-Fi Alliance Wi-Fi Display [Wi-Fi_Alliance] [Thomas_Sciorilli] 2012-04-09 Defined TXT keys: _display.tcp. Display Protocol +display 7236/tcp # Wi-Fi Alliance Wi-Fi Display [Wi-Fi_Alliance] [Thomas_Sciorilli] 2012-04-09 Defined TXT keys: _display.tcp. Display Protocol # Protocol # 7236 udp Reserved pads 7237/tcp # PADS (Public Area Display [Willie_Jan_Bons] [Willie_Jan_Bons] 2011-03-10 @@ -13012,8 +13035,8 @@ pnet-enc 7798/udp # Propel Encoder port [Leif_Hedstrom] [Leif_Hedstrom] 2002-04 altbsdp 7799/tcp # Alternate BSDP Service [Dieter_Siegmund] [Dieter_Siegmund] 2007-10-22 altbsdp 7799/udp # Alternate BSDP Service [Dieter_Siegmund] [Dieter_Siegmund] 2007-10-22 -asr 7800/tcp # Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> -asr 7800/udp # Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> +asr 7800/tcp # Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> +asr 7800/udp # Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> ssp-client 7801/tcp # Secure Server Protocol - [Rick_Macchio] [Rick_Macchio] 2006-11 # client ssp-client 7801/udp # Secure Server Protocol - [Rick_Macchio] [Rick_Macchio] 2006-11 @@ -13038,7 +13061,7 @@ mdm 7871/tcp # Mobile Device Management [Dan_Harkins] [Dan_Harkins] 2011-08-15 # 7871 udp Reserved # 7872 tcp Reserved -mipv6tls 7872/udp # TLS-based Mobile IPv6 [IESG] [IETF_Chair] 2012-04-12 [RFC-mext-mip6-tls] +mipv6tls 7872/udp # TLS-based Mobile IPv6 [IESG] [IETF_Chair] 2012-04-12 [RFC6618] # Security # 7873-7879 Unassigned pss 7880/tcp # Pearson [Pearson] [Pearson] 2008-01-17 @@ -13170,7 +13193,10 @@ # year assignment] senomix08 8059/udp # Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 # year assignment] -# 8060-8073 Unassigned +# 8060 tcp Reserved +aero 8060/udp # Asymmetric Extended Route [IESG] [IETF_Chair] [RFC-templin-aero-12] +# Optimization (AERO) +# 8061-8073 Unassigned gadugadu 8074/tcp # Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05 gadugadu 8074/udp # Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05 # 8075-8079 Unassigned @@ -13304,7 +13330,10 @@ # Interface amberon 8301/tcp # Amberon PPC/PPS [Ronald_Snyder] [Ronald_Snyder] 2006-03 amberon 8301/udp # Amberon PPC/PPS [Ronald_Snyder] [Ronald_Snyder] 2006-03 -# 8302-8319 Unassigned +# 8302-8312 Unassigned +hub-open-net 8313/tcp # Hub Open Network [Grexie] [Tim_Behrsin] 2012-06-13 Defined TXT keys: _hub._tcp.host.example.com +# 8313 udp Reserved +# 8314-8319 Unassigned tnp-discover 8320/tcp # Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 tnp-discover 8320/udp # Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 tnp 8321/tcp # Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 @@ -13393,7 +13422,10 @@ # 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 -# 8601-8609 Unassigned +# 8601-8608 Unassigned +# 8609 tcp Reserved +canon-cpp-disc 8609/udp # Canon Compact Printer [Canon_Inc] [Ryusuke_Okuhara] 2012-06-08 2012-06-15 +# Protocol Discovery canon-mfnp 8610/tcp # Canon MFNP Service [Ritsuto_Sako] [Ritsuto_Sako] 2009-05-04 canon-mfnp 8610/udp # Canon MFNP Service [Ritsuto_Sako] [Ritsuto_Sako] 2009-05-04 canon-bjnp1 8611/tcp # Canon BJNP Port 1 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 @@ -13432,10 +13464,10 @@ ultraseek-http 8765/tcp # Ultraseek HTTP [Walter_Underwood] [Walter_Underwood] ultraseek-http 8765/udp # Ultraseek HTTP [Walter_Underwood] [Walter_Underwood] # 8766-8769 Unassigned -dpap 8770/tcp # Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, -# Protocol (iPhoto) Machine Name, Password -dpap 8770/udp # Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, -# Protocol (iPhoto) Machine Name, Password +dpap 8770/tcp # Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, +# Protocol (iPhoto) Machine Name, Password +dpap 8770/udp # Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, +# Protocol (iPhoto) Machine Name, Password # 8771-8785 Unassigned msgclnt 8786/tcp # Message Client msgclnt 8786/udp # Message Client @@ -13451,7 +13483,7 @@ sunwebadmin 8800/udp # Sun Web Server Admin Service [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12 # UNAUTHORIZED # USE: Port -# 8801-8803 Unassigned 8801 by IBM +# 8801-8803 Unassigned 8801 by IBM # z/OS RMF # protocol truecm 8804/tcp # truecm [Scott_Kramer] [Scott_Kramer] @@ -13462,7 +13494,11 @@ # 8874-8879 Unassigned cddbp-alt 8880/tcp # CDDBP [Steve_Scherf] [Steve_Scherf] cddbp-alt 8880/udp # CDDBP [Steve_Scherf] [Steve_Scherf] -# 8881-8882 Unassigned +galaxy4d 8881/tcp # Galaxy4D Online Game Engine [Galaxy4D] [Olivier_St-Laurent] 2012-06-18 +# 8881 udp Reserved +# Unauthorized +# 8882 Unassigned Use Known on +# port 8882 secure-mqtt 8883/tcp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 secure-mqtt 8883/udp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 # 8884-8887 Unassigned @@ -13602,11 +13638,11 @@ hp-pdl-datastr 9100/tcp # PDL Data Streaming Port [Shivaun_Albright] [Shivaun_Albright] 2002-04 hp-pdl-datastr 9100/udp # PDL Data Streaming Port [Shivaun_Albright] [Shivaun_Albright] 2002-04 # The protocol name "pdl-datastream" is primarily registered -pdl-datastream 9100/tcp # Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow +pdl-datastream 9100/tcp # Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow # a protocol to run on any port number, but the default port # for this protocol is 9100. # The protocol name "pdl-datastream" is primarily registered -pdl-datastream 9100/udp # Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow +pdl-datastream 9100/udp # Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow # a protocol to run on any port number, but the default port # for this protocol is 9100. bacula-dir 9101/tcp # Bacula Director [Kern_Sibbald] [Kern_Sibbald] 2002-01 @@ -13617,10 +13653,12 @@ bacula-sd 9103/udp # Bacula Storage Daemon [Kern_Sibbald] [Kern_Sibbald] 2002-01 peerwire 9104/tcp # PeerWire [Steven_Gerhardt] [Steven_Gerhardt] 2004-02 peerwire 9104/udp # PeerWire [Steven_Gerhardt] [Steven_Gerhardt] 2004-02 -xadmin 9105/tcp # Xadmin Control Service [Ari SQRT'n Huisken <xadmin&huisken-systems.nl> 15 -# June 2009] -xadmin 9105/udp # Xadmin Control Service [Ari SQRT'n Huisken <xadmin&huisken-systems.nl> 15 -# June 2009] +# [Ari SQRT'n Huisken +xadmin 9105/tcp # Xadmin Control Service <xadmin&huisken-systems.nl> 15 June +# 2009] +# [Ari SQRT'n Huisken +xadmin 9105/udp # Xadmin Control Service <xadmin&huisken-systems.nl> 15 June +# 2009] astergate 9106/tcp # Astergate Control Service [Ari_Huisken] [Ari_Huisken] 2010-01-04 astergate-disc 9106/udp # Astergate Discovery Service [Ari_Huisken] [Ari_Huisken] 2010-01-04 astergatefax 9107/tcp # AstergateFax Control Service [Gijs_Middelkamp] [Gijs_Middelkamp] 2010-02-03 @@ -13859,7 +13897,7 @@ # a replacement for # "erunbook_agent". # This entry is an alias to "erunbook-agent". This entry is now -erunbook_agent 9616/tcp # eRunbook Agent [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 historic, not usable for use with many common service +erunbook_agent 9616/tcp # eRunbook Agent [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 historic, not usable for use with many common service # discovery mechanisms. # 9616 udp Reserved # eRunbook Server @@ -13869,7 +13907,7 @@ # a replacement for # "erunbook_server". # This entry is an alias to "erunbook-server". This entry is -erunbook_server 9617/tcp # eRunbook Server [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 now historic, not usable for use with many common service +erunbook_server 9617/tcp # eRunbook Server [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 now historic, not usable for use with many common service # discovery mechanisms. # 9617 udp Reserved condor 9618/tcp # Condor Collector Service [Todd_Tannenbaum] [Todd_Tannenbaum] 2008-04-03 @@ -14031,8 +14069,8 @@ # well-formed service name as # a replacement for # "documentum_s". -# EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now -documentum_s 10003/tcp # Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service +# EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now +documentum_s 10003/tcp # Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service # discovery mechanisms. # EMC-Documentum Content # Server Product @@ -14041,8 +14079,8 @@ # well-formed service name as # a replacement for # "documentum_s". -# EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now -documentum_s 10003/udp # Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service +# EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now +documentum_s 10003/udp # Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service # discovery mechanisms. emcrmirccd 10004/tcp # EMC Replication Manager [Robert_Boudrie] [Robert_Boudrie] 2008-06-09 # Client @@ -14238,7 +14276,7 @@ # 11176-11200 Unassigned smsqp 11201/tcp # smsqp [Andres_Seco_Hernande] [Andres_Seco_Hernande] smsqp 11201/udp # smsqp [Andres_Seco_Hernande] [Andres_Seco_Hernande] -dcsl-backup 11202/tcp # DCSL Network Backup Services [John_Reynolds] [John_Reynolds] 2012-04-17 Defined TXT keys: DCSL-Service +dcsl-backup 11202/tcp # DCSL Network Backup Services [John_Reynolds] [John_Reynolds] 2012-04-17 Defined TXT keys: DCSL-Service # 11202 udp Reserved # 11203-11207 Unassigned wifree 11208/tcp # WiFree Service [Jose_Luis_Martin_Pei] [Jose_Luis_Martin_Pei] 2006-03 @@ -14260,7 +14298,7 @@ hkp 11371/tcp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 hkp 11371/udp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 # UNAUTHORIZED -# 11372-11488 Unassigned USE: port +# 11372-11488 Unassigned USE: port # 11488 by ASG # Cypress asgcypresstcps 11489/tcp # ASG Cypress Secure Only [David_Luxford] [David_Luxford] 2010-07-01 @@ -14507,8 +14545,8 @@ bex-xr 15660/udp # Backup Express Restore [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 # Server # 15661-15739 Unassigned -ptp 15740/tcp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> -ptp 15740/udp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> +ptp 15740/tcp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> +ptp 15740/udp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> # 15741-15997 Unassigned # 15998 tcp Reserved 2ping 15998/udp # 2ping Bi-Directional Ping [Ryan_Finnie] [Ryan_Finnie] 2010-10-06 @@ -14671,7 +14709,12 @@ # 18188-18240 Unassigned checkpoint-rtm 18241/tcp # Check Point RTM [Dudi_Hazan] [Dudi_Hazan] checkpoint-rtm 18241/udp # Check Point RTM [Dudi_Hazan] [Dudi_Hazan] -# 18242-18261 Unassigned +iclid 18242/tcp # Checkpoint router monitoring [Check_Point_Software] [Rahul_Bahadur] 2012-06-28 +# 18242 udp Reserved +clusterxl 18243/tcp # Checkpoint router state [Check_Point_Software] [Rahul_Bahadur] 2012-06-28 +# backup +# 18243 udp Reserved +# 18244-18261 Unassigned gv-pf 18262/tcp # GV NetConfig Service [Scott_Libert] [Scott_Libert] 2008-01-29 gv-pf 18262/udp # GV NetConfig Service [Scott_Libert] [Scott_Libert] 2008-01-29 # 18263-18462 Unassigned @@ -14766,7 +14809,7 @@ # a replacement for # "nburn_id". # This entry is an alias to "nburn-id". This entry is now -nburn_id 20034/tcp # NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service +nburn_id 20034/tcp # NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service # discovery mechanisms. # NetBurner ID Port # @@ -14775,7 +14818,7 @@ # a replacement for # "nburn_id". # This entry is an alias to "nburn-id". This entry is now -nburn_id 20034/udp # NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service +nburn_id 20034/udp # NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service # discovery mechanisms. # 20035-20045 Unassigned tmophl7mts 20046/tcp # TMOP HL7 Message Transfer [Tim_Riley] [Tim_Riley] 2009-07-31 @@ -14944,7 +14987,10 @@ # 23456 udp Reserved aequus-alt 23457/tcp # Aequus Service Mgmt [James_Anson] [James_Anson] 2009-02-12 # 23457 udp Reserved -# 23458-23999 Unassigned +# 23458-23545 Unassigned +areaguard-neo 23546/tcp # AreaGuard Neo - WebServer [SODATSW_spol] [Roman_Stepanek] 2012-05-31 +# 23546 udp Reserved +# 23547-23999 Unassigned med-ltp 24000/tcp # med-ltp [Juergen_Fischbach] [Juergen_Fischbach] med-ltp 24000/udp # med-ltp [Juergen_Fischbach] [Juergen_Fischbach] med-fsp-rx 24001/tcp # med-fsp-rx [Juergen_Fischbach] [Juergen_Fischbach] @@ -14976,7 +15022,7 @@ # a replacement for # "intel_rci". # This entry is an alias to "intel-rci". This entry is now -intel_rci 24386/tcp # Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service +intel_rci 24386/tcp # Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service # discovery mechanisms. # Intel RCI # @@ -14985,7 +15031,7 @@ # a replacement for # "intel_rci". # This entry is an alias to "intel-rci". This entry is now -intel_rci 24386/udp # Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service +intel_rci 24386/udp # Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service # discovery mechanisms. # 24387-24464 Unassigned tonidods 24465/tcp # Tonido Domain Server [Madhan_Kanagavel] [Madhan_Kanagavel] 2008-07-18 @@ -15006,7 +15052,10 @@ # 24681-24753 Unassigned cslg 24754/tcp # Citrix StorageLink Gateway [Mark_Nijmeijer] [Mark_Nijmeijer] 2009-04-17 # 24754 udp Reserved -# 24755-24921 Unassigned +# 24755-24849 Unassigned +# 24850 tcp Reserved +assoc-disc 24850/udp # Device Association Discovery [Microsoft_Corporation_3] [Sachin_Sheth] 2012-06-27 +# 24851-24921 Unassigned find 24922/tcp # Find Identification of [Jean_Paul_Moreaux] [Jean_Paul_Moreaux] # Network Devices find 24922/udp # Find Identification of [Jean_Paul_Moreaux] [Jean_Paul_Moreaux] @@ -15161,7 +15210,7 @@ # a replacement for # "dsx_monitor". # This entry is an alias to "dsx-monitor". This entry is now -dsx_monitor 31685/tcp # DS Expert Monitor [John_Lowery] [John_Lowery] 2008-08-21 historic, not usable for use with many common service +dsx_monitor 31685/tcp # DS Expert Monitor [John_Lowery] [John_Lowery] 2008-08-21 historic, not usable for use with many common service # discovery mechanisms. # 31685 udp Reserved # 31686-31764 Unassigned @@ -15175,8 +15224,8 @@ # well-formed service name as # a replacement for # "iceedcp_tx". -# Embedded Device This entry is an alias to "iceedcp-tx". This entry is now -iceedcp_tx 31948/tcp # Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service +# Embedded Device This entry is an alias to "iceedcp-tx". This entry is now +iceedcp_tx 31948/tcp # Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Embedded Device # Configuration Protocol TX @@ -15185,8 +15234,8 @@ # well-formed service name as # a replacement for # "iceedcp_tx". -# Embedded Device This entry is an alias to "iceedcp-tx". This entry is now -iceedcp_tx 31948/udp # Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service +# Embedded Device This entry is an alias to "iceedcp-tx". This entry is now +iceedcp_tx 31948/udp # Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Embedded Device # Configuration Protocol RX @@ -15195,8 +15244,8 @@ # well-formed service name as # a replacement for # "iceedcp_rx". -# Embedded Device This entry is an alias to "iceedcp-rx". This entry is now -iceedcp_rx 31949/tcp # Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service +# Embedded Device This entry is an alias to "iceedcp-rx". This entry is now +iceedcp_rx 31949/tcp # Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # Embedded Device # Configuration Protocol RX @@ -15205,8 +15254,8 @@ # well-formed service name as # a replacement for # "iceedcp_rx". -# Embedded Device This entry is an alias to "iceedcp-rx". This entry is now -iceedcp_rx 31949/udp # Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service +# Embedded Device This entry is an alias to "iceedcp-rx". This entry is now +iceedcp_rx 31949/udp # Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service # discovery mechanisms. # 31950-32248 Unassigned iracinghelper 32034/tcp # iRacing helper service [Randy_Cassidy] [Randy_Cassidy] 2007-08-30 @@ -15341,9 +15390,9 @@ # 37655-38200 Unassigned galaxy7-data 38201/tcp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 galaxy7-data 38201/udp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 -fairview 38202/tcp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, +fairview 38202/tcp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, # DevStat=<device status> -fairview 38202/udp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, +fairview 38202/udp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, # DevStat=<device status> agpolicy 38203/tcp # AppGate Policy Server [Martin_Forssen] [Martin_Forssen] 2004-11 agpolicy 38203/udp # AppGate Policy Server [Martin_Forssen] [Martin_Forssen] 2004-11 @@ -15390,7 +15439,14 @@ crestron-cip 41794/udp # Crestron Control Port [Ed_Ranney] [Ed_Ranney] 2003-01 crestron-ctp 41795/tcp # Crestron Terminal Port [Ed_Ranney] [Ed_Ranney] 2003-01 crestron-ctp 41795/udp # Crestron Terminal Port [Ed_Ranney] [Ed_Ranney] 2003-01 -# 41796-42507 Unassigned +crestron-cips 41796/tcp # Crestron Secure Control Port [Crestron_Electronics] [Manish_Talreja] 2012-06-27 +# 41796 udp Reserved +crestron-ctps 41797/tcp # Crestron Secure Terminal [Crestron_Electronics] [Manish_Talreja] 2012-06-27 +# Port +# 41797 udp Reserved +# Unauthorized +# 41798-42507 Unassigned Use Known on +# port 42000 candp 42508/tcp # Computer Associates network [Jon_Press] [Jon_Press] 2005-09 # discovery protocol candp 42508/udp # Computer Associates network [Jon_Press] [Jon_Press] 2005-09 @@ -15409,7 +15465,12 @@ noit-transport 43191/tcp # Reconnoiter Agent Data [Theo_Schlossnagle] [Theo_Schlossnagle] 2009-05-19 # Transport # 43191 udp Reserved -# 43192-43438 Unassigned +# 43192-43209 Unassigned +shaperai 43210/tcp # Shaper Automation Server [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 +# Management +shaperai-disc 43210/udp # Shaper Automation Server [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 +# Management Discovery +# 43211-43438 Unassigned eq3-update 43439/tcp # EQ3 firmware update [eQ-3_AG] [Falk_Werner] 2012-02-10 eq3-config 43439/udp # EQ3 discovery and [eQ-3_AG] [Falk_Werner] 2012-02-10 # configuration @@ -15427,7 +15488,7 @@ pcp 44323/udp # Port Control Protocol [Dan_Wing] [Dan_Wing] 2011-01-11 # UNAUTHORIZED # USE: Ports -# 44324-44543 Unassigned 44515 & 44516 +# 44324-44543 Unassigned 44515 & 44516 # used by NI # Device # Protocol @@ -15442,21 +15503,21 @@ # 44601-44817 Unassigned # EtherNet/IP messaging # -EtherNet-IP-2 44818/tcp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 +EtherNet-IP-2 44818/tcp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 # well-formed service name as # a replacement for # "EtherNet/IP-2". # New contact added for port 44818 on 2008-02-01 This entry is -EtherNet/IP-2 44818/tcp # EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not +EtherNet/IP-2 44818/tcp # EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not # usable for use with many common service discovery mechanisms. # EtherNet/IP messaging # -EtherNet-IP-2 44818/udp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 +EtherNet-IP-2 44818/udp # IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 # well-formed service name as # a replacement for # "EtherNet/IP-2". # New contact added for port 44818 on 2008-02-01 This entry is -EtherNet/IP-2 44818/udp # EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not +EtherNet/IP-2 44818/udp # EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not # usable for use with many common service discovery mechanisms. # 44819-44999 Unassigned # NSi AutoStore Status @@ -15486,7 +15547,12 @@ # 45826-45965 Unassigned ssr-servermgr 45966/tcp # SSRServerMgr [Jeremy_Gilliat] [Jeremy_Gilliat] ssr-servermgr 45966/udp # SSRServerMgr [Jeremy_Gilliat] [Jeremy_Gilliat] -# 45967-46998 Unassigned +# 45967-46997 Unassigned +# Connection between a desktop +sp-remotetablet 46998/tcp # computer or server and a [SOFTPRO_GmbH] [Nils_Durner] 2012-07-19 +# signature tablet to capture +# handwritten signatures +# 46998 udp Reserved mediabox 46999/tcp # MediaBox Server [Alexander_Graef] [Alexander_Graef] 2004-11 mediabox 46999/udp # MediaBox Server [Alexander_Graef] [Alexander_Graef] 2004-11 mbus 47000/tcp # Message Bus [Dirk_Kutscher] [Dirk_Kutscher] @@ -15673,318 +15739,322 @@ # xnet Cross Net Debugger # xns-idp Xerox NS IDP # 1Password Password Manager -# 1password data sharing and [Roustem_Karimov] [Roustem_Karimov] Defined TXT keys: None +# 1password data sharing and [Roustem_Karimov] [Roustem_Karimov] Defined TXT keys: None # synchronization protocol -# a-d-sync Altos Design Synchronization [David_Lasker] [David_Lasker] Defined TXT keys: None +# a-d-sync Altos Design Synchronization [David_Lasker] [David_Lasker] Defined TXT keys: None # protocol -# Applied Biosystems Universal Defined TXT keys: product=<short product name/model> -# abi-instrument Instrument Framework [Tor_Slettnes] [Tor_Slettnes] description=<readable name> version=<firmware/instrument +# Applied Biosystems Universal Defined TXT keys: product=<short product name/model> +# abi-instrument Instrument Framework [Tor_Slettnes] [Tor_Slettnes] description=<readable name> version=<firmware/instrument # controller version> -# accessdata-f2d FTK2 Database Discovery [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary +# accessdata-f2d FTK2 Database Discovery [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary # Service -# accessdata-f2w FTK2 Backend Processing [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary +# accessdata-f2w FTK2 Backend Processing [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary # Agent Service -# accessone Strix Systems 5S/AccessOne [Scott_Herscher_2] [Scott_Herscher_2] Defined TXT keys: None +# accessone Strix Systems 5S/AccessOne [Scott_Herscher_2] [Scott_Herscher_2] Defined TXT keys: None # protocol -# accountedge MYOB AccountEdge Defined TXT keys: None -# acrobatsrv Adobe Acrobat Defined TXT keys: type, path, FeedType -# acs-ctl-ds tcp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC -# acs-ctl-ds udp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC -# acs-ctl-gw tcp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC -# acs-ctl-gw udp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC -# actionitems ActionItems [Sailalong_Software] [Sailalong_Software] Defined TXT keys: None -# activeraid Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None +# accountedge MYOB AccountEdge Defined TXT keys: None +# acrobatsrv Adobe Acrobat Defined TXT keys: type, path, FeedType +# acs-ctl-ds tcp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC +# acs-ctl-ds udp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC +# acs-ctl-gw tcp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC +# acs-ctl-gw udp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC +# actionitems ActionItems [Sailalong_Software] [Sailalong_Software] Defined TXT keys: None +# activeraid Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None # Device Management Protocol # Encrypted transport of -# activeraid-ssl Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None +# activeraid-ssl Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None # Device Management Protocol -# addressbook Address-O-Matic [Massimiliano_Ribuoli] [Massimiliano_Ribuoli] Defined TXT keys: None +# addressbook Address-O-Matic [Massimiliano_Ribuoli] [Massimiliano_Ribuoli] Defined TXT keys: None # Address Book Server used for -# addressbooksrv tcp contacts and calendar [AddressBookServer] [Alexander_Hartner] 2011-10-14 Defined TXT keys: _suffix, _prefix +# addressbooksrv tcp contacts and calendar [AddressBookServer] [Alexander_Hartner] 2011-10-14 Defined TXT keys: _suffix, _prefix # synchronisation # difusi Cloud based plug & # play network synchronization -# adnodes protocol, content pool [DIFUSI_Inc] [Mike_Wright] 2011-11-07 Defined TXT keys: Proprietary +# adnodes protocol, content pool [DIFUSI_Inc] [Mike_Wright] 2011-11-07 Defined TXT keys: Proprietary # database discovery, and # cloudOS SAaS discovery # protocol. -# adobe-shadow tcp Adobe Shadow Server [Adobe_Systems] [Mike_Harris] 2012-04-17 Defined TXT keys: id -# adobe-vc Adobe Version Cue Defined TXT keys: txtvers=1, name, version, build -# adisk Automatic Disk Discovery [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX -# adpro-setup ADPRO Security Device Setup [Patrick_Noffke] [Patrick_Noffke] Defined TXT keys: txtvers, type -# aecoretech Apple Application [Hani_Abdelazim] [Hani_Abdelazim] Defined TXT keys: None +# adobe-shadow tcp Adobe Shadow Server [Adobe_Systems] [Mike_Harris] 2012-04-17 Defined TXT keys: id +# adobe-vc Adobe Version Cue Defined TXT keys: txtvers=1, name, version, build +# adisk Automatic Disk Discovery [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX +# adpro-setup ADPRO Security Device Setup [Patrick_Noffke] [Patrick_Noffke] Defined TXT keys: txtvers, type +# aecoretech Apple Application [Hani_Abdelazim] [Hani_Abdelazim] Defined TXT keys: None # Engineering Services # Defined TXT keys: orb_server=<port #> (optional) CORBA ORB -# Aeroflex instrumentation and server used for resource discovery product_id=<string> -# aeroflex software [David_Hagood] [David_Hagood] (optional) ID of licensed product +# Aeroflex instrumentation and server used for resource discovery product_id=<string> +# aeroflex software [David_Hagood] [David_Hagood] (optional) ID of licensed product # txtvers="*IDN?=<identifier>" (optional) as per LXI # specification (for not yet LXI compatible instruments) -# airdrop tcp Airdrop [Apple_Inc] [Marc_Krochmal_2] 2012-03-02 Defined TXT keys: flags, phash, ehash, cname -# airport AirPort Base Station [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: waMA; +# aerohive-proxy tcp Aerohive Proxy Configuration [Aerohive_Networks] [Matthew_Gast] 2012-05-31 Defined TXT keys: name, port, username +# Service +# airdrop tcp Airdrop [Apple_Inc] [Marc_Krochmal_2] 2012-03-02 Defined TXT keys: flags, phash, ehash, cname +# airport AirPort Base Station [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: waMA; +# airpreview tcp Coda AirPreview [Panic_Inc] [Cabel_Sasser] 2012-07-19 Defined TXT keys: hasCamera, name, UUID # Defined TXT keys: mac=<MAC address> ip=<IP address> -# airprojector AirProjector [Yoshinori_Nakayama] [Yoshinori_Nakayama] note=<Location> use=<Status> mainprog=<Main program version> +# airprojector AirProjector [Yoshinori_Nakayama] [Yoshinori_Nakayama] note=<Location> use=<Status> mainprog=<Main program version> # bootprog=<Boot program version> -# airsharing Air Sharing [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None -# airsharingpro Air Sharing Pro [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None -# aloe-gwp tcp Aloe Gateway Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version -# aloe-pp tcp Aloe Pairing Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version, DeviceName, DeviceModel, +# airsharing Air Sharing [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None +# airsharingpro Air Sharing Pro [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None +# aloe-gwp tcp Aloe Gateway Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version +# aloe-pp tcp Aloe Pairing Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version, DeviceName, DeviceModel, # DeviceSystem, DeviceSystemVersion, AppName, AppVersion -# amba-cam udp Ambarella Cameras [Louis_Sun] [Louis_Sun] Defined TXT keys: product=<product model name> +# amba-cam udp Ambarella Cameras [Louis_Sun] [Louis_Sun] Defined TXT keys: product=<product model name> # description=<string name> version=<firmware version> # P2PTapWar Sample Application -# amiphd-p2p from "iPhone SDK [Chris_Adamson] [Chris_Adamson] Defined TXT keys: None +# amiphd-p2p from "iPhone SDK [Chris_Adamson] [Chris_Adamson] Defined TXT keys: None # Development" Book -# ams-htm Proprietary protocol for [AccuMed_Services] [Sam_Carleton_2] 2011-10-20 Defined TXT keys: None +# ams-htm Proprietary protocol for [AccuMed_Services] [Sam_Carleton_2] 2011-10-20 Defined TXT keys: None # Accu-Med HTM -# animolmd Animo License Manager [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None -# animobserver Animo Batch Server [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None +# animolmd Animo License Manager [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None +# animobserver Animo Batch Server [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None # Anquet map synchronization -# anquetsync between desktop and handheld [Paul_Lesurf] [Paul_Lesurf] Defined TXT keys: Proprietary +# anquetsync between desktop and handheld [Paul_Lesurf] [Paul_Lesurf] Defined TXT keys: Proprietary # devices -# appelezvous Appelezvous [Marco_Piovanelli] [Marco_Piovanelli] Defined TXT keys: None -# apple-ausend Apple Audio Units [James_McCartney] [James_McCartney] Defined TXT keys: None -# apple-mobdev tcp Apple Mobile Device Protocol [Apple_2] [Paul_Chinn][Justin_Ko] 2011-10-20 Defined TXT keys: None -# apple-midi udp Apple MIDI [Doug_Wyatt] [Doug_Wyatt] Defined TXT keys: None -# applerdbg Apple Remote Debug Services [Dave_Springer] [Dave_Springer] Defined TXT keys: None +# appelezvous Appelezvous [Marco_Piovanelli] [Marco_Piovanelli] Defined TXT keys: None +# apple-ausend Apple Audio Units [James_McCartney] [James_McCartney] Defined TXT keys: None +# apple-mobdev tcp Apple Mobile Device Protocol [Apple_2] [Paul_Chinn][Justin_Ko] 2011-10-20 Defined TXT keys: None +# apple-midi udp Apple MIDI [Doug_Wyatt] [Doug_Wyatt] Defined TXT keys: None +# applerdbg Apple Remote Debug Services [Dave_Springer] [Dave_Springer] Defined TXT keys: None # (OpenGL Profiler) -# appletv Apple TV [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, PrVs, OSsi, MniT -# appletv-itunes Apple TV discovery of iTunes [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers -# appletv-pair Apple TV Pairing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers -# aquamon AquaMon Defined TXT keys: None -# arcnet udp Arcturus Networks Inc. [Arcturus_Networks_Inc] [Michael_Durrant] 2011-10-20 Defined TXT keys: None +# appletv Apple TV [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, PrVs, OSsi, MniT +# appletv-itunes Apple TV discovery of iTunes [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers +# appletv-pair Apple TV Pairing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers +# aquamon AquaMon Defined TXT keys: None +# arcnet udp Arcturus Networks Inc. [Arcturus_Networks_Inc] [Michael_Durrant] 2011-10-20 Defined TXT keys: None # Hardware Services -# aroundsound AroundSound's information [Winzig_LLC] [Around_Sound] 2011-10-20 Defined TXT keys: Proprietary +# aroundsound AroundSound's information [Winzig_LLC] [Around_Sound] 2011-10-20 Defined TXT keys: Proprietary # sharing protocol -# astnotify udp Asterisk Caller-ID [Sven_Slezak] [Sven_Slezak] Defined TXT keys: prefix=<country code prefix> (numeric, -# Notification Service additionally '+') -# astralite Astralite [Tongji_University] [Tongji_University] Defined TXT keys: None -# async address-o-sync [Markus_Brand] [Markus_Brand] Defined TXT keys: None +# astnotify udp Asterisk Caller-ID [Sven_Slezak] [Sven_Slezak] Defined TXT keys: prefix=<country code prefix> (numeric, +# Notification Service additionally '+') +# astralite Astralite [Tongji_University] [Tongji_University] Defined TXT keys: None +# async address-o-sync [Markus_Brand] [Markus_Brand] Defined TXT keys: None # Atlassian Application (JIRA, -# atlassianapp Confluence, Fisheye, [Denise_Fernandez] [Denise_Fernandez] Defined TXT keys: app.url +# atlassianapp Confluence, Fisheye, [Denise_Fernandez] [Denise_Fernandez] Defined TXT keys: app.url # Crucible, Crowd, Bamboo) # discovery service -# av Allen Vanguard Hardware [Mike_Bush] [Mike_Bush] Defined TXT keys: Proprietary +# av Allen Vanguard Hardware [Mike_Bush] [Mike_Bush] Defined TXT keys: Proprietary # Service -# avatars tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none +# avatars tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none # hosting service. -# avatars-sec tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none +# avatars-sec tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none # hosting service. -# axis-video Axis Video Cameras [Kristina_Sten] [Kristina_Sten] Defined TXT keys: None -# b3d-convince 3M Unitek Digital [Rajiv_Aaron_Manglani] [Rajiv_Aaron_Manglani] Defined TXT keys: txtvers=1, protovers=<api version>, -# Orthodontic System guid=<32 hex digits> -# babyphone BabyPhone [Johan_Kool] [Johan_Kool] Defined TXT keys: None -# bdsk BibDesk Sharing [Adam_Maxwell] [Adam_Maxwell] Defined TXT keys: txtvers, authenticate -# beacon Beacon Remote Service [Jeffrey_Sadeli] [Jeffrey_Sadeli] Defined TXT keys: version=<product version>, company=<product +# axis-video Axis Video Cameras [Kristina_Sten] [Kristina_Sten] Defined TXT keys: None +# b3d-convince 3M Unitek Digital [Rajiv_Aaron_Manglani] [Rajiv_Aaron_Manglani] Defined TXT keys: txtvers=1, protovers=<api version>, +# Orthodontic System guid=<32 hex digits> +# babyphone BabyPhone [Johan_Kool] [Johan_Kool] Defined TXT keys: None +# bdsk BibDesk Sharing [Adam_Maxwell] [Adam_Maxwell] Defined TXT keys: txtvers, authenticate +# beacon Beacon Remote Service [Jeffrey_Sadeli] [Jeffrey_Sadeli] Defined TXT keys: version=<product version>, company=<product # company> -# beamer Beamer Data Sharing Protocol [Frank_Szczerba] [Frank_Szczerba] Defined TXT keys: None -# beatpack BeatPack Synchronization [Mathieu_Garcia] [Mathieu_Garcia] Defined TXT keys: None +# beamer Beamer Data Sharing Protocol [Frank_Szczerba] [Frank_Szczerba] Defined TXT keys: None +# beatpack BeatPack Synchronization [Mathieu_Garcia] [Mathieu_Garcia] Defined TXT keys: None # Server for BeatMaker -# beep Xgrid Technology Preview [David_Kramer_2] [David_Kramer_2] Defined TXT keys: None -# bfagent BuildForge Agent [Joe_Senner_2] [Joe_Senner_2] Defined TXT keys: None -# bigbangchess Big Bang Chess [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None -# bigbangmancala Big Bang Mancala [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None -# bitflit tcp Data transfer service [Ramesh_Gupta] [Ramesh_Gupta] 2012-02-21 Defined TXT keys: provider, vendor, user, host, deploy, +# beep Xgrid Technology Preview [David_Kramer_2] [David_Kramer_2] Defined TXT keys: None +# bfagent BuildForge Agent [Joe_Senner_2] [Joe_Senner_2] Defined TXT keys: None +# bigbangchess Big Bang Chess [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None +# bigbangmancala Big Bang Mancala [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None +# bitflit tcp Data transfer service [Ramesh_Gupta] [Ramesh_Gupta] 2012-02-21 Defined TXT keys: provider, vendor, user, host, deploy, # prototype, schedule -# bittorrent BitTorrent Zeroconf Peer [Robin_Perkins] [Robin_Perkins] Defined TXT keys: None +# bittorrent BitTorrent Zeroconf Peer [Robin_Perkins] [Robin_Perkins] Defined TXT keys: None # Discovery Protocol -# Little Black Book Defined TXT keys: product=<application name> -# blackbook Information Exchange [David_HM_Spector][Paul_M_Franceus] [David_HM_Spector][Paul_M_Franceus] description=<application description name> -# Protocol version=<application version/build number> protovers=<version +# Little Black Book Defined TXT keys: product=<application name> +# blackbook Information Exchange [David_HM_Spector][Paul_M_Franceus] [David_HM_Spector][Paul_M_Franceus] description=<application description name> +# Protocol version=<application version/build number> protovers=<version # of protocol in use by by this application> -# bluevertise udp BlueVertise Network Protocol [Fabrizio_Guglielmino] [Fabrizio_Guglielmino] Defined TXT keys: role=<master or slave> +# bluevertise udp BlueVertise Network Protocol [Fabrizio_Guglielmino] [Fabrizio_Guglielmino] Defined TXT keys: role=<master or slave> # (BNP) -# bookworm Bookworm Client Discovery [Arne_Dirks] [Arne_Dirks] Defined TXT keys: flavors -# boundaryscan udp Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, +# bookworm Bookworm Client Discovery [Arne_Dirks] [Arne_Dirks] Defined TXT keys: flavors +# boundaryscan udp Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, # version=<firmware/instrument controller version> -# bousg Bag Of Unusual Strategy Defined TXT keys: None +# bousg Bag Of Unusual Strategy Defined TXT keys: None # Games -# bri RFID Reader Basic Reader [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: None +# 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 -# 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> -# caldavs tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [draft-daboo-srv-caldav] This is an extension of the https service. Defined TXT keys: -# WebDAV (CalDAV) - over TLS path=<context path> -# caltalk CalTalk [Joe_Groff] [Joe_Groff] Defined TXT keys: None -# carddav tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the http service. Defined TXT keys: -# (CardDAV) - non-TLS path=<context path> -# carddavs tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the https service. Defined TXT keys: -# (CardDAV) - over TLS path=<context path> -# cardsend Card Send Protocol [Jeff_Grossman] [Jeff_Grossman] Defined TXT keys: Proprietary -# carousel tcp Carousel Player Protocol [Tightrope_Media_Systems] [Scott_Jann] 2011-10-17 Defined TXT keys: None -# IP and Closed-Circuit Defined TXT keys: u=<username>, p=<password>, path=<path to -# cctv Television for Securitiy [Frank_Rottmann] [Frank_Rottmann] XML file> +# 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> +# caldavs tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [draft-daboo-srv-caldav] This is an extension of the https service. Defined TXT keys: +# WebDAV (CalDAV) - over TLS path=<context path> +# caltalk CalTalk [Joe_Groff] [Joe_Groff] Defined TXT keys: None +# carddav tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the http service. Defined TXT keys: +# (CardDAV) - non-TLS path=<context path> +# carddavs tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the https service. Defined TXT keys: +# (CardDAV) - over TLS path=<context path> +# cardsend Card Send Protocol [Jeff_Grossman] [Jeff_Grossman] Defined TXT keys: Proprietary +# carousel tcp Carousel Player Protocol [Tightrope_Media_Systems] [Scott_Jann] 2011-10-17 Defined TXT keys: None +# IP and Closed-Circuit Defined TXT keys: u=<username>, p=<password>, path=<path to +# cctv Television for Securitiy [Frank_Rottmann] [Frank_Rottmann] XML file> # applications -# cheat The Cheat [Chaz_McGarvey] [Chaz_McGarvey] Defined TXT keys: None -# chess Project Gridlock Defined TXT keys: None -# chfts Fluid Theme Server Defined TXT keys: None -# chili The CHILI Radiology System [Andre_Schroter] [Andre_Schroter] Defined TXT keys: None -# ciao tcp Ciao Arduino Protocol [Mike_Colagrosso] [Mike_Colagrosso] 2011-10-24 Defined TXT keys: see www.ciaoapp.com +# cheat The Cheat [Chaz_McGarvey] [Chaz_McGarvey] Defined TXT keys: None +# chess Project Gridlock Defined TXT keys: None +# chfts Fluid Theme Server Defined TXT keys: None +# chili The CHILI Radiology System [Andre_Schroter] [Andre_Schroter] Defined TXT keys: None +# ciao tcp Ciao Arduino Protocol [Mike_Colagrosso] [Mike_Colagrosso] 2011-10-24 Defined TXT keys: see www.ciaoapp.com # Discovery of JDF (CIP4 Job -# cip4discovery Definition Format) enabled [Stefan_Daun] [Stefan_Daun] Defined TXT keys: None +# cip4discovery Definition Format) enabled [Stefan_Daun] [Stefan_Daun] Defined TXT keys: None # devices -# clipboard Clipboard Sharing Defined TXT keys: None -# clique udp Clique Link-Local Multicast [Telepathy_project] [Telepathy_project] Defined TXT keys: see -# Chat Room http://telepathy.freedesktop.org/xmpp/clique -# clscts Oracle CLS Cluster Topology [David_Brower] [David_Brower] Defined TXT keys: None +# clipboard Clipboard Sharing Defined TXT keys: None +# clique udp Clique Link-Local Multicast [Telepathy_project] [Telepathy_project] Defined TXT keys: see +# Chat Room http://telepathy.freedesktop.org/xmpp/clique +# clscts Oracle CLS Cluster Topology [David_Brower] [David_Brower] Defined TXT keys: None # Service -# collection Published Collection Object [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? -# com-ocs-es-mcc ElectraStar media centre [OC] [OC] Defined TXT keys: None +# collection Published Collection Object [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? +# com-ocs-es-mcc ElectraStar media centre [OC] [OC] Defined TXT keys: None # control protocol -# contactserver Now Contact Defined TXT keys: None -# corroboree Corroboree Server [Heath_Raftery] [Heath_Raftery] Defined TXT keys: None -# cpnotebook2 NoteBook 2 [Circus_Ponies_Suppor] [Circus_Ponies_Suppor] Defined TXT keys: None -# cw-codetap CodeWarrior HTI Xscale [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None +# contactserver Now Contact Defined TXT keys: None +# corroboree Corroboree Server [Heath_Raftery] [Heath_Raftery] Defined TXT keys: None +# cpnotebook2 NoteBook 2 [Circus_Ponies_Suppor] [Circus_Ponies_Suppor] Defined TXT keys: None +# cw-codetap CodeWarrior HTI Xscale [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None # PowerTAP -# cw-dpitap CodeWarrior HTI DPI PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None -# cw-oncetap CodeWarrior HTI OnCE [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None +# cw-dpitap CodeWarrior HTI DPI PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None +# cw-oncetap CodeWarrior HTI OnCE [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None # PowerTAP -# cw-powertap CodeWarrior HTI COP PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None -# cytv CyTV - Network streaming for [Andreas_Junghans] [Andreas_Junghans] Defined TXT keys: None +# cw-powertap CodeWarrior HTI COP PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None +# cytv CyTV - Network streaming for [Andreas_Junghans] [Andreas_Junghans] Defined TXT keys: None # Elgato EyeTV -# dacp Digital Audio Control [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, Ver, DbId +# dacp Digital Audio Control [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, Ver, DbId # Protocol (iTunes) -# dancepartner Dance partner application [Rory_McClure] [Rory_McClure] Defined TXT keys: None +# dancepartner Dance partner application [Rory_McClure] [Rory_McClure] Defined TXT keys: None # for iPhone -# dataturbine Open Source DataTurbine [Tony_Fountain] [Tony_Fountain] Defined TXT keys: None +# dataturbine Open Source DataTurbine [Tony_Fountain] [Tony_Fountain] Defined TXT keys: None # Streaming Data Middleware # Defined TXT keys:txtvers=<TXT-Record version> -# dbaudio tcp 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> +# dbaudio tcp 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> # Defined TXT keys:txtvers=<TXT-Record version> -# 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> +# 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> -# 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 +# 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 +# devonsync tcp DEVONthink synchronization [DEVONtechnologies_LLC] [Rob_Rix][Eric_Boehnisch-Volkmann] 2011-10-18 Defined TXT keys: None at present # protocol -# dictation Use of a dictation service [Nuance_Communications_Inc] [Mark_Jackson] 2011-10-27 Defined TXT keys: ver, name +# dictation Use of a dictation service [Nuance_Communications_Inc] [Mark_Jackson] 2011-10-27 Defined TXT keys: ver, name # by a hand-held device -# difi EyeHome [Elgato] [Elgato] Defined TXT keys: None -# disconnect DisConnect Peer to Peer Game [Michael_S_Bogovich] [Michael_S_Bogovich] Defined TXT keys: None +# difi EyeHome [Elgato] [Elgato] Defined TXT keys: None +# disconnect DisConnect Peer to Peer Game [Michael_S_Bogovich] [Michael_S_Bogovich] Defined TXT keys: None # Protocol -# dist-opencl Distributed OpenCL discovery [William_Dillon] [William_Dillon] Defined TXT keys: None +# dist-opencl Distributed OpenCL discovery [William_Dillon] [William_Dillon] Defined TXT keys: None # protocol -# ditrios Ditrios SOA Framework [Mark_Schmatz] [Mark_Schmatz] Defined TXT keys: -# 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 +# ditrios Ditrios SOA Framework [Mark_Schmatz] [Mark_Schmatz] Defined TXT keys: +# 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 -# dltimesync udp Local Area Dynamic Time [Geoff_Back_3] [Geoff_Back_3] 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 +# 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 # queries. # DNS Dynamic Update Service for a given domain may not # necessarily be provided by the principal name servers as # advertised by the domain's "NS" records, and may not -# dns-update udp DNS Dynamic Update Service [Kiren_Sekar_2] [Kiren_Sekar_2] necessarily always be provided on port 53. The +# dns-update udp DNS Dynamic Update Service [Kiren_Sekar_2] [Kiren_Sekar_2] necessarily always be provided on port 53. The # "_dns-update._udp.<domain>." SRV record gives the target host # and port where DNS Dynamic Update Service is provided for the # named domain. -# dop Roar (Death of Productivity) [Massive_Flow_Product] [Massive_Flow_Product] Defined TXT keys: name=<full username> -# dropcopy DropCopy [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None -# dsgsync Datacolor SpyderGallery [Datacolor] [Heath_Barber] 2011-10-14 Defined TXT keys: Proprietary +# dop Roar (Death of Productivity) [Massive_Flow_Product] [Massive_Flow_Product] Defined TXT keys: name=<full username> +# dropcopy DropCopy [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None +# dsgsync Datacolor SpyderGallery [Datacolor] [Heath_Barber] 2011-10-14 Defined TXT keys: Proprietary # Desktop Sync Protocol # Data Synchronization -# dsl-sync Protocol for Discovery [John_Hogg] [John_Hogg] Defined TXT keys: Proprietary +# dsl-sync Protocol for Discovery [John_Hogg] [John_Hogg] Defined TXT keys: Proprietary # Software products -# dtrmtdesktop Desktop Transporter Remote [Daniel_Stodle] [Daniel_Stodle] Defined TXT keys: None +# dtrmtdesktop Desktop Transporter Remote [Daniel_Stodle] [Daniel_Stodle] Defined TXT keys: None # Desktop Protocol -# dxtgsync Documents To Go Desktop Sync [Tim_Boyle] [Tim_Boyle] Defined TXT keys: Proprietary +# dxtgsync Documents To Go Desktop Sync [Tim_Boyle] [Tim_Boyle] Defined TXT keys: Proprietary # Protocol -# ea-dttx-poker Protocol for EA Downtown [Ben_Lewis] [Ben_Lewis] Defined TXT keys: None +# ea-dttx-poker Protocol for EA Downtown [Ben_Lewis] [Ben_Lewis] Defined TXT keys: None # Texas Hold 'em -# earphoria Earphoria [Rogue_Amoeba] [Rogue_Amoeba] Defined TXT keys: None -# easyspndlg-sync tcp Sync service for the Easy [Aaron_L_Bratcher] [Aaron_L_Bratcher] 2011-10-17 Defined TXT keys: None +# earphoria Earphoria [Rogue_Amoeba] [Rogue_Amoeba] Defined TXT keys: None +# easyspndlg-sync tcp Sync service for the Easy [Aaron_L_Bratcher] [Aaron_L_Bratcher] 2011-10-17 Defined TXT keys: None # Spend Log app -# eb-amuzi Amuzi peer-to-peer session [Zachary_Gramana] [Zachary_Gramana] Defined TXT keys: Proprietary +# eb-amuzi Amuzi peer-to-peer session [Zachary_Gramana] [Zachary_Gramana] Defined TXT keys: Proprietary # synchronization protocol -# ebms ebXML Messaging [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: Endpoint=</path/to/endpoint> +# ebms ebXML Messaging [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: Endpoint=</path/to/endpoint> # Northrup Grumman/Mission -# ecms Systems/ESL Data Flow [Dan_Goff] [Dan_Goff] Defined TXT keys: None +# ecms Systems/ESL Data Flow [Dan_Goff] [Dan_Goff] Defined TXT keys: None # Protocol -# ebreg ebXML Registry [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: +# ebreg ebXML Registry [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: # HttpBinding=</path/to/registry/http/binding> -# ecbyesfsgksc Net Monitor Anti-Piracy [Guy_Meyer] [Guy_Meyer] Defined TXT keys: None +# ecbyesfsgksc Net Monitor Anti-Piracy [Guy_Meyer] [Guy_Meyer] Defined TXT keys: None # Service -# edcp udp LaCie Ethernet Disk [Nicolas_Bouilleaud] [Nicolas_Bouilleaud] Defined TXT keys: ip, mac, dhcp, mask, gtwy, wins, name, -# Configuration Protocol version -# efkon-elite tcp EFKON Lightweight Interface [EFKON_AG] [Thomas_Kemmer] 2011-10-20 Defined TXT keys: txtvers, protovers, model, serial, scheme, -# to Traffic Events path -# egistix Egistix Auto-Discovery [Dave_Lindquist_2] [Dave_Lindquist_2] Defined TXT keys: None +# edcp udp LaCie Ethernet Disk [Nicolas_Bouilleaud] [Nicolas_Bouilleaud] Defined TXT keys: ip, mac, dhcp, mask, gtwy, wins, name, +# Configuration Protocol version +# efkon-elite tcp EFKON Lightweight Interface [EFKON_AG] [Thomas_Kemmer] 2011-10-20 Defined TXT keys: txtvers, protovers, model, serial, scheme, +# to Traffic Events path +# egistix Egistix Auto-Discovery [Dave_Lindquist_2] [Dave_Lindquist_2] Defined TXT keys: None # Interactive Room Software -# eheap Infrastructure (Event Defined TXT keys: None +# eheap Infrastructure (Event Defined TXT keys: None # Sharing) -# embrace DataEnvoy [Rob_MacGregor] [Rob_MacGregor] Defined TXT keys: None -# enphase-envoy tcp Enphase Energy Envoy [Enphase_Energy_Inc] [Chris_Eich] 2011-11-08 Defined TXT keys: - txtvers - protovers - serialnum +# embrace DataEnvoy [Rob_MacGregor] [Rob_MacGregor] Defined TXT keys: None +# enphase-envoy tcp Enphase Energy Envoy [Enphase_Energy_Inc] [Chris_Eich] 2011-11-08 Defined TXT keys: - txtvers - protovers - serialnum # Endpoint Protocol (EP) for -# ep use in Home Automation [Tommy_van_der_Vorst] [Tommy_van_der_Vorst] Defined TXT keys: dns-sd_mdns +# ep use in Home Automation [Tommy_van_der_Vorst] [Tommy_van_der_Vorst] Defined TXT keys: dns-sd_mdns # systems -# esp tcp Extensis Server Protocol [Loren_Barr] [Loren_Barr] 2006-12 Defined TXT keys: none -# eucalyptus Eucalyptus Discovery [Support_Team] [Support_Team] Defined TXT keys: Eucalyptus-DNS-SD -# eventserver Now Up-to-Date Defined TXT keys: None -# evs-notif EVS Notification Center [Eric_Gillet] [Eric_Gillet] Defined TXT keys: ID, Address +# esp tcp Extensis Server Protocol [Loren_Barr] [Loren_Barr] 2006-12 Defined TXT keys: none +# eucalyptus Eucalyptus Discovery [Support_Team] [Support_Team] Defined TXT keys: Eucalyptus-DNS-SD +# eventserver Now Up-to-Date Defined TXT keys: None +# evs-notif EVS Notification Center [Eric_Gillet] [Eric_Gillet] Defined TXT keys: ID, Address # Protocol -# ewalletsync Synchronization Protocol for [Dan_Amstutz] [Dan_Amstutz] Defined TXT keys: name=<friendly device name> +# ewalletsync Synchronization Protocol for [Dan_Amstutz] [Dan_Amstutz] Defined TXT keys: name=<friendly device name> # Ilium Software's eWallet # Not a real service type. Special 'pretend' service types -# example Example Service Type ("_example._udp" and "_example._tcp") reserved for use in +# example Example Service Type ("_example._udp" and "_example._tcp") reserved for use in # illustrative examples in books and other documentation. -# exb Exbiblio Cascading Service [Claes_Fredrik_Mannby] [Claes_Fredrik_Mannby] Defined TXT keys: Will be described at www.exbiblio.com +# exb Exbiblio Cascading Service [Claes_Fredrik_Mannby] [Claes_Fredrik_Mannby] Defined TXT keys: Will be described at www.exbiblio.com # Protocol -# extensissn Extensis Serial Number [Extensis] [Extensis] Defined TXT keys: None -# eyetvsn EyeTV Sharing [Elgato] [Elgato] Defined TXT keys: txtvers=1, keyhash=<4 bytes> -# facespan FaceSpan [Kerry_Hazelgren] [Kerry_Hazelgren] Defined TXT keys: None -# faxstfx FAXstf [Smith_Micro] [Smith_Micro] Defined TXT keys: None -# feed-sharing NetNewsWire 2.0 [Ranchero_Software] [Ranchero_Software] Defined TXT keys: None -# firetask Firetask task sharing and [Gerald_Aquila] [Gerald_Aquila] Defined TXT keys: None +# extensissn Extensis Serial Number [Extensis] [Extensis] Defined TXT keys: None +# eyetvsn EyeTV Sharing [Elgato] [Elgato] Defined TXT keys: txtvers=1, keyhash=<4 bytes> +# facespan FaceSpan [Kerry_Hazelgren] [Kerry_Hazelgren] Defined TXT keys: None +# faxstfx FAXstf [Smith_Micro] [Smith_Micro] Defined TXT keys: None +# feed-sharing NetNewsWire 2.0 [Ranchero_Software] [Ranchero_Software] Defined TXT keys: None +# firetask Firetask task sharing and [Gerald_Aquila] [Gerald_Aquila] Defined TXT keys: None # synchronization protocol -# fish Fish [Oriol_Ferrer_Mesia] [Oriol_Ferrer_Mesia] Defined TXT keys: None +# fish Fish [Oriol_Ferrer_Mesia] [Oriol_Ferrer_Mesia] Defined TXT keys: None # Defined TXT keys: Currently valid enumerated values: FIX # Session Protocol Versions (SESSIONVERSION): 1.1 FIX # Application Protocol Versions (APPLICATIONVERSION): 2.7, 3.0, -# fix Financial Information [Joakim_Johansson] [Joakim_Johansson] 4.0, 4.1, 4.2, 4.3, 4.4, 5.0 Possible TXT records defined and -# Exchange (FIX) Protocol their values (replace uppercase text with enumerations from +# fix Financial Information [Joakim_Johansson] [Joakim_Johansson] 4.0, 4.1, 4.2, 4.3, 4.4, 5.0 Possible TXT records defined and +# Exchange (FIX) Protocol their values (replace uppercase text with enumerations from # the list above): txtvers=1 fix=APPLICATIONVERSION fix # supported=APPLICATIONVERSION[,APPLICATIONVERSION, ... # ,APPLICATIONVERSION] fixt=SESSIONVERSION -# fjork Fjork [John_Schilling] [John_Schilling] Defined TXT keys: None -# fl-purr udp FilmLight Cluster Power [Darrin_Smart] [Darrin_Smart] Defined TXT keys: Proprietary +# fjork Fjork [John_Schilling] [John_Schilling] Defined TXT keys: None +# fl-purr udp FilmLight Cluster Power [Darrin_Smart] [Darrin_Smart] Defined TXT keys: Proprietary # Control Service -# flir-ircam tcp FLIR Infrared Camera [FLIR_Systems_AB] [Bjorn_Roth][Klas_Malmborg] 2011-10-20 Defined TXT keys: Proprietary +# flir-ircam tcp FLIR Infrared Camera [FLIR_Systems_AB] [Bjorn_Roth][Klas_Malmborg] 2011-10-20 Defined TXT keys: Proprietary # FileMaker Server -# fmserver-admin Administration Communication [Eric_Jacobson] [Eric_Jacobson] Defined TXT keys: None +# fmserver-admin Administration Communication [Eric_Jacobson] [Eric_Jacobson] Defined TXT keys: None # Service -# fontagentnode FontAgent Pro [Insider_Software] [Insider_Software] Defined TXT keys: None -# foxtrot-serv FoxTrot Search Server [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None +# fontagentnode FontAgent Pro [Insider_Software] [Insider_Software] Defined TXT keys: None +# foxtrot-serv FoxTrot Search Server [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None # Discovery Service -# foxtrot-start FoxTrot Professional Search [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None +# foxtrot-start FoxTrot Professional Search [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None # Discovery Service -# frameforge-lic FrameForge License [James_W_Walker] [James_W_Walker] Defined TXT keys: Proprietary -# freehand FreeHand MusicPad Pro [Ted_Schroeder] [Ted_Schroeder] Defined TXT keys: None +# frameforge-lic FrameForge License [James_W_Walker] [James_W_Walker] Defined TXT keys: Proprietary +# freehand FreeHand MusicPad Pro [Ted_Schroeder] [Ted_Schroeder] Defined TXT keys: None # Interface Protocol -# frog Frog Navigation Systems [Rene_Jager] [Rene_Jager] Defined TXT keys: type, name, id -# ftpcroco Crocodile FTP Server [Xnet_Communications] [Xnet_Communications] Defined TXT keys: None -# fv-cert udp Fairview Certificate [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: DevID=<device id>, DevPK=<device public +# frog Frog Navigation Systems [Rene_Jager] [Rene_Jager] Defined TXT keys: type, name, id +# ftpcroco Crocodile FTP Server [Xnet_Communications] [Xnet_Communications] Defined TXT keys: None +# fv-cert udp Fairview Certificate [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: DevID=<device id>, DevPK=<device public # key> -# fv-key udp Fairview Key [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: KeyID=<device id> -# fv-time udp Fairview Time/Date [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: None -# garagepad Entrackment Client Service [Talkative_AB] [Talkative_AB] Defined TXT keys: None +# fv-key udp Fairview Key [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: KeyID=<device id> +# fv-time udp Fairview Time/Date [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: None +# garagepad Entrackment Client Service [Talkative_AB] [Talkative_AB] Defined TXT keys: None # G-Force Control via -# gforce-ssmp SoundSpectrum's SSMP TCP [Andy_O_Meara] [Andy_O_Meara] Defined TXT keys: None +# gforce-ssmp SoundSpectrum's SSMP TCP [Andy_O_Meara] [Andy_O_Meara] Defined TXT keys: None # Protocol -# glasspad GlassPad Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid +# glasspad GlassPad Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid # Protocol -# glasspadserver GlassPadServer Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid +# glasspadserver GlassPadServer Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid # Protocol -# glrdrvmon OpenGL Driver Monitor [Dave_Springer] [Dave_Springer] Defined TXT keys: None -# gpnp Grid Plug and Play [David_Brower] [David_Brower] Defined TXT keys: None -# grillezvous Roxio ToastAnywhere(tm) Defined TXT keys: AppID=<application id> KeyHash=<application -# Recorder Sharing license key hash> -# groovesquid tcp Groovesquid Democratic Music [www_nsovocal_com] [Ruben_Beltran] 2011-10-18 Defined TXT keys: None +# glrdrvmon OpenGL Driver Monitor [Dave_Springer] [Dave_Springer] Defined TXT keys: None +# gpnp Grid Plug and Play [David_Brower] [David_Brower] Defined TXT keys: None +# grillezvous Roxio ToastAnywhere(tm) Defined TXT keys: AppID=<application id> KeyHash=<application +# Recorder Sharing license key hash> +# groovesquid tcp Groovesquid Democratic Music [www_nsovocal_com] [Ruben_Beltran] 2011-10-18 Defined TXT keys: None # Control Protocol -# growl Growl Defined TXT keys: None +# growl Growl Defined TXT keys: None # Defined TXT keys: Varies; Depends on type of service being # offered/resolved Although DNS-SD does not recommend or # advocate using GUIDs as the primary name of an offered @@ -15994,9 +16064,9 @@ # not very informative. Typically, the service is advertised as # usual, using a user-friendly name. One of the TXT record # attributes is a GUID for the service instance. Once the user -# Special service type for has browsed and chosen the desired service instance via its -# guid resolving by GUID (Globally user-friendly name, the service is resolved, the TXT record -# Unique Identifier) is retrieved, and the GUID is stored. A given network service +# Special service type for has browsed and chosen the desired service instance via its +# guid resolving by GUID (Globally user-friendly name, the service is resolved, the TXT record +# Unique Identifier) is retrieved, and the GUID is stored. A given network service # instance is therefore being advertised two ways, for example: # <User-Friendly-Name>._ptp._tcp.local <GUID>._guid._tcp.local # On subsequent accesses to the service, the GUID-based name is @@ -16008,45 +16078,45 @@ # "_guid._tcp". There is no possibility of name conflict # because (by definition) GUIDs are globally unique. # H.323 Real-time audio, video -# h323 and data communication call [Will_MacDonald] [Will_MacDonald] Defined TXT keys: None +# h323 and data communication call [Will_MacDonald] [Will_MacDonald] Defined TXT keys: None # setup protocol -# help HELP command [RFC1078] TCP Port Service Multiplexer (TCPMUX) -# hg Mercurial web-based Defined TXT keys: None path=<file system pathname to -# repository access repository> description=<descriptive name of repository> -# hinz HINZMobil Synchronization [Jorg_Laschke] [Jorg_Laschke] Defined TXT keys: None +# help HELP command [RFC1078] TCP Port Service Multiplexer (TCPMUX) +# hg Mercurial web-based Defined TXT keys: None path=<file system pathname to +# repository access repository> description=<descriptive name of repository> +# hinz HINZMobil Synchronization [Jorg_Laschke] [Jorg_Laschke] Defined TXT keys: None # protocol -# hmcp Home Media Control Protocol [Will_Lahr] [Will_Lahr] Defined TXT keys: None -# home-sharing iTunes Home Sharing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, hQ, iTSh Version, MID, Database +# hmcp Home Media Control Protocol [Will_Lahr] [Will_Lahr] Defined TXT keys: None +# home-sharing iTunes Home Sharing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, hQ, iTSh Version, MID, Database # ID, dmb, Version, OSsi, hG, hC, Machine ID -# homeauto iDo Technology Home [Tony_de_Rijk] [Tony_de_Rijk] Defined TXT keys: None +# homeauto iDo Technology Home [Tony_de_Rijk] [Tony_de_Rijk] Defined TXT keys: None # Automation Protocol -# honeywell-vid udp Honeywell Video Systems [Shankar_Prasad] [Shankar_Prasad] Defined TXT keys: None -# hotwayd Hotwayd Defined TXT keys: None -# howdy Howdy messaging and [Ozate_Inc] [Joseph_Sickel] 2011-10-12 Defined TXT keys: None +# honeywell-vid udp Honeywell Video Systems [Shankar_Prasad] [Shankar_Prasad] Defined TXT keys: None +# hotwayd Hotwayd Defined TXT keys: None +# howdy Howdy messaging and [Ozate_Inc] [Joseph_Sickel] 2011-10-12 Defined TXT keys: None # notification protocol -# hpr-bldlnx HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 +# hpr-bldlnx HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 # Linux-based Systems -# hpr-bldwin HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista +# hpr-bldwin HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista # Microsoft Windows Systems # Identifies systems that -# hpr-db house databases for the [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, mstr +# hpr-db house databases for the [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, mstr # Remote Build System and # Remote Test System -# hpr-rep HP Remote Repository for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, official +# hpr-rep HP Remote Repository for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, official # Build and Test Results # HP Remote System that houses -# hpr-toollnx compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 +# hpr-toollnx compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 # Linux-based Systems # HP Remote System that houses -# hpr-toolwin compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista +# hpr-toolwin compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista # Microsoft Windows Systems -# hpr-tstlnx HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 +# hpr-tstlnx HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 # Linux-based Systems -# hpr-tstwin HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista +# hpr-tstwin HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista # Microsoft Windows Systems -# hs-off Hobbyist Software Off [Rob_Jonson] [Rob_Jonson] Defined TXT keys: None +# hs-off Hobbyist Software Off [Rob_Jonson] [Rob_Jonson] Defined TXT keys: None # Discovery -# htsp Home Tv Streaming Protocol [Andreas_Oman] [Andreas_Oman] Defined TXT keys: None +# htsp Home Tv Streaming Protocol [Andreas_Oman] [Andreas_Oman] Defined TXT keys: None # Web browsers like Safari and Internet Explorer (with the # Bonjour for Windows plugin) DO NOT browse for DNS-SD service # type "_https._tcp" in addition to browsing for "_http._tcp". @@ -16056,7 +16126,7 @@ # browser, the web server automatically redirects the user to # https://www.mybank.com/. Rather than having an entirely # different DNS-SD service type for https, we recommend using -# https tcp HTTP over SSL/TLS [Tim_Berners_Lee] [Tim_Berners_Lee] the same redirection mechanism: advertise a plain "http" +# https tcp HTTP over SSL/TLS [Tim_Berners_Lee] [Tim_Berners_Lee] the same redirection mechanism: advertise a plain "http" # service, which consists of nothing except an HTTP redirection # to the desired "https" URL. Work is currently being done on # adding mechanisms to HTTP and TLS to allow the server to tell @@ -16067,438 +16137,444 @@ # just another one of the things that is negotiated on a # per-connection basis (like content-type negotiation today) # rather than being an entirely separate thing. -# hyperstream Atempo HyperStream [Laurent_Charmet] [Laurent_Charmet] Defined TXT keys: version=x.y.z.w uuid=<36 bytes UUID string> -# deduplication server host=<real host name> -# ibiz iBiz Server [IGG_Software] [IGG_Software] Defined TXT keys: None -# ica-networking Image Capture Networking [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None -# ican Northrup Grumman/TASC/ICAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None -# Protocol -# ichalkboard iChalk [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None -# ichat iChat 1.0 [Jens_Alfke] [Jens_Alfke] Defined TXT keys: Proprietary -# iconquer iConquer [Andrew_Zamler_Carhar] [Andrew_Zamler_Carhar] Defined TXT keys: None -# idata Generic Data Acquisition and [Carson_Fenimore] [Carson_Fenimore] Defined TXT keys: None +# htvncconf udp HomeTouch Vnc Configuration [Yuval_Rakavy] [Yuval_Rakavy] 2012-07-10 Defined TXT keys: None +# hyperstream Atempo HyperStream [Laurent_Charmet] [Laurent_Charmet] Defined TXT keys: version=x.y.z.w uuid=<36 bytes UUID string> +# deduplication server host=<real host name> +# ibiz iBiz Server [IGG_Software] [IGG_Software] Defined TXT keys: None +# ica-networking Image Capture Networking [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None +# ican Northrup Grumman/TASC/ICAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None +# Protocol +# ichalkboard iChalk [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None +# ichat iChat 1.0 [Jens_Alfke] [Jens_Alfke] Defined TXT keys: Proprietary +# iconquer iConquer [Andrew_Zamler_Carhar] [Andrew_Zamler_Carhar] Defined TXT keys: None +# idata Generic Data Acquisition and [Carson_Fenimore] [Carson_Fenimore] Defined TXT keys: None # Control Protocol -# idsync SplashID Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary +# idsync SplashID Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary # Service -# ifolder Published iFolder [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? -# ihouse Idle Hands iHouse Protocol [Toby_Smith] [Toby_Smith] Defined TXT keys: None -# ii-drills Instant Interactive Drills [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None -# ii-konane Instant Interactive Konane [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None -# ilynx iLynX [iOS_Software] [iOS_Software] Defined TXT keys: None -# imidi iMidi [Robert_Grant] [Robert_Grant] Defined TXT keys: None -# indigo-dvr Indigo Security Digital [Haram_Lee] [Haram_Lee] Defined TXT keys: Proprietary +# ifolder Published iFolder [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? +# ihouse Idle Hands iHouse Protocol [Toby_Smith] [Toby_Smith] Defined TXT keys: None +# ii-drills Instant Interactive Drills [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None +# ii-konane Instant Interactive Konane [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None +# ilynx iLynX [iOS_Software] [iOS_Software] Defined TXT keys: None +# imidi iMidi [Robert_Grant] [Robert_Grant] Defined TXT keys: None +# indigo-dvr Indigo Security Digital [Haram_Lee] [Haram_Lee] Defined TXT keys: Proprietary # Video Recorders -# infboard tcp InfBoard interactive [Eric_Sean_Conner] [Eric_Sean_Conner] 2011-10-17 Defined TXT keys: Proprietary +# infboard tcp InfBoard interactive [Eric_Sean_Conner] [Eric_Sean_Conner] 2011-10-17 Defined TXT keys: Proprietary # whiteboard protocol -# inova-ontrack Inova Solutions OnTrack Defined TXT keys: None +# inova-ontrack Inova Solutions OnTrack Defined TXT keys: None # Display Protocol -# idcws Intermec Device [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: version=<x.xx> +# idcws Intermec Device [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: version=<x.xx> # Configuration Web Services -# iota tcp iotaMed medical records [MITM] [Martin_Wehlou] 2011-10-18 Defined TXT keys: none +# iota tcp iotaMed medical records [MITM] [Martin_Wehlou] 2011-10-18 Defined TXT keys: none # server -# ipbroadcaster IP Broadcaster [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None -# ipspeaker IP Speaker Control Protocol [Dan_Mahn] [Dan_Mahn] Defined TXT keys: None -# ir-hvac-000 tcp HVAC SMIL Server [Ingersoll_Rand_Inc] [John_Taylor] 2011-09-28 Defined TXT keys: None -# irelay iRelay application discovery [Marc_Diamante] [Marc_Diamante] Defined TXT keys: Proprietary +# ipbroadcaster IP Broadcaster [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None +# ipspeaker IP Speaker Control Protocol [Dan_Mahn] [Dan_Mahn] Defined TXT keys: None +# ir-hvac-000 tcp HVAC SMIL Server [Ingersoll_Rand_Inc] [John_Taylor] 2011-09-28 Defined TXT keys: None +# irelay iRelay application discovery [Marc_Diamante] [Marc_Diamante] Defined TXT keys: Proprietary # service -# irmc Intego Remote Management [Olivier_Delecluse] [Olivier_Delecluse] Defined TXT keys: RMC Client Version=<version>, MAC -# Console Address=<address> -# isparx iSparx [Philipp_Dreiss] [Philipp_Dreiss] Defined TXT keys: None -# ispq-vc iSpQ VideoChat [Chris_Silverberg] [Chris_Silverberg] Defined TXT keys: None -# ishare iShare [Steve_Dekorte] [Steve_Dekorte] Defined TXT keys: None -# isticky iSticky [Insist] [Insist] Defined TXT keys: None -# istorm iStorm [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None -# isynchronize tcp iSynchronize data [Smart_Apps_LTD] [Sergey_Bolshedvorsky] 2011-10-11 Defined TXT keys: none +# irmc Intego Remote Management [Olivier_Delecluse] [Olivier_Delecluse] Defined TXT keys: RMC Client Version=<version>, MAC +# Console Address=<address> +# irradiatd-iclip tcp iClip clipboard transfer [Irradiated_Software] [Thomas_Tempelmann] 2012-06-19 Defined TXT keys: none +# isparx iSparx [Philipp_Dreiss] [Philipp_Dreiss] Defined TXT keys: None +# ispq-vc iSpQ VideoChat [Chris_Silverberg] [Chris_Silverberg] Defined TXT keys: None +# ishare iShare [Steve_Dekorte] [Steve_Dekorte] Defined TXT keys: None +# isticky iSticky [Insist] [Insist] Defined TXT keys: None +# istorm iStorm [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None +# isynchronize tcp iSynchronize data [Smart_Apps_LTD] [Sergey_Bolshedvorsky] 2011-10-11 Defined TXT keys: none # synchronization protocol -# itap-publish tcp iTap Publishing Service [HLW_Software_Development_GmbH] [Michael_Lacher] 2011-10-11 Defined TXT keys: uuid=<unique server key> -# IT-IS International Ltd. Defined TXT keys: type=<product type> configuration=<product -# itis-device Device [Ben_Webster] [Ben_Webster] configuration> description=<human readable description> +# itap-publish tcp iTap Publishing Service [HLW_Software_Development_GmbH] [Michael_Lacher] 2011-10-11 Defined TXT keys: uuid=<unique server key> +# IT-IS International Ltd. Defined TXT keys: type=<product type> configuration=<product +# itis-device Device [Ben_Webster] [Ben_Webster] configuration> description=<human readable description> # version=<device and protocol version> -# itsrc iTunes Socket Remote Control [Kevin_Leacock] [Kevin_Leacock] Defined TXT keys: None -# ivef Inter VTS Exchange Format [Harry_ten_Berge] [Harry_ten_Berge] Defined TXT keys: None -# iwork iWork Server [IGG_Software] [IGG_Software] Defined TXT keys: None -# jcan Northrup Grumman/TASC/JCAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None +# itsrc iTunes Socket Remote Control [Kevin_Leacock] [Kevin_Leacock] Defined TXT keys: None +# ivef Inter VTS Exchange Format [Harry_ten_Berge] [Harry_ten_Berge] Defined TXT keys: None +# iwork iWork Server [IGG_Software] [IGG_Software] Defined TXT keys: None +# jcan Northrup Grumman/TASC/JCAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None # Protocol -# jeditx Jedit X [Satoshi_Matsumoto] [Satoshi_Matsumoto] Defined TXT keys: None -# jini Jini Service Discovery [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: None +# jeditx Jedit X [Satoshi_Matsumoto] [Satoshi_Matsumoto] Defined TXT keys: None +# jini Jini Service Discovery [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: None # Defined TXT keys: hash=<40hex characters> salt=<40hex -# jollys keychain cloud sync characters> uuid=<40hex characters> Example: -# jnx-kcsync tcp protocol [Patrick_Stein] [Patrick_Stein] 2011-10-24 hash=5e7580598c0d7064d4fc79faaeb42585e1a675f8 +# jollys keychain cloud sync characters> uuid=<40hex characters> Example: +# jnx-kcsync tcp protocol [Patrick_Stein] [Patrick_Stein] 2011-10-24 hash=5e7580598c0d7064d4fc79faaeb42585e1a675f8 # salt=f0164cb3a0c3d7efe75abea8fda86d2d56c8dda9 # uuid=db61dc092922252e45bbb264f59147138c7fd5fa -# jtag Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, +# jtag Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, # version=<firmware/instrument controller version> -# jukebox tcp Jukebox Request Service [Gary_Giebler_2] [Gary_Giebler_2] 2011-10-18 Defined TXT keys: None +# jukebox tcp Jukebox Request Service [Gary_Giebler_2] [Gary_Giebler_2] 2011-10-18 Defined TXT keys: None # KeynoteAccess is used for # sending remote -# keynoteaccess tcp requests/responses when [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None +# keynoteaccess tcp requests/responses when [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None # controlling a slideshow with # Keynote Remote # KeynotePairing is used to -# keynotepairing tcp pair Keynote Remote with [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None +# keynotepairing tcp pair Keynote Remote with [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None # Keynote -# ktp Kabira Transaction Platform [Ramiro_Sarmiento] [Ramiro_Sarmiento] Defined TXT keys: None -# labyrinth udp Labyrinth local multiplayer [Andreas_Alptun] [Andreas_Alptun] Defined TXT keys: None +# ktp Kabira Transaction Platform [Ramiro_Sarmiento] [Ramiro_Sarmiento] Defined TXT keys: None +# labyrinth udp Labyrinth local multiplayer [Andreas_Alptun] [Andreas_Alptun] Defined TXT keys: None # protocol -# lan2p Lan2P Peer-to-Peer Network [Ben_Guild] [Ben_Guild] Defined TXT keys: None +# lan2p Lan2P Peer-to-Peer Network [Ben_Guild] [Ben_Guild] Defined TXT keys: None # Protocol -# lapse Gawker [Phil_Piwonka] [Phil_Piwonka] Defined TXT keys: None -# leaf Lua Embedded Application [Ico_Doornekamp] [Ico_Doornekamp] Defined TXT keys: name=<readable name> product=<product -# Framework name/model> version=<version number> -# lexicon Lexicon Vocabulary Sharing [Jacob_Godwin_Jones] [Jacob_Godwin_Jones] Defined TXT keys: None -# liaison Liaison [Brian_Cully] [Brian_Cully] Defined TXT keys: None +# lapse Gawker [Phil_Piwonka] [Phil_Piwonka] Defined TXT keys: None +# leaf Lua Embedded Application [Ico_Doornekamp] [Ico_Doornekamp] Defined TXT keys: name=<readable name> product=<product +# Framework name/model> version=<version number> +# lexicon Lexicon Vocabulary Sharing [Jacob_Godwin_Jones] [Jacob_Godwin_Jones] Defined TXT keys: None +# liaison Liaison [Brian_Cully] [Brian_Cully] Defined TXT keys: None # Delicious Library 2 -# library Collection Data Sharing [William_Shipley] [William_Shipley] Defined TXT keys: None +# library Collection Data Sharing [William_Shipley] [William_Shipley] Defined TXT keys: None # Protocol # Protocol for setup and -# libratone control of Libratone [Libratone_AS] [Claus_Jensen] 2011-10-27 Defined TXT keys: None +# libratone control of Libratone [Libratone_AS] [Claus_Jensen] 2011-10-27 Defined TXT keys: None # products -# licor LI-COR Biosciences [Software_LI-COR_Biosciences] [Kevin_Ediger] 2011-10-18 Defined TXT keys: None +# licor LI-COR Biosciences [Software_LI-COR_Biosciences] [Kevin_Ediger] 2011-10-18 Defined TXT keys: None # instrument discovery -# llrp-secure RFID reader Low Level Reader [Jason_Schoon_2] [Jason_Schoon_2] Defined TXT keys: None +# llrp-secure RFID reader Low Level Reader [Jason_Schoon_2] [Jason_Schoon_2] Defined TXT keys: None # Protocol over SSL/TLS -# lobby Gobby [Gobby_0x539] [Gobby_0x539] Defined TXT keys: None -# logicnode udp Logic Pro Distributed Audio [Nikolaus_Gerteis] [Nikolaus_Gerteis] Defined TXT keys: None -# lonbridge Echelon LonBridge Server [Rich_Blomseth] [Rich_Blomseth] Defined TXT keys: None -# lontalk LonTalk over IP (ANSI 852) [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None -# lonworks Echelon LNS Remote Client [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None -# lsys-appserver Linksys One Application [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: path=value (relative URL) engname=value -# Server API (string) -# lsys-camera Linksys One Camera API [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: brand=value (string) model=value (string) +# lobby Gobby [Gobby_0x539] [Gobby_0x539] Defined TXT keys: None +# logicnode udp Logic Pro Distributed Audio [Nikolaus_Gerteis] [Nikolaus_Gerteis] Defined TXT keys: None +# lonbridge Echelon LonBridge Server [Rich_Blomseth] [Rich_Blomseth] Defined TXT keys: None +# lontalk LonTalk over IP (ANSI 852) [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None +# lonworks Echelon LNS Remote Client [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None +# lsys-appserver Linksys One Application [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: path=value (relative URL) engname=value +# Server API (string) +# lsys-camera Linksys One Camera API [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: brand=value (string) model=value (string) # version=value (string) # Defined TXT keys: model=value (string) serial=value (sring) -# lsys-ezcfg LinkSys EZ Configuration [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) +# lsys-ezcfg LinkSys EZ Configuration [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) # ifversion=value (string) type=value (string) mac=value (12 # hex digits) -# LinkSys Operations, Defined TXT keys: model=value (string) serial=value (sring) -# lsys-oamp Administration, Management, [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) -# and Provisioning ifversion=value (string) type=value (string) mac=value (12 +# LinkSys Operations, Defined TXT keys: model=value (string) serial=value (sring) +# lsys-oamp Administration, Management, [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) +# and Provisioning ifversion=value (string) type=value (string) mac=value (12 # hex digits) # A protocol to remotely -# lumiere tcp control DMX512 devices over [Gangsta_Ltd] [Jean-Charles_Boude] 2011-10-13 Defined TXT keys: None +# lumiere tcp control DMX512 devices over [Gangsta_Ltd] [Jean-Charles_Boude] 2011-10-13 Defined TXT keys: None # the network -# lumis-lca tcp Lumis Cache Appliance [Lumis] [Rodrigo_Terra] 2011-10-24 Defined TXT keys: none +# lumis-lca tcp Lumis Cache Appliance [Lumis] [Rodrigo_Terra] 2011-10-24 Defined TXT keys: none # Protocol -# lux-dtp Lux Solis Data Transport [Laurence_Flath] [Laurence_Flath] Defined TXT keys: None +# lux-dtp Lux Solis Data Transport [Laurence_Flath] [Laurence_Flath] Defined TXT keys: None # Protocol -# lxi LXI [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: txtvers, *IDN?=<response defined by IEEE +# lxi LXI [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: txtvers, *IDN?=<response defined by IEEE # 488; e.g., manufacturer, model, serial number, version> -# lyrics iPod Lyrics Service [Gary_Giebler] [Gary_Giebler] Defined TXT keys: Proprietary -# macfoh MacFOH [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-admin MacFOH admin services [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-audio udp MacFOH audio stream [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-events udp MacFOH show control events [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-data udp MacFOH realtime data [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-db MacFOH database [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macfoh-remote MacFOH Remote [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None -# macminder Mac Minder [Luma_Code] [Luma_Code] Defined TXT keys: None -# maestro Maestro Music Sharing [Luke_Steffen] [Luke_Steffen] Defined TXT keys: None -# Service -# magicdice Magic Dice Game Protocol [Mike_Yenco] [Mike_Yenco] Defined TXT keys: None -# mandos Mandos Password Server [Mandos_Maintainers] [Mandos_Maintainers] Defined TXT keys: None -# matrix MATRIX Remote AV Switching [Ken_Jibiki] [Ken_Jibiki] Defined TXT keys: None -# mavlink tcp MAVLink Micro Air Vehicle [Roderick_Mann] [Roderick_Mann] 2011-10-20 Defined TXT keys: 0 +# lyrics iPod Lyrics Service [Gary_Giebler] [Gary_Giebler] Defined TXT keys: Proprietary +# macfoh MacFOH [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-admin MacFOH admin services [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-audio udp MacFOH audio stream [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-events udp MacFOH show control events [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-data udp MacFOH realtime data [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-db MacFOH database [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macfoh-remote MacFOH Remote [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None +# macminder Mac Minder [Luma_Code] [Luma_Code] Defined TXT keys: None +# maestro Maestro Music Sharing [Luke_Steffen] [Luke_Steffen] Defined TXT keys: None +# Service +# magicdice Magic Dice Game Protocol [Mike_Yenco] [Mike_Yenco] Defined TXT keys: None +# mandos Mandos Password Server [Mandos_Maintainers] [Mandos_Maintainers] Defined TXT keys: None +# matrix MATRIX Remote AV Switching [Ken_Jibiki] [Ken_Jibiki] Defined TXT keys: None +# mavlink tcp MAVLink Micro Air Vehicle [Roderick_Mann] [Roderick_Mann] 2011-10-20 Defined TXT keys: 0 # Communication Protocol -# mbconsumer MediaBroker++ Consumer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None -# mbproducer MediaBroker++ Producer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None -# mbserver MediaBroker++ Server [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None -# mconnect ClairMail Connect [Sachin_Desai] [Sachin_Desai] Defined TXT keys: None -# mcrcp MediaCentral [equinux] [equinux] Defined TXT keys: None +# mbconsumer MediaBroker++ Consumer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None +# mbproducer MediaBroker++ Producer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None +# mbserver MediaBroker++ Server [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None +# mconnect ClairMail Connect [Sachin_Desai] [Sachin_Desai] Defined TXT keys: None +# mcrcp MediaCentral [equinux] [equinux] Defined TXT keys: None # MediaBoardONE Asset and -# mediaboard1 Information Manager data [Thomas_K_Fischer] [Thomas_K_Fischer] Defined TXT keys: None +# mediaboard1 Information Manager data [Thomas_K_Fischer] [Thomas_K_Fischer] Defined TXT keys: None # sharing and synchronization # protocol -# mediatap tcp Mediatap streaming protocol [Mediatap_GbR] [Mario_Poerner] 2011-10-11 Defined TXT keys: Proprietary -# mesamis Mes Amis [David_Priest] [David_Priest] Defined TXT keys: None -# mi-raysat Mental Ray for Maya [Autodesk] [Autodesk] Defined TXT keys: None -# modolansrv modo LAN Services [Matt_Craig] [Matt_Craig] Defined TXT keys: None -# moneysync SplashMoney Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary +# mediatap tcp Mediatap streaming protocol [Mediatap_GbR] [Mario_Poerner] 2011-10-11 Defined TXT keys: Proprietary +# mesamis Mes Amis [David_Priest] [David_Priest] Defined TXT keys: None +# mi-raysat Mental Ray for Maya [Autodesk] [Autodesk] Defined TXT keys: None +# modolansrv modo LAN Services [Matt_Craig] [Matt_Craig] Defined TXT keys: None +# moneysync SplashMoney Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary # Service # MoneyWorks Gold and -# moneyworks MoneyWorks Datacentre [Rowan_Daniell] [Rowan_Daniell] Defined TXT keys: None +# moneyworks MoneyWorks Datacentre [Rowan_Daniell] [Rowan_Daniell] Defined TXT keys: None # network service -# moodring Bonjour Mood Ring tutorial [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: txtvers=1 mood=<ascii digit from 0-4> +# moodring Bonjour Mood Ring tutorial [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: txtvers=1 mood=<ascii digit from 0-4> # program -# mother Mother script server [Jonathan] [Jonathan] Defined TXT keys: user, ssl +# mother Mother script server [Jonathan] [Jonathan] Defined TXT keys: user, ssl # protocol -# movieslate MovieSlate digital [Cliff_Joyce] [Cliff_Joyce] Defined TXT keys: Proprietary +# movieslate MovieSlate digital [Cliff_Joyce] [Cliff_Joyce] Defined TXT keys: Proprietary # clapperboard -# mp3sushi MP3 Sushi [Alexandre_Carlhian] [Alexandre_Carlhian] Defined TXT keys: None -# mqtt IBM MQ Telemetry Transport [AndySC] [AndySC] Defined TXT keys: topics=<open topic to subscribe to for -# Broker information>, eg topic=/info -# mslingshot Martian SlingShot [Martin_Technology] [Martin_Technology] Defined TXT keys: displayName, passwordRequired, +# mp3sushi MP3 Sushi [Alexandre_Carlhian] [Alexandre_Carlhian] Defined TXT keys: None +# mqtt IBM MQ Telemetry Transport [AndySC] [AndySC] Defined TXT keys: topics=<open topic to subscribe to for +# Broker information>, eg topic=/info +# mslingshot Martian SlingShot [Martin_Technology] [Martin_Technology] Defined TXT keys: displayName, passwordRequired, # acceptsUpdates -# mumble Mumble VoIP communication [Thorvald_Natvig] [Thorvald_Natvig] Defined TXT keys: None +# mumble Mumble VoIP communication [Thorvald_Natvig] [Thorvald_Natvig] Defined TXT keys: None # protocol -# musicmachine Protocol for a distributed [Johan_Mjones] [Johan_Mjones] Defined TXT keys: apiversion, passreq +# musicmachine Protocol for a distributed [Johan_Mjones] [Johan_Mjones] Defined TXT keys: apiversion, passreq # music playing service -# mysync MySync Protocol [Martin_Redington] [Martin_Redington] Defined TXT keys: None -# mttp MenuTunes Sharing [iThink_Software] [iThink_Software] Defined TXT keys: None -# mxim-art2 Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary +# mysync MySync Protocol [Martin_Redington] [Martin_Redington] Defined TXT keys: None +# mttp MenuTunes Sharing [iThink_Software] [iThink_Software] Defined TXT keys: None +# mxim-art2 Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary # Automated Roadtest Mk II -# mxim-ice Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary +# mxim-ice Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary # In-circuit Emulator # Defined TXT keys: None mxs.system.id=<system id> -# mxs MatrixStore [Object_Matrix] [Object_Matrix] mxs.system.version=<system layer version> +# mxs MatrixStore [Object_Matrix] [Object_Matrix] mxs.system.version=<system layer version> # mxs.cluster.id=<cluster id the system belongs to> -# ncbroadcast Network Clipboard Broadcasts [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard +# 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 -# Transfers at thezaz.com> -# ncsyncserver Network Clipboard Sync [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard -# Server at thezaz.com> -# neoriders udp NeoRiders Client Discovery [Jesse_W_Towner] [Jesse_W_Towner] Defined TXT keys: None +# ncdirect Network Clipboard Direct [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard +# Transfers at thezaz.com> +# ncsyncserver Network Clipboard Sync [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard +# Server at thezaz.com> +# neoriders udp NeoRiders Client Discovery [Jesse_W_Towner] [Jesse_W_Towner] Defined TXT keys: None # Protocol -# netrestore NetRestore [Mike_Bombich] [Mike_Bombich] Defined TXT keys: message, status, progress -# netvu-video tcp AD Group NetVu Connected [AD_Holdings] [Kelvin_Lawson] 2011-10-11 Defined TXT keys: none +# netrestore NetRestore [Mike_Bombich] [Mike_Bombich] Defined TXT keys: message, status, progress +# netvu-video tcp AD Group NetVu Connected [AD_Holdings] [Kelvin_Lawson] 2011-10-11 Defined TXT keys: none # Video # Proprietary communication -# nextcap tcp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary +# nextcap tcp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary # solution # Proprietary communication -# nextcap udp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary +# nextcap udp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary # solution -# ni tcp National Instruments Network [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, DevClass, ProdId, ProdName, SerialNo, -# Device Status, ImgPath, Comment -# ni-rt tcp National Instruments [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, OS, OSVer, ProcArch +# ni tcp National Instruments Network [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, DevClass, ProdId, ProdName, SerialNo, +# Device Status, ImgPath, Comment +# ni-rt tcp National Instruments [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, OS, OSVer, ProcArch # Real-Time Target -# ni-sysapi tcp National Instruments System [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, Experts, Version +# ni-sysapi tcp National Instruments System [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, Experts, Version # API Service -# ntlx-arch American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, -# Archive Management Service serial -# American Dynamics Intellex Defined TXT keys: txtvers, macaddress, protovers, model, -# ntlx-ent Enterprise Management [Gary_Sands] [Gary_Sands] serial -# Service -# ntlx-video American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, -# Video Service serial, control, event -# ntx udp Tenasys [Carl_Ellis] [Carl_Ellis] Defined TXT keys: None -# obf Observations Framework [Matthew_Baker] [Matthew_Baker] Defined TXT keys: version=<value> -# Means for clients to locate Defined TXT keys: txtvers='1' -# objective servers in an Objective [Marc_Bailey] [Marc_Bailey] type={'production'|'standby'|'test'|'demo'} -# (http://www.objective.com) protocol={['SOAP'],['CORBA']} transport=['iiop']|['http'] +# ntlx-arch American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, +# Archive Management Service serial +# American Dynamics Intellex Defined TXT keys: txtvers, macaddress, protovers, model, +# ntlx-ent Enterprise Management [Gary_Sands] [Gary_Sands] serial +# Service +# ntlx-video American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, +# Video Service serial, control, event +# ntx udp Tenasys [Carl_Ellis] [Carl_Ellis] Defined TXT keys: None +# obf Observations Framework [Matthew_Baker] [Matthew_Baker] Defined TXT keys: version=<value> +# Means for clients to locate Defined TXT keys: txtvers='1' +# 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. -# 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 -# odisk Optical Disk Sharing [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX -# officetime-sync OfficeTime Synchronization [Support] [Support] Defined TXT keys: None +# 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 +# odisk Optical Disk Sharing [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX +# officetime-sync OfficeTime Synchronization [Support] [Support] Defined TXT keys: None # Protocol -# ofocus-conf OmniFocus setting [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: None +# ofocus-conf OmniFocus setting [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: None # configuration -# ofocus-sync OmniFocus document [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: Proprietary +# ofocus-sync OmniFocus document [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: Proprietary # synchronization -# olpc-activity1 udp One Laptop per Child [One_Laptop_per_Child] [One_Laptop_per_Child] Defined TXT keys: Shared_Activity_Protocol_1.0 +# olpc-activity1 udp One Laptop per Child [One_Laptop_per_Child] [One_Laptop_per_Child] Defined TXT keys: Shared_Activity_Protocol_1.0 # activity -# oma-bcast-sg OMA BCAST Service Guide [Stefan_Ekenberg] [Stefan_Ekenberg] Defined TXT keys: None +# oma-bcast-sg OMA BCAST Service Guide [Stefan_Ekenberg] [Stefan_Ekenberg] Defined TXT keys: None # Discovery Service # Open Mobile Alliance (OMA) -# omadm-bootstrap tcp Device Management (DM) [Open_Mobile_Alliance] [Open_Mobile_Alliance_Device_Management_DM_Working_Group] 2011-08-19 Defined TXT keys: None +# omadm-bootstrap tcp Device Management (DM) [Open_Mobile_Alliance] [Open_Mobile_Alliance_Device_Management_DM_Working_Group] 2011-08-19 Defined TXT keys: None # Bootstrap Server Discovery # Service -# omni-bookmark OmniWeb [The_Omni_Group] [The_Omni_Group] Defined TXT keys: None +# omni-bookmark OmniWeb [The_Omni_Group] [The_Omni_Group] Defined TXT keys: None # Service for remote control -# omni-live of Omnisphere virtual [Glenn_Olander_2] [Glenn_Olander_2] Defined TXT keys: omni-livetxt.html +# omni-live of Omnisphere virtual [Glenn_Olander_2] [Glenn_Olander_2] Defined TXT keys: omni-livetxt.html # instrument -# openbase OpenBase SQL Defined TXT keys: None -# opencu udp Conferencing Protocol [Marc_Manthey_2] [Marc_Manthey_2] Defined TXT keys: None -# oprofile oprofile server protocol [Rob_Bradford] [Rob_Bradford] Defined TXT keys: None -# oscit udp Open Sound Control Interface [Gaspard_Bucher] [Gaspard_Bucher] Defined TXT keys: None +# openbase OpenBase SQL Defined TXT keys: None +# opencu udp Conferencing Protocol [Marc_Manthey_2] [Marc_Manthey_2] Defined TXT keys: None +# oprofile oprofile server protocol [Rob_Bradford] [Rob_Bradford] Defined TXT keys: None +# oscit udp Open Sound Control Interface [Gaspard_Bucher] [Gaspard_Bucher] Defined TXT keys: None # Transfer -# ovready ObjectVideo OV Ready [Gary_Myers] [Gary_Myers] Defined TXT keys: txtvers, protovers +# ovready ObjectVideo OV Ready [Gary_Myers] [Gary_Myers] Defined TXT keys: txtvers, protovers # Protocol -# owhttpd OWFS (1-wire file system) [Paul_H_Alfille] [Paul_H_Alfille] Defined TXT keys: txtvers +# owhttpd OWFS (1-wire file system) [Paul_H_Alfille] [Paul_H_Alfille] Defined TXT keys: txtvers # web server -# parentcontrol Remote Parental Controls [John_Scalo] [John_Scalo] Defined TXT keys: None -# passwordwallet PasswordWallet Data [Sanford_Selznick] [Sanford_Selznick] Defined TXT keys: None +# parentcontrol Remote Parental Controls [John_Scalo] [John_Scalo] Defined TXT keys: None +# passwordwallet PasswordWallet Data [Sanford_Selznick] [Sanford_Selznick] Defined TXT keys: None # Synchronization Protocol -# pcast Mac OS X Podcast Producer [Nick_Brosnahan] [Nick_Brosnahan] Defined TXT keys: None +# pcast Mac OS X Podcast Producer [Nick_Brosnahan] [Nick_Brosnahan] Defined TXT keys: None # Server -# p2pchat udp Peer-to-Peer Chat (Sample [Roger_Pantos] [Roger_Pantos] Defined TXT keys: None +# p2pchat udp Peer-to-Peer Chat (Sample [Roger_Pantos] [Roger_Pantos] Defined TXT keys: None # Java Bonjour application) -# 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 +# 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 -# parabay-p2p tcp Parabay P2P protocol [Vishnu_Varadaraj] [Vishnu_Varadaraj] Defined TXT keys: None -# parity tcp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary +# parabay-p2p tcp Parabay P2P protocol [Vishnu_Varadaraj] [Vishnu_Varadaraj] Defined TXT keys: None +# parity tcp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary # Radio - Intercom - Telefony) -# parity udp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary +# parity udp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary # Radio - Intercom - Telefony) -# pgpkey-hkp Horowitz Key Protocol (HKP) [Marc_Horowitz] [Marc_Horowitz] Defined TXT keys: None -# pgpkey-http PGP Keyserver using HTTP/1.1 [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP +# pgpkey-hkp Horowitz Key Protocol (HKP) [Marc_Horowitz] [Marc_Horowitz] Defined TXT keys: None +# pgpkey-http PGP Keyserver using HTTP/1.1 [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP # applications reside> normally: "path=/pks/" -# pgpkey-https PGP Keyserver using HTTPS [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP +# pgpkey-https PGP Keyserver using HTTPS [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP # applications reside> normally: "path=/pks/" -# pgpkey-ldap PGP Keyserver using LDAP [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: None -# pgpkey-mailto PGP Key submission using [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: user=<user portion of the mail address> +# pgpkey-ldap PGP Keyserver using LDAP [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: None +# pgpkey-mailto PGP Key submission using [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: user=<user portion of the mail address> # SMTP -# photoparata Photo Parata Event [Sam_Carleton] [Sam_Carleton] Defined TXT keys: None +# photoparata Photo Parata Event [Sam_Carleton] [Sam_Carleton] Defined TXT keys: None # Photography Software -# photosmithsync tcp Photosmith's iPad to [Photosmith] [Chris_Horne] 2011-10-27 Defined TXT keys: None +# photosmithsync tcp Photosmith's iPad to [Photosmith] [Chris_Horne] 2011-10-27 Defined TXT keys: None # Lightroom sync protocol -# pictua Pictua Intercommunication [Isaack_Rasmussen] [Isaack_Rasmussen] Defined TXT keys: None +# pictua Pictua Intercommunication [Isaack_Rasmussen] [Isaack_Rasmussen] Defined TXT keys: None # Protocol -# piesync pieSync Computer to Computer [Timothy_Wayper] [Timothy_Wayper] Defined TXT keys: None +# piesync pieSync Computer to Computer [Timothy_Wayper] [Timothy_Wayper] Defined TXT keys: None # Synchronization -# piu Pedestal Interface Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None +# piu Pedestal Interface Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None # RPM-PSI -# poch Parallel OperatiOn and [Dean_Dauger] [Dean_Dauger] Defined TXT keys: None +# poch Parallel OperatiOn and [Dean_Dauger] [Dean_Dauger] Defined TXT keys: None # Control Heuristic (Pooch) -# podcastproxy tcp Protocol for communication [Moritz_Schmale] [Moritz_Schmale] 2011-10-07 Defined TXT keys: None +# podcastproxy tcp Protocol for communication [Moritz_Schmale] [Moritz_Schmale] 2011-10-07 Defined TXT keys: None # between Podcast # Communication channel for -# pokeeye "Poke Eye" Elgato EyeTV [Kristoffer_Lawson] [Kristoffer_Lawson] Defined TXT keys: None +# pokeeye "Poke Eye" Elgato EyeTV [Kristoffer_Lawson] [Kristoffer_Lawson] Defined TXT keys: None # remote controller -# powereasy-erp PowerEasy ERP [Ulaganathan_Sriramul] [Ulaganathan_Sriramul] Defined TXT keys: ip, port, name, instance, cgi-alias, +# powereasy-erp PowerEasy ERP [Ulaganathan_Sriramul] [Ulaganathan_Sriramul] Defined TXT keys: ip, port, name, instance, cgi-alias, # major-version, minor-version, custom -# powereasy-pos PowerEasy Point of Sale [Murthy_Parthasarathi] [Murthy_Parthasarathi] Defined TXT keys: ip, port, type, device-id, major-version, +# powereasy-pos PowerEasy Point of Sale [Murthy_Parthasarathi] [Murthy_Parthasarathi] Defined TXT keys: ip, port, type, device-id, major-version, # minor-version, custom -# pplayer-ctrl Piano Player Remote Control [Juraj_Zopp] [Juraj_Zopp] Defined TXT keys: Proprietary +# pplayer-ctrl Piano Player Remote Control [Juraj_Zopp] [Juraj_Zopp] Defined TXT keys: Proprietary # Defined TXT keys: See # http://www.xmpp.org/registrar/linklocal.html Note: # Registration updated May 2007. Was formerly listed as "iChat # AV" (Apple's IM client for Mac OS X) with TXT keys: txtvers, # port.p2pj, phsh, vc, 1st, AIM, msg, status, last When first # shipped in Mac OS X 10.2, iChat's peer-to-peer messaging -# presence Peer-to-peer messaging / [XMPP_Registrar] [XMPP_Registrar] protocol was created to solve the problem of serverless -# Link-Local Messaging messaging between peers on the same link. However, there is +# presence Peer-to-peer messaging / [XMPP_Registrar] [XMPP_Registrar] protocol was created to solve the problem of serverless +# Link-Local Messaging messaging between peers on the same link. However, there is # nothing inherent in the protocol that limits it to being only # link-local; it was simply an artifact of iChat in Mac OS X # 10.2 using link-local Multicast DNS to discover peers. With # the advent of Wide-Area DNS-SD, it is also possible to use # iChat's peer-to-peer messaging between machines on different # links. -# print-caps Retrieve a description of a [Troy_Bergstrand] [Troy_Bergstrand] Defined TXT keys: None +# print-caps Retrieve a description of a [Troy_Bergstrand] [Troy_Bergstrand] Defined TXT keys: None # device's print capabilities # Port to allow for # administration and control -# printopia tcp of "Printopia" application [Ecamm_Network_LLC] [Chris_Kent] 2011-10-24 Defined TXT keys: uuid = 55A346CB-C87C-4569-A4B0-248E6388893B -# software, which provides vers = 1.0 +# printopia tcp of "Printopia" application [Ecamm_Network_LLC] [Chris_Kent] 2011-10-24 Defined TXT keys: uuid = 55A346CB-C87C-4569-A4B0-248E6388893B +# software, which provides vers = 1.0 # printing services to mobile # users -# profilemac Profile for Mac medical [David_Sinclair_2] [David_Sinclair_2] Defined TXT keys: None +# profilemac Profile for Mac medical [David_Sinclair_2] [David_Sinclair_2] Defined TXT keys: None # practice management software -# prolog Prolog [Mike_Brady] [Mike_Brady] Defined TXT keys: version=<version number> -# protonet Protonet node and service [Ali_Jelveh] [Ali_Jelveh] Defined TXT keys: version, notes +# prolog Prolog [Mike_Brady] [Mike_Brady] Defined TXT keys: version=<version number> +# protonet Protonet node and service [Ali_Jelveh] [Ali_Jelveh] Defined TXT keys: version, notes # discovery protocol -# psap udp Progal Service Advertising [Soren_Weber] [Soren_Weber] Defined TXT keys: c0, c1, ..., cn +# psap udp Progal Service Advertising [Soren_Weber] [Soren_Weber] Defined TXT keys: c0, c1, ..., cn # Protocol # Physical Security -# psia Interoperability Alliance [Frank_Yeh] [Frank_Yeh] Defined TXT keys: txtvers, protovers +# psia Interoperability Alliance [Frank_Yeh] [Frank_Yeh] Defined TXT keys: txtvers, protovers # Protocol -# pstmailsync tcp File synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> +# pstmailsync tcp File synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> # protocol for Pst Mail Sync -# pstmailsync-ssl tcp Secured file synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> +# pstmailsync-ssl tcp Secured file synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> # protocol for Pst Mail Sync -# ptnetprosrv2 PTNetPro Service [Apple_Computer] [Apple_Computer] Defined TXT keys: None Profiling and performance analysis +# ptnetprosrv2 PTNetPro Service [Apple_Computer] [Apple_Computer] Defined TXT keys: None Profiling and performance analysis # protocol for Shark 4.0 and BigTop. -# ptp-init tcp Picture Transfer [Canon_Inc] [Tatsuhiko_Sakai] 2011-10-03 Defined TXT keys: srvver, mn, mf, md, srv, tid +# ptp-init tcp Picture Transfer [Canon_Inc] [Tatsuhiko_Sakai] 2011-10-03 Defined TXT keys: srvver, mn, mf, md, srv, tid # Protocol(PTP) Initiator -# ptp-req PTP Initiation Request [Mark_Wood] [Mark_Wood] Defined TXT keys: txtvers, guid, c0, c1, c2, ..., where the -# Protocol number of c_n attributes is variable -# puzzle Protocol used for puzzle [Michael_Thomason] [Michael_Thomason] Defined TXT keys: None +# ptp-req PTP Initiation Request [Mark_Wood] [Mark_Wood] Defined TXT keys: txtvers, guid, c0, c1, c2, ..., where the +# Protocol number of c_n attributes is variable +# puzzle Protocol used for puzzle [Michael_Thomason] [Michael_Thomason] Defined TXT keys: None # games -# pvaccess tcp Experimental Physics and [Matej_Sekoranja] [Matej_Sekoranja] 2012-03-23 Defined TXT keys: None +# pvaccess tcp Experimental Physics and [Matej_Sekoranja] [Matej_Sekoranja] 2012-03-23 Defined TXT keys: None # Industrial Control System -# qbox QBox Appliance Locator [Geoff_Back_4] [Geoff_Back_4] Defined TXT keys: None -# qttp QuickTime Transfer Protocol [Stuart_Cheshire_5] [Stuart_Cheshire_5] Defined TXT keys: u=<username> p=<password> path=<path to +# qbox QBox Appliance Locator [Geoff_Back_4] [Geoff_Back_4] Defined TXT keys: None +# qttp QuickTime Transfer Protocol [Stuart_Cheshire_5] [Stuart_Cheshire_5] Defined TXT keys: u=<username> p=<password> path=<path to # document> (Same as for _http._tcp) -# quad tcp Distributed Game Data [Niall_Hogg] [Niall_Hogg] 2011-10-25 Defined TXT keys: Proprietary -# quinn Quinn Game Server [Simon_Haertel] [Simon_Haertel] Defined TXT keys: None -# rakket Rakket Client Protocol [Orion_Reblitz_Richar] [Orion_Reblitz_Richar] Defined TXT keys: None -# radiotag RadioTAG: Event tagging for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None +# quad tcp Distributed Game Data [Niall_Hogg] [Niall_Hogg] 2011-10-25 Defined TXT keys: Proprietary +# quinn Quinn Game Server [Simon_Haertel] [Simon_Haertel] Defined TXT keys: None +# rakket Rakket Client Protocol [Orion_Reblitz_Richar] [Orion_Reblitz_Richar] Defined TXT keys: None +# radiotag RadioTAG: Event tagging for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None # radio services -# radiovis RadioVIS: Visualisation for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None +# radiovis RadioVIS: Visualisation for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None # radio services # RadioEPG: Electronic -# radioepg Programme Guide for radio [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None +# radioepg Programme Guide for radio [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None # services -# radioport tcp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE -# radioport udp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE -# raop Remote Audio Output Protocol [BonjourDev] [BonjourDev] 2011-10-14 Defined TXT keys: None +# radioport tcp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE +# radioport udp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE +# raop Remote Audio Output Protocol [BonjourDev] [BonjourDev] 2011-10-14 Defined TXT keys: None # (AirTunes) -# rbr RBR Instrument Communication [Greg_Johnson] [Greg_Johnson] Defined TXT keys: None -# rce PowerCard [DeVoeSquared] [DeVoeSquared] Defined TXT keys: None -# rdp Windows Remote Desktop [Jugaari] [Jugaari] Defined TXT keys: None -# Protocol -# realplayfavs RealPlayer Shared Favorites [RealNetworks] [RealNetworks] Defined TXT keys: None -# recipe-box tcp The Recipe Box Exchange [Corpus_Collusion] [Kathy_Tafel] 2011-08-23 Defined TXT keys: txtvers -# recipe-sharing tcp Recipe Sharing Protocol [Daniel_G_Taylor] [Daniel_G_Taylor] 2007-11 Defined TXT keys: +# rbr RBR Instrument Communication [Greg_Johnson] [Greg_Johnson] Defined TXT keys: None +# rce PowerCard [DeVoeSquared] [DeVoeSquared] Defined TXT keys: None +# rdp Windows Remote Desktop [Jugaari] [Jugaari] Defined TXT keys: None +# Protocol +# realplayfavs RealPlayer Shared Favorites [RealNetworks] [RealNetworks] Defined TXT keys: None +# recipe-box tcp The Recipe Box Exchange [Corpus_Collusion] [Kathy_Tafel] 2011-08-23 Defined TXT keys: txtvers +# recipe-sharing tcp Recipe Sharing Protocol [Daniel_G_Taylor] [Daniel_G_Taylor] 2007-11 Defined TXT keys: # [http://www.recipemanager.org/rsp/rsp10draft.html#dnssd] -# Remote Device Control Defined TXT keys: txtvers=<TXT record version tag> -# remote Protocol [Gregory_Dudek] [Gregory_Dudek] protovers=<protocol vesion number> forground=<primary device +# Remote Device Control Defined TXT keys: txtvers=<TXT record version tag> +# remote Protocol [Gregory_Dudek] [Gregory_Dudek] protovers=<protocol vesion number> forground=<primary device # or system> version=<firmware/instrument controller version> -# remoteburn LaCie Remote Burn [Serge_DE_LUCA] [Serge_DE_LUCA] Defined TXT keys: server_version, min_client_version -# renderpipe ARTvps RenderDrive/PURE [Andrew_Hoddinott] [Andrew_Hoddinott] Defined TXT keys: None +# remoteburn LaCie Remote Burn [Serge_DE_LUCA] [Serge_DE_LUCA] Defined TXT keys: server_version, min_client_version +# renderpipe ARTvps RenderDrive/PURE [Andrew_Hoddinott] [Andrew_Hoddinott] Defined TXT keys: None # Renderer Protocol -# rendezvouspong RendezvousPong [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None -# renkara-sync Renkara synchronization [Michael_J_Primeaux] [Michael_J_Primeaux] Defined TXT keys: None +# rendezvouspong RendezvousPong [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None +# renkara-sync Renkara synchronization [Michael_J_Primeaux] [Michael_J_Primeaux] Defined TXT keys: None # protocol -# resol-vbus RESOL VBus [Daniel_Wippermann] [Daniel_Wippermann] Defined TXT keys: None -# retrospect Retrospect backup and [Michael_Marks] [Michael_Marks] Defined TXT keys: None +# resol-vbus RESOL VBus [Daniel_Wippermann] [Daniel_Wippermann] Defined TXT keys: None +# retrospect Retrospect backup and [Michael_Marks] [Michael_Marks] Defined TXT keys: None # restore service -# Remote Frame Buffer Client Defined TXT keys: server=dns-name/ip-address:port of -# rfbc (Used by VNC viewers in [Ole_Morten_Duesund] [Ole_Morten_Duesund] currently displayed VNC server. Empty if not showing -# listen-mode) anything/available. -# rfid RFID Reader Mach1(tm) [Paul_Dietrich] [Paul_Dietrich] Defined TXT keys: None -# Protocol -# rgb tcp RGB Spectrum Device [RGB_Spectrum] [Steve_Hershey] 2011-10-10 Defined TXT keys: Keyboard, Mouse, Option1, Option2, Option3, -# Discovery Option4, ModelName -# riousbprint Remote I/O USB Printer [Rob_Newberry] [Rob_Newberry] Defined TXT keys: See BonjourPrinting.pdf. -# Protocol -# roku-rcp Roku Control Protocol [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 -# rql RemoteQuickLaunch [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None -# rsmp-server Remote System Management [Geoff_Back_3] [Geoff_Back_3] Defined TXT keys: apiver=<major.minor> +# Remote Frame Buffer Client Defined TXT keys: server=dns-name/ip-address:port of +# rfbc (Used by VNC viewers in [Ole_Morten_Duesund] [Ole_Morten_Duesund] currently displayed VNC server. Empty if not showing +# listen-mode) anything/available. +# rfid RFID Reader Mach1(tm) [Paul_Dietrich] [Paul_Dietrich] Defined TXT keys: None +# Protocol +# rgb tcp RGB Spectrum Device [RGB_Spectrum] [Steve_Hershey] 2011-10-10 Defined TXT keys: Keyboard, Mouse, Option1, Option2, Option3, +# Discovery Option4, ModelName +# riousbprint Remote I/O USB Printer [Rob_Newberry] [Rob_Newberry] Defined TXT keys: See BonjourPrinting.pdf. +# Protocol +# roku-rcp Roku Control Protocol [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 +# rql RemoteQuickLaunch [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None +# rsmp-server Remote System Management [Geoff_Back_3] [Geoff_Back_3] Defined TXT keys: apiver=<major.minor> # Protocol (Server Instance) -# rubygems RubyGems GemServer [Rich_Kilmer] [Rich_Kilmer] Defined TXT keys: None -# safarimenu Safari Menu [Jesus_De_Meyer] [Jesus_De_Meyer] Defined TXT keys: None -# sallingbridge Salling Clicker Sharing [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None -# sallingclicker Salling Clicker Service [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None +# rubygems RubyGems GemServer [Rich_Kilmer] [Rich_Kilmer] Defined TXT keys: None +# rym-rrc tcp Raymarine remote control [Raymarine_UK_Limited] [Geoffrey_Beer] 2012-05-24 2012-06-04 Defined TXT keys: raymarine-mfd-rrc-version, +# protocol raymarine-mfd-model, raymarine-mfd-serial +# safarimenu Safari Menu [Jesus_De_Meyer] [Jesus_De_Meyer] Defined TXT keys: None +# sallingbridge Salling Clicker Sharing [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None +# sallingclicker Salling Clicker Service [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None # Salutafugi Peer-To-Peer Java -# salutafugijms Message Service [David_Walend] [David_Walend] Defined TXT keys: SalutaProperties +# salutafugijms Message Service [David_Walend] [David_Walend] Defined TXT keys: SalutaProperties # Implementation -# sandvox Sandvox [Karelia_Software] [Karelia_Software] Defined TXT keys: None -# sc-golf StrawberryCat Golf Protocol [Phil_Willoughby] [Phil_Willoughby] Defined TXT keys: None -# scanner Bonjour Scanning [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None -# schick Schick [Heiko_Kretschmer] [Heiko_Kretschmer] Defined TXT keys: None -# scone Scone [James_Moore] [James_Moore] Defined TXT keys: None -# scpi-raw IEEE 488.2 (SCPI) Socket [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None -# scpi-telnet IEEE 488.2 (SCPI) Telnet [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None -# sdsharing Speed Download [Yazsoft] [Yazsoft] Defined TXT keys: None -# see SubEthaEdit 2 [TheCodingMonkeys] [TheCodingMonkeys] Defined TXT keys: txtvers=1, name=<Full Name>, userid=<User +# sandvox Sandvox [Karelia_Software] [Karelia_Software] Defined TXT keys: None +# savagesoft tcp Proprietary Client Server [Andy_Savage] [Andy_Savage] 2012-07-13 Defined TXT keys: None +# Protocol +# sc-golf StrawberryCat Golf Protocol [Phil_Willoughby] [Phil_Willoughby] Defined TXT keys: None +# scanner Bonjour Scanning [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None +# schick Schick [Heiko_Kretschmer] [Heiko_Kretschmer] Defined TXT keys: None +# scone Scone [James_Moore] [James_Moore] Defined TXT keys: None +# scpi-raw IEEE 488.2 (SCPI) Socket [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None +# scpi-telnet IEEE 488.2 (SCPI) Telnet [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None +# sdsharing Speed Download [Yazsoft] [Yazsoft] Defined TXT keys: None +# see SubEthaEdit 2 [TheCodingMonkeys] [TheCodingMonkeys] Defined TXT keys: txtvers=1, name=<Full Name>, userid=<User # ID>, version=2 -# seeCard seeCard [Stefan_Pantke] [Stefan_Pantke] Defined TXT keys: None -# senteo-http Senteo Assessment Software [Michael_Boyle] [Michael_Boyle] Defined TXT keys: None +# seeCard seeCard [Stefan_Pantke] [Stefan_Pantke] Defined TXT keys: None +# senteo-http Senteo Assessment Software [Michael_Boyle] [Michael_Boyle] Defined TXT keys: None # Protocol -# sentillion-vlc Sentillion Vault System [George_Hartz] [George_Hartz] Defined TXT keys: None -# sentillion-vlt Sentillion Vault Systems [George_Hartz] [George_Hartz] Defined TXT keys: None +# sentillion-vlc Sentillion Vault System [George_Hartz] [George_Hartz] Defined TXT keys: None +# sentillion-vlt Sentillion Vault Systems [George_Hartz] [George_Hartz] Defined TXT keys: None # Cluster -# sepvsync SEPV Application Data [Kazuya_Ogata] [Kazuya_Ogata] Defined TXT keys: Proprietary +# sepvsync SEPV Application Data [Kazuya_Ogata] [Kazuya_Ogata] Defined TXT keys: Proprietary # Synchronization Protocol -# serendipd serendiPd Shared Patches for [Hans_Christoph_Stein] [Hans_Christoph_Stein] Defined TXT keys: None +# serendipd serendiPd Shared Patches for [Hans_Christoph_Stein] [Hans_Christoph_Stein] Defined TXT keys: None # Pure Data -# servereye ServerEye AgentContainer [Andreas_Behr] [Andreas_Behr] Defined TXT keys: None +# servereye ServerEye AgentContainer [Andreas_Behr] [Andreas_Behr] Defined TXT keys: None # Communication Protocol -# servermgr Mac OS X Server Admin [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None -# services DNS Service Discovery [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD meta +# servermgr Mac OS X Server Admin [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None +# services DNS Service Discovery [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD meta # queries. -# sessionfs Session File Sharing [Anthony_Williams] [Anthony_Williams] Defined TXT keys: Text keys are the file extensions of any +# sessionfs Session File Sharing [Anthony_Williams] [Anthony_Williams] Defined TXT keys: Text keys are the file extensions of any # file the user plans to share, i.e. pdf, doc, mp3. -# sftp-ssh Secure File Transfer [Bryan_Cole] [Bryan_Cole] Defined TXT keys: u=<username> p=<password> path=<path> +# sftp-ssh Secure File Transfer [Bryan_Cole] [Bryan_Cole] Defined TXT keys: u=<username> p=<password> path=<path> # Protocol over SSH # Defined TXT keys: username The login username to use -# Window Shifter server (optional) ssh_tunnel Whether an SSH tunnel must be used -# shifter protocol [Antoine_Martin] [Antoine_Martin] (required) iface The network interface the server is on +# Window Shifter server (optional) ssh_tunnel Whether an SSH tunnel must be used +# shifter protocol [Antoine_Martin] [Antoine_Martin] (required) iface The network interface the server is on # (required - may be empty) version Software version (required) # ID Server Identifier (requried) -# shipsgm Swift Office Ships [Verek] [Verek] Defined TXT keys: None -# shipsinvit Swift Office Ships [Verek] [Verek] Defined TXT keys: None -# shoppersync SplashShopper [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary +# shipsgm Swift Office Ships [Verek] [Verek] Defined TXT keys: None +# shipsinvit Swift Office Ships [Verek] [Verek] Defined TXT keys: None +# shoppersync SplashShopper [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary # Synchronization Service -# shoutcast Nicecast [Rogue_Amoeba_2] [Rogue_Amoeba_2] Defined TXT keys: None +# shoutcast Nicecast [Rogue_Amoeba_2] [Rogue_Amoeba_2] Defined TXT keys: None # Medical simulation patient -# simmon monitor syncronisation [Niels_Castle] [Niels_Castle] Defined TXT keys: None +# simmon monitor syncronisation [Niels_Castle] [Niels_Castle] Defined TXT keys: None # protocol -# simusoftpong simusoftpong iPhone game [Anders_Svensson] [Anders_Svensson] Defined TXT keys: Proprietary +# simusoftpong simusoftpong iPhone game [Anders_Svensson] [Anders_Svensson] Defined TXT keys: Proprietary # protocol # Defined TXT keys: # sipver SIP version @@ -16510,8 +16586,8 @@ # fromuser username for SIP "from" header (see RFC3261) # fromdomain domain for SIP "from" header (see RFC3261) # registrar SIP registrar (see RFC3261) -# sip udp Session Initiation Protocol, [Benjamin_Kowarsch] [Benjamin_Kowarsch] proxy SIP proxy (see RFC3261) -# signalling protocol for VoIP natproxy SIP proxy for NATed clients +# sip udp Session Initiation Protocol, [Benjamin_Kowarsch] [Benjamin_Kowarsch] proxy SIP proxy (see RFC3261) +# signalling protocol for VoIP natproxy SIP proxy for NATed clients # outproxy outbound SIP proxy (see RFC3261) # stunserver STUN server DNS name or IP address # contact SIP URI (see RFC3261) @@ -16522,253 +16598,255 @@ # echotest SIP URI (see RFC3261) # ivrtest SIP URI (see RFC3261) # Further TXT record keys may be added in the future. -# sipuri Session Initiation Protocol [Jae_Woo_Lee] [Jae_Woo_Lee] Defined TXT keys: Defined in URL specification +# sipuri Session Initiation Protocol [Jae_Woo_Lee] [Jae_Woo_Lee] Defined TXT keys: Defined in URL specification # Uniform Resource Identifier -# sironaxray Sirona Xray Protocol [Michael_Dalpiaz] [Michael_Dalpiaz] Defined TXT keys: Manufacturer=Sirona -# skype Skype Defined TXT keys: platform, status, auth, rversion, version -# sleep-proxy udp Sleep Proxy Server [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Defined TXT keys: None -# slimcli SliMP3 Server Command-Line [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None +# sironaxray Sirona Xray Protocol [Michael_Dalpiaz] [Michael_Dalpiaz] Defined TXT keys: Manufacturer=Sirona +# skype Skype Defined TXT keys: platform, status, auth, rversion, version +# sleep-proxy udp Sleep Proxy Server [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Defined TXT keys: None +# slimcli SliMP3 Server Command-Line [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None # Interface -# slimhttp SliMP3 Server Web Interface [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None -# smartenergy Smart Energy Profile [Robby_Simpson] [Robby_Simpson] Defined TXT keys: See http://www.zigbee.org/SmartEnergy -# smb Server Message Block over Defined TXT keys: u=<username> p=<password> path=<path> +# slimhttp SliMP3 Server Web Interface [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None +# smartenergy Smart Energy Profile [Robby_Simpson] [Robby_Simpson] Defined TXT keys: See http://www.zigbee.org/SmartEnergy +# smartsocket tcp home control [Robert_Diamond] [Robert_Diamond] 2012-07-06 Defined TXT keys: None +# smb Server Message Block over Defined TXT keys: u=<username> p=<password> path=<path> # TCP/IP -# sms Short Text Message Sending [Christian_Flintrup] [Christian_Flintrup] Defined TXT keys: Proprietary +# sms Short Text Message Sending [Christian_Flintrup] [Christian_Flintrup] Defined TXT keys: Proprietary # and Delivery Status Service -# Syncellence file Defined TXT keys: device=<device type> protocol=<version -# smsync synchronization protocol [Dialectro_Software] [Gord_Peters] 2011-10-20 number> os=<operating system name> osver=<operating system +# Syncellence file Defined TXT keys: device=<device type> protocol=<version +# smsync synchronization protocol [Dialectro_Software] [Gord_Peters] 2011-10-20 number> os=<operating system name> osver=<operating system # version> -# soap Simple Object Access [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None +# soap Simple Object Access [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None # Protocol -# socketcloud Socketcloud distributed [Robert_Goodyear] [Robert_Goodyear] Defined TXT keys: system, service, process, context, -# application framework direction, status, progress, health, directive, flags -# sox Simple Object eXchange [Igor_Mozolevsky] [Igor_Mozolevsky] Defined TXT keys: Proprietary -# sparechange SpareChange data sharing [Dave_Carrigan] [Dave_Carrigan] Defined TXT keys: None +# socketcloud Socketcloud distributed [Robert_Goodyear] [Robert_Goodyear] Defined TXT keys: system, service, process, context, +# application framework direction, status, progress, health, directive, flags +# sox Simple Object eXchange [Igor_Mozolevsky] [Igor_Mozolevsky] Defined TXT keys: Proprietary +# sparechange SpareChange data sharing [Dave_Carrigan] [Dave_Carrigan] Defined TXT keys: None # protocol -# spearcat sPearCat Host Discovery [Pierre_Frisch_2] [Pierre_Frisch_2] Defined TXT keys: applicationname=<Application Name>, +# spearcat sPearCat Host Discovery [Pierre_Frisch_2] [Pierre_Frisch_2] Defined TXT keys: applicationname=<Application Name>, # osname=<OS Name>, sslsupport=<Uses SSL> -# spidap tcp Sierra Photonics Inc. data [Sierra_Photonics_Inc] [Support_Staff] 2011-10-20 Defined TXT keys: None +# spidap tcp Sierra Photonics Inc. data [Sierra_Photonics_Inc] [Support_Staff] 2011-10-20 Defined TXT keys: None # protocol -# spincrisis Spin Crisis [Sphera_Software] [Sphera_Software] Defined TXT keys: None -# spl-itunes launchTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None -# spr-itunes netTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None -# splashsync SplashData Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary +# spincrisis Spin Crisis [Sphera_Software] [Sphera_Software] Defined TXT keys: None +# spl-itunes launchTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None +# 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 # 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 -# spx-hmp tcp SpinetiX HMP [SpinetiX_S_A] [Diego_Santa_Cruz] 2011-10-18 currently operating, one of "normal", "safe" or "recovery" +# spx-hmp tcp SpinetiX HMP [SpinetiX_S_A] [Diego_Santa_Cruz] 2011-10-18 currently operating, one of "normal", "safe" or "recovery" # serial= serial number of the HMP device firmware= firmware # version string (e.g., 2.1.0-0.1.7844) model= model string # (e.g., HMP100) -# ssh tcp SSH Remote Login Protocol [Tatu_Ylonen] [Tatu_Ylonen] Defined TXT keys: u=<username> p=<password> -# ssscreenshare Screen Sharing Defined TXT keys: None -# strateges Strateges [Jean_Olivier_Lanctot] [Jean_Olivier_Lanctot] Defined TXT keys: None -# sge-exec Sun Grid Engine (Execution [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None +# ssh tcp SSH Remote Login Protocol [Tatu_Ylonen] [Tatu_Ylonen] Defined TXT keys: u=<username> p=<password> +# ssscreenshare Screen Sharing Defined TXT keys: None +# strateges Strateges [Jean_Olivier_Lanctot] [Jean_Olivier_Lanctot] Defined TXT keys: None +# sge-exec Sun Grid Engine (Execution [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None # Host) -# sge-qmaster Sun Grid Engine (Master) [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None -# soda tcp Secure On Device API [Smith_Micro_Software_Inc] [David_Sperling_2] 2011-10-10 Defined TXT keys: a. ssid=<Wi-Fi SSID of the device> b. +# sge-qmaster Sun Grid Engine (Master) [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None +# soda tcp Secure On Device API [Smith_Micro_Software_Inc] [David_Sperling_2] 2011-10-10 Defined TXT keys: a. ssid=<Wi-Fi SSID of the device> b. # bssid=<Wi-Fi BSSID of the device> -# souschef SousChef Recipe Sharing [Ben] [Ben] Defined TXT keys: None +# souschef SousChef Recipe Sharing [Ben] [Ben] Defined TXT keys: None # Protocol # Defined TXT keys: txtvers=1 path=<relative or absolute URL of # endpoint> protovers=<number> [if not specified then default -# SPARQL Protocol and RDF is 1.0, corresponding to SPARQL version] binding=<HTTP | -# sparql Query Language [Alex_Tucker] [Alex_Tucker] SOAP> [if not specified then default is HTTP] vocabs=<space +# SPARQL Protocol and RDF is 1.0, corresponding to SPARQL version] binding=<HTTP | +# sparql Query Language [Alex_Tucker] [Alex_Tucker] SOAP> [if not specified then default is HTTP] vocabs=<space # separated list of URIs> [RDF vocabularies or OWL ontologies # used by the endpoint] metadata=<URL> [to fetch RDF/XML # description of SPARQL service] -# sqp tcp Square Connect Control [Square_Connect_Inc] [Mat_Henshall] 2011-10-07 Defined TXT keys: Proprietary +# sqp tcp Square Connect Control [Square_Connect_Inc] [Mat_Henshall] 2011-10-07 Defined TXT keys: Proprietary # Protocol -# stanza Lexcycle Stanza service for [Marc_Prud_hommeaux] [Marc_Prud_hommeaux] Defined TXT keys: None +# stanza Lexcycle Stanza service for [Marc_Prud_hommeaux] [Marc_Prud_hommeaux] Defined TXT keys: None # discovering shared books -# stickynotes Sticky Notes [Johnnie_Walker] [Johnnie_Walker] Defined TXT keys: None -# stotp tcp One Time Pad Synchronisation [softthere_com] [James_Crosby] 2011-10-17 Defined TXT keys: None -# supple Supple Service protocol [Dave_Christianson] [Dave_Christianson] Defined TXT keys: type url -# surveillus Surveillus Networks [Mark_Lewis_3] [Mark_Lewis_3] Defined TXT keys: None +# stickynotes Sticky Notes [Johnnie_Walker] [Johnnie_Walker] Defined TXT keys: None +# stotp tcp One Time Pad Synchronisation [softthere_com] [James_Crosby] 2011-10-17 Defined TXT keys: None +# supple Supple Service protocol [Dave_Christianson] [Dave_Christianson] Defined TXT keys: type url +# surveillus Surveillus Networks [Mark_Lewis_3] [Mark_Lewis_3] Defined TXT keys: None # Discovery Protocol -# svn Subversion [CollabNet] [CollabNet] Defined TXT keys: None -# swcards Signwave Card Sharing [Signwave_Networking] [Signwave_Networking] Defined TXT keys: None +# svn Subversion [CollabNet] [CollabNet] Defined TXT keys: None +# swcards Signwave Card Sharing [Signwave_Networking] [Signwave_Networking] Defined TXT keys: None # Protocol -# switcher Wireless home control remote [Steve_Splonskowski] [Steve_Splonskowski] Defined TXT keys: None +# switcher Wireless home control remote [Steve_Splonskowski] [Steve_Splonskowski] Defined TXT keys: None # control protocol -# swordfish Swordfish Protocol for [Jim_Wallace] [Jim_Wallace] Defined TXT keys: None +# swordfish Swordfish Protocol for [Jim_Wallace] [Jim_Wallace] Defined TXT keys: None # Input/Output # Framework for transferring -# swyp any file from any app, to [ExoMachina] [Alexander_List] 2011-12-06 Defined TXT keys: NONE +# swyp any file from any app, to [ExoMachina] [Alexander_List] 2011-12-06 Defined TXT keys: NONE # any app on any device: # simply with a swyp. -# sxqdea Synchronize! Pro X [Qdea] [Qdea] Defined TXT keys: None -# sybase-tds Sybase Server Defined TXT keys: None -# syncopation Syncopation Synchronization [Sonzea] [Sonzea] Defined TXT keys: None +# sxqdea Synchronize! Pro X [Qdea] [Qdea] Defined TXT keys: None +# sybase-tds Sybase Server Defined TXT keys: None +# syncopation Syncopation Synchronization [Sonzea] [Sonzea] Defined TXT keys: None # Protocol by Sonzea -# syncqdea Synchronize! X Plus 2.0 [Qdea] [Qdea] Defined TXT keys: None -# synergy Synergy Peer Discovery [Karl_Timmermann] [Karl_Timmermann] Defined TXT keys: None -# synksharing SynkSharing synchronization [Benjamin_Rister] [Benjamin_Rister] Defined TXT keys: None +# syncqdea Synchronize! X Plus 2.0 [Qdea] [Qdea] Defined TXT keys: None +# synergy Synergy Peer Discovery [Karl_Timmermann] [Karl_Timmermann] Defined TXT keys: None +# synksharing SynkSharing synchronization [Benjamin_Rister] [Benjamin_Rister] Defined TXT keys: None # protocol -# taccounting Data Transmission and [John_MacMullin] [John_MacMullin] Defined TXT keys: None +# taccounting Data Transmission and [John_MacMullin] [John_MacMullin] Defined TXT keys: None # Synchronization -# tango Tango Remote Control [Tony_Amundson] [Tony_Amundson] Defined TXT keys: None +# tango Tango Remote Control [Tony_Amundson] [Tony_Amundson] Defined TXT keys: None # Protocol -# tapinoma-ecs Tapinoma Easycontact [Bonjour] [Bonjour] Defined TXT keys: None +# tapinoma-ecs Tapinoma Easycontact [Bonjour] [Bonjour] Defined TXT keys: None # receiver # Task Coach Two-way -# taskcoachsync Synchronization Protocol for [Jerome_Laheurte] [Jerome_Laheurte] Defined TXT keys: None +# taskcoachsync Synchronization Protocol for [Jerome_Laheurte] [Jerome_Laheurte] Defined TXT keys: None # iPhone # Defined TXT keys: txtvers=1, sesna, seid, setype, cosna, -# tbricks tbricks internal protocol [Joakim_Johansson] [Joakim_Johansson] coid, cotype, sysna, syna, syid, subsyid, venid, protocols, +# tbricks tbricks internal protocol [Joakim_Johansson] [Joakim_Johansson] coid, cotype, sysna, syna, syid, subsyid, venid, protocols, # pid -# tcode Time Code [Marshall_Anschutz] [Marshall_Anschutz] Defined TXT keys: None -# tcu Tracking Control Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None +# tcode Time Code [Marshall_Anschutz] [Marshall_Anschutz] Defined TXT keys: None +# tcu Tracking Control Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None # RPM-PSI -# te-faxserver TE-SYSTEMS GmbH Fax Server [Tobias_Erichsen] [Tobias_Erichsen] Defined TXT keys: Proprietary +# te-faxserver TE-SYSTEMS GmbH Fax Server [Tobias_Erichsen] [Tobias_Erichsen] Defined TXT keys: Proprietary # Daemon -# teamlist ARTIS Team Task [ARTIS_Software] [ARTIS_Software] Defined TXT keys: None -# teleport udp teleport [Julien_Robert] [Julien_Robert] Defined TXT keys: None -# tenir-rc tcp Proprietary [Tenir_Software] [Steve_Gums] 2011-10-27 Defined TXT keys: Proprietary -# tera-fsmgr Terascala Filesystem Manager [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary +# teamlist ARTIS Team Task [ARTIS_Software] [ARTIS_Software] Defined TXT keys: None +# teleport udp teleport [Julien_Robert] [Julien_Robert] Defined TXT keys: None +# tenir-rc tcp Proprietary [Tenir_Software] [Steve_Gums] 2011-10-27 Defined TXT keys: Proprietary +# tera-fsmgr Terascala Filesystem Manager [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary # Protocol -# tera-mp Terascala Maintenance [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary +# tera-mp Terascala Maintenance [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary # Protocol -# tf-redeye ThinkFlood RedEye IR bridge [Matt_Eagar] [Matt_Eagar] Defined TXT keys: None -# thumbwrestling tinkerbuilt Thumb Wrestling [Jamie_Halmick] [Jamie_Halmick] Defined TXT keys: None +# tf-redeye ThinkFlood RedEye IR bridge [Matt_Eagar] [Matt_Eagar] Defined TXT keys: None +# thumbwrestling tinkerbuilt Thumb Wrestling [Jamie_Halmick] [Jamie_Halmick] Defined TXT keys: None # game -# ticonnectmgr TI Connect Manager Discovery [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None +# ticonnectmgr TI Connect Manager Discovery [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None # Service -# tinavigator TI Navigator Hub 1.0 [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None +# tinavigator TI Navigator Hub 1.0 [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None # Discovery Service -# tivo-device tcp TiVo Device Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None -# tivo-hme TiVo Home Media Engine [Developer_Support] [Developer_Support] Defined TXT keys: None +# tivo-device tcp TiVo Device Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None +# tivo-hme TiVo Home Media Engine [Developer_Support] [Developer_Support] Defined TXT keys: None # Protocol -# tivo-mindrpc tcp TiVo RPC Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None -# tivo-music TiVo Music Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None -# tivo-photos TiVo Photos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None -# tivo-remote TiVo Remote Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN -# tivo-videos TiVo Videos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN -# todogwa 2Do Sync Helper Tool for Mac [Fahad_Gilani] [Fahad_Gilani] Defined TXT keys: None +# tivo-mindrpc tcp TiVo RPC Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None +# tivo-music TiVo Music Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None +# tivo-photos TiVo Photos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None +# tivo-remote TiVo Remote Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN +# tivo-videos TiVo Videos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN +# todogwa 2Do Sync Helper Tool for Mac [Fahad_Gilani] [Fahad_Gilani] Defined TXT keys: None # OS X and PCs -# tomboy Tomboy [Alex_Graveley] [Alex_Graveley] Defined TXT keys: None -# toothpicserver ToothPics Dental Office [Milton_Pulis] [Milton_Pulis] Defined TXT keys: None +# tomboy Tomboy [Alex_Graveley] [Alex_Graveley] Defined TXT keys: None +# toothpicserver ToothPics Dental Office [Milton_Pulis] [Milton_Pulis] Defined TXT keys: None # Support Server -# touch-able iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, CtlN, DbId, Ver, DvTy, OSsi, DvSv +# touch-able iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, CtlN, DbId, Ver, DvTy, OSsi, DvSv # Controllable -# touch-remote iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, DvNm, Pair, RemV, RemN, DvTy +# touch-remote iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, DvNm, Pair, RemV, RemN, DvTy # Pairing -# tri-vis-client triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None +# tri-vis-client triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None # Client -# tri-vis-server triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None +# tri-vis-server triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None # Server -# tryst Tryst [Francisco_Ryan_Tolma] [Francisco_Ryan_Tolma] Defined TXT keys: None -# The Social Broadband Defined TXT keys: there is no TXT keys defined for this -# tsbiis tcp Interference Information [Sergio_Luis] [Sergio_Luis] 2012-02-27 protocol +# tryst Tryst [Francisco_Ryan_Tolma] [Francisco_Ryan_Tolma] Defined TXT keys: None +# The Social Broadband Defined TXT keys: there is no TXT keys defined for this +# tsbiis tcp Interference Information [Sergio_Luis] [Sergio_Luis] 2012-02-27 protocol # Sharing -# tt4inarow Trivial Technology's 4 in a [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None +# tt4inarow Trivial Technology's 4 in a [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None # Row -# ttcheckers Trivial Technology's [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None +# ttcheckers Trivial Technology's [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None # Checkers -# ttp4daemon TechTool Pro 4 Anti-Piracy [Micromat] [Micromat] Defined TXT keys: None +# ttp4daemon TechTool Pro 4 Anti-Piracy [Micromat] [Micromat] Defined TXT keys: None # Service -# tunage Tunage Media Control Service [Matt_Patenaude] [Matt_Patenaude] Defined TXT keys: None -# tuneranger TuneRanger [Acertant] [Acertant] Defined TXT keys: None +# tunage Tunage Media Control Service [Matt_Patenaude] [Matt_Patenaude] Defined TXT keys: None +# tuneranger TuneRanger [Acertant] [Acertant] Defined TXT keys: None # TZ-Software remote procedure -# tzrpc tcp call based synchronization [Thomas_Zwick] [Thomas_Zwick] 2011-10-12 Defined TXT keys: Proprietary +# tzrpc tcp call based synchronization [Thomas_Zwick] [Thomas_Zwick] 2011-10-12 Defined TXT keys: Proprietary # protocol -# ubertragen Ubertragen [Widgetschmie_de] [Widgetschmie_de] Defined TXT keys: None -# uddi Universal Description, [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD +# ubertragen Ubertragen [Widgetschmie_de] [Widgetschmie_de] Defined TXT keys: None +# uddi Universal Description, [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD # Discovery and Integration # Universal Description, -# uddi-inq Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD +# uddi-inq Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD # Inquiry # Universal Description, -# uddi-pub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD +# uddi-pub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD # Publishing # Universal Description, -# uddi-sub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD +# uddi-sub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD # Subscription # Universal Description, -# uddi-sec Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD +# uddi-sec Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD # Security -# upnp Universal Plug and Play [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None -# urlbookmark URL Advertising [Sven_S_Porst] [Sven_S_Porst] Defined TXT keys: URL=<URL that is advertised>, name=<Name of +# upnp Universal Plug and Play [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None +# urlbookmark URL Advertising [Sven_S_Porst] [Sven_S_Porst] Defined TXT keys: URL=<URL that is advertised>, name=<Name of # the bookmark> -# uswi Universal Switching [Roger_Lemberg] [Roger_Lemberg] Defined TXT keys: None +# uswi Universal Switching [Roger_Lemberg] [Roger_Lemberg] Defined TXT keys: None # Corporation products -# utest uTest [Gregory_Power] [Gregory_Power] Defined TXT keys: None -# uwsgi Unbit Web Server Gateway [Roberto_De_Ioris] [Roberto_De_Ioris] Defined TXT keys: None +# utest uTest [Gregory_Power] [Gregory_Power] Defined TXT keys: None +# uwsgi Unbit Web Server Gateway [Roberto_De_Ioris] [Roberto_De_Ioris] Defined TXT keys: None # Interface -# ve-decoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, -# Decoder Control Service serial, path, idp -# ve-encoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, -# Encoder Control Service serial, path, idp -# ve-recorder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, -# Recorder Control Service serial, path, idp -# virtualdj VirtualDJ Remote Control [Atomix_Productions] [Stephane_Clavel] 2011-10-12 Defined TXT keys: None +# ve-decoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, +# Decoder Control Service serial, path, idp +# ve-encoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, +# Encoder Control Service serial, path, idp +# ve-recorder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, +# Recorder Control Service serial, path, idp +# virtualdj VirtualDJ Remote Control [Atomix_Productions] [Stephane_Clavel] 2011-10-12 Defined TXT keys: None # protocol # Defined TXT keys: Version=<service version> Type=<service -# visel visel Q-System services [Lehpaner_Sasa] [Lehpaner_Sasa] type> Name=<service Name> Zone=<service zone> ID=<serviceID> +# visel visel Q-System services [Lehpaner_Sasa] [Lehpaner_Sasa] type> Name=<service Name> Zone=<service zone> ID=<serviceID> # SString=<serviceString> SString1=<serviceString> -# Virtual Object System (using Defined TXT keys: url=<Object URL with full path> -# vos VOP/TCP) [Reed_Hedges][Peter_Amstutz] [Reed_Hedges][Peter_Amstutz] type=<Comma-seperated list of object types> title=<Short +# Virtual Object System (using Defined TXT keys: url=<Object URL with full path> +# vos VOP/TCP) [Reed_Hedges][Peter_Amstutz] [Reed_Hedges][Peter_Amstutz] type=<Comma-seperated list of object types> title=<Short # title of service> descr=<Short description of service> -# vue4rendercow VueProRenderCow Defined TXT keys: None -# vxi-11 VXI-11 TCP/IP Instrument [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: None +# vue4rendercow VueProRenderCow Defined TXT keys: None +# vxi-11 VXI-11 TCP/IP Instrument [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: None # Protocol -# walkietalkie Walkie Talkie [Johan_Kool] [Johan_Kool] Defined TXT keys: None -# we-jell Proprietary collaborative [Vaughn_Amann] [Vaughn_Amann] Defined TXT keys: user=<user name> stat=<OK, DND, AWY, -# messaging protocol FWD:uname> agent=<agent type> +# walkietalkie Walkie Talkie [Johan_Kool] [Johan_Kool] Defined TXT keys: None +# wd-2go tcp NAS Service Protocol [Western_Digital] [Rajesh_Batra] 2012-07-11 Defined TXT keys: None +# we-jell Proprietary collaborative [Vaughn_Amann] [Vaughn_Amann] Defined TXT keys: user=<user name> stat=<OK, DND, AWY, +# messaging protocol FWD:uname> agent=<agent type> # World Wide Web Distributed -# webdav Authoring and Versioning [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> +# webdav Authoring and Versioning [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> # (WebDAV) -# webdavs WebDAV over SSL/TLS [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> -# webissync WebIS Sync Protocol [Alex_Kac] [Alex_Kac] Defined TXT keys: None -# wedraw weDraw document sharing [Oleksandr_Zakharchuk] [Oleksandr_Zakharchuk] Defined TXT keys: None +# webdavs WebDAV over SSL/TLS [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> +# webissync WebIS Sync Protocol [Alex_Kac] [Alex_Kac] Defined TXT keys: None +# wedraw weDraw document sharing [Oleksandr_Zakharchuk] [Oleksandr_Zakharchuk] Defined TXT keys: None # protocol -# whamb Whamb [Whamb] [Whamb] Defined TXT keys: None -# whistler Honeywell Video Systems [Shankar_Prasad_2] [Shankar_Prasad_2] Defined TXT keys: None -# wicop udp WiFi Control Platform [Santorini_LLC] [Cameron_Colpitts] 2011-10-25 Defined TXT keys: state=<state> loc=<location> -# witap WiTap Sample Game Protocol [Rory_McGuire_2] [Rory_McGuire_2] Defined TXT keys: None -# witapvoice witapvoice [Roberto_Garcia] [Roberto_Garcia] Defined TXT keys: None -# wkgrpsvr Workgroup Server Discovery [Forest_Hill] [Forest_Hill] Defined TXT keys: None -# workstation Workgroup Manager [Kevin_Arnold] [Kevin_Arnold] Defined TXT keys: None -# wormhole Roku Cascade Wormhole [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 +# whamb Whamb [Whamb] [Whamb] Defined TXT keys: None +# whistler Honeywell Video Systems [Shankar_Prasad_2] [Shankar_Prasad_2] Defined TXT keys: None +# wicop udp WiFi Control Platform [Santorini_LLC] [Cameron_Colpitts] 2011-10-25 Defined TXT keys: state=<state> loc=<location> +# witap WiTap Sample Game Protocol [Rory_McGuire_2] [Rory_McGuire_2] Defined TXT keys: None +# witapvoice witapvoice [Roberto_Garcia] [Roberto_Garcia] Defined TXT keys: None +# wkgrpsvr Workgroup Server Discovery [Forest_Hill] [Forest_Hill] Defined TXT keys: None +# workstation Workgroup Manager [Kevin_Arnold] [Kevin_Arnold] Defined TXT keys: None +# wormhole Roku Cascade Wormhole [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 # Protocol -# workgroup Novell collaboration [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? description=? +# workgroup Novell collaboration [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? description=? # workgroup -# writietalkie Writie Talkie Data Sharing [Yin_Ki_Lau] [Yin_Ki_Lau] Defined TXT keys: None -# ws Web Services [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None -# wtc-heleos Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None +# writietalkie Writie Talkie Data Sharing [Yin_Ki_Lau] [Yin_Ki_Lau] Defined TXT keys: None +# ws Web Services [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None +# wtc-heleos Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None # HELEOS -# wtc-qels Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None +# wtc-qels Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None # QELS -# wtc-rex Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None +# wtc-rex Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None # Optilab rEX -# wtc-viscostar Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None +# wtc-viscostar Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None # ViscoStar -# wtc-wpr Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None +# wtc-wpr Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None # DynaPro Plate Reader -# wwdcpic PictureSharing sample code [Marc_Krochmal] [Marc_Krochmal] Defined TXT keys: None -# x-on x-on services [Matthias_Burghardt] [Matthias_Burghardt] Defined TXT keys: Proprietary +# wwdcpic PictureSharing sample code [Marc_Krochmal] [Marc_Krochmal] Defined TXT keys: None +# x-on x-on services [Matthias_Burghardt] [Matthias_Burghardt] Defined TXT keys: Proprietary # synchronisation protocol -# x-plane9 udp x-plane9 [Austin_Meyer] [Austin_Meyer] Defined TXT keys: None -# xcodedistcc Xcode Distributed Compiler [Scott_Tooker] [Scott_Tooker] Defined TXT keys: None -# xgate-rmi xGate Remote Management [Tim_Jobling] [Tim_Jobling] Defined TXT keys: tech=value (string) model=value (string) -# Interface version=value (string) -# xmp Xperientia Mobile Protocol [Henric_Bergh] [Henric_Bergh] 2007-01 Defined TXT keys: txtvers, user, system, nodeid, desc -# xsanclient Xsan Client [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None -# xsanserver Xsan Server [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None -# xsansystem Xsan System [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None -# xtimelicence xTime License [AppMac_Software] [AppMac_Software] Defined TXT keys: None -# xtshapro xTime Project [AppMac_Software] [AppMac_Software] Defined TXT keys: None -# XUL (XML User Interface Defined TXT keys: u=<username> p=<password> path=<path to -# xul-http Language) transported over [Eran_Gampel] [Eran_Gampel] document> (Same as for _http._tcp) +# x-plane9 udp x-plane9 [Austin_Meyer] [Austin_Meyer] Defined TXT keys: None +# xcodedistcc Xcode Distributed Compiler [Scott_Tooker] [Scott_Tooker] Defined TXT keys: None +# xgate-rmi xGate Remote Management [Tim_Jobling] [Tim_Jobling] Defined TXT keys: tech=value (string) model=value (string) +# Interface version=value (string) +# xmp Xperientia Mobile Protocol [Henric_Bergh] [Henric_Bergh] 2007-01 Defined TXT keys: txtvers, user, system, nodeid, desc +# xsanclient Xsan Client [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None +# xsanserver Xsan Server [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None +# xsansystem Xsan System [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None +# xtimelicence xTime License [AppMac_Software] [AppMac_Software] Defined TXT keys: None +# xtshapro xTime Project [AppMac_Software] [AppMac_Software] Defined TXT keys: None +# XUL (XML User Interface Defined TXT keys: u=<username> p=<password> path=<path to +# xul-http Language) transported over [Eran_Gampel] [Eran_Gampel] document> (Same as for _http._tcp) # HTTP -# yakumo udp Yakumo iPhone OS Device [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None +# yakumo udp Yakumo iPhone OS Device [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None # Control Protocol -# z-wave tcp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM -# z-wave udp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM -# zeromq tcp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note +# z-wave tcp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM +# z-wave udp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM +# zeromq tcp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note # messaging -# zeromq udp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note +# zeromq udp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note # messaging # # People @@ -16819,6 +16897,7 @@ # [Adrian_Popescu] Adrian Popescu mailto:Adrian_Popescu&groove.net 2002-09 # [Adrien_de_Croy] Adrien de Croy mailto:adrien&qbik.com # [Adwait_Sathe] Adwait Sathe mailto:asathe&sonusnet.com 2005-08 +# [Aerohive_Networks] Aerohive Networks mailto:iana&aerohive.com 2012-06-04 # [Afkham_Azeez] Afkham Azeez mailto:azeez&wso2.com 2006-06 # [Agri_Datalog] Agri Datalog mailto:contact&agri-datalog.com # [Ahmad_Tajuddin_Samsu] Ahmad Tajuddin Samsudin mailto:tajuddin&tmrnd.com.my 2007-02 @@ -16944,6 +17023,8 @@ # [Amitava_Dutta] Amitava Dutta mailto:Amitava.Dutta&woodbridgenj.ncr.com # [Amnon_Horowitz] Amnon Horowitz mailto:amnonh&microsoft.com # [Amol_P_Tambe] Amol P Tambe mailto:amol_tambe&symantec.com 2011-02-02 +# [AMPL_Optimization] AMPL Optimization, mailto:dmg&ampl.com 2012-05-25 +# Inc. # [Amy_Kang] Amy Kang mailto:amy.kang&sun.com 2009-03-10 # [Amy_Weaver] Amy Weaver mailto:aweaver&vpnet.com # [Amy_Weaver_2] Amy Weaver mailto:amy_weaver&nai.com @@ -17027,6 +17108,7 @@ # [Andy_McKeen] Andy McKeen mailto:mckeen&osf.org # [Andy_O_Meara] Andy O'Meara mailto:andy&soundspectrum.com # [Andy_Perreault] Andy Perreault mailto:aperreault&erlphase.com 2010-03-31 +# [Andy_Savage] Andy Savage mailto:andy.savage1&gmail.com 2012-07-13 # [Andy_Shellam] Andy Shellam mailto:andy&networkmail.eu 2008-02-19 # [Andy_Stanford_Clark] Andy Stanford-Clark mailto:andysc&uk.ibm.com # [Andy_Valencia] Andy Valencia mailto:vandys&vandys-lap.cisco.com @@ -17091,7 +17173,6 @@ # [Arnold_E_Mauer] Arnold E. Mauer mailto:amauer&vrms.com 2003-04 # [Arrow_Bit_SL] Arrow Bit SL mailto:info&arrowbit.com 2012-04-26 # [Art_Cancro] Art Cancro mailto:ajc&uncensored.citadel.org -# [Art_Grand] Art Grand mailto:aig&unify.com # [Art_Pope] Art Pope mailto:apope&sarnoff.com 2002-10 # [Arthur_Barr] Arthur Barr mailto:arthur.barr&uk.ibm.com 2008-02-27 # [Arthur_Castonguay] Arthur Castonguay mailto:arthurc&doe.carleton.ca @@ -17360,12 +17441,14 @@ # [Byron_Jones] Byron Jones mailto:byronj&bellsouth.net # [C_Enrique_Ortiz] C. Enrique Ortiz mailto:eortiz&j2medeveloper.com 2003-01 # [C_Philip_Wood] C. Philip Wood mailto:cpw&lanl.gov +# [Cabel_Sasser] Cabel Sasser Panic Inc. mailto:cabel&panic.com 2012-07-19 # [CaldSoft] CaldSoft mailto:development&caldsoft.co.uk 2011-08-12 # [Cameo_Systems_Inc] Cameo Systems Inc. mailto:craig&reversion.ca 2011-09-26 # [Cameron_Colpitts] Cameron Colpitts Santorini, LLC mailto:cameron&santorinillc.com 2011-10-25 # [Cameron_Young] Cameron Young mailto:Cameron_Young&inetco.com # [Candace_Niccolson] Candace Niccolson mailto:cniccolson&genisar.com 2002-04 # [Canon_Inc] Canon Inc. mailto:fujii.ken-ichi149&canon.co.jp 2011-10-10 +# [Caprice_Productions] Caprice Productions mailto:ldrake&caprice.com 2012-07-05 # [Carl_Banzhof] Carl Banzhof mailto:cbanzhof&citadel.com 2003-06 # [Carl_Blundell] Carl Blundell mailto:cblundell&celador.co.uk 2002-05 # [Carl_Cedergren] Carl Cedergren mailto:asperon&home.se @@ -17416,6 +17499,8 @@ # [Charlie_Limoges] Charlie Limoges mailto:Charlie.Limoges&gdc4s.com # [Chatziandreoglou_Chr] Chatziandreoglou Christos mailto:chatzi&xan.forthnet.gr 2003-10 # [Chaz_McGarvey] Chaz McGarvey mailto:chaz&brokenzipper.com +# [Check_Point_Software] Check Point Software mailto:rbahadur&checkpoint.com 2012-06-28 +# Technologies Ltd. # [Chee_Kent_Lam] Chee Kent Lam mailto:cklam&foursticks.com 2002-04 # [Cheryl_Stoutenburg] Cheryl Stoutenburg mailto:cstoutenburg&vnet.ibm.com # [Chi_Chen] Chi Chen mailto:chichen&us.ibm.com 2002-04 @@ -17425,6 +17510,7 @@ # [Chirag_Desai] Chirag Desai mailto:Chirag_Desai&symantec.com 2006-02 # [Chris_Adamson] Chris Adamson mailto:invalidname&gmail.com # [Chris_Adkins] Chris Adkins mailto:cadkins&filenet.com 2006-10 +# [Chris_Anderson] Chris Anderson Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-12 # [Chris_Bertin] Chris Bertin mailto:chris.bertin&hp.com 2009-05-19 # [Chris_Brown] Chris Brown mailto:chrisb&chancery.com # [Chris_Chiotasso] Chris Chiotasso mailto:cchiotasso&infolibria.com @@ -17538,6 +17624,7 @@ # inc. # [Circus_Ponies_Suppor] Circus Ponies Support mailto:support&circusponies.com # [Cisco] Cisco mailto:glenn.matthews&cisco.com 2011-10-25 +# [Cisco2] Cisco mailto:smkumar&cisco.com 2012-06-11 # [Cisco_Systems] Cisco Systems mailto:nmtg-port-numbers&cisco.com 2005-11 # [CityDisc] CityDisc mailto:citydisc&euronet.nl # [Claes_Fredrik_Mannby] Claes-Fredrik Mannby mailto:cf&mannby.com @@ -17597,6 +17684,8 @@ # [Craig_Rogers] Craig Rogers mailto:Rogers&isi.edu # [Craig_Steffen] Craig Steffen mailto:csteffen&ncsa.uiuc.edu 2005-08 # [Craig_Weeks] Craig Weeks mailto:cweeks&syspace.co.uk +# [Crestron_Electronics] Crestron Electronics, mailto:mtalreja@crestron.com> 2012-06-27 +# Inc. # [Cristian_Petculescu] Cristian Petculescu mailto:cristp&microsoft.com # [Cristian_Petculescu_2] Cristian Petculescu mailto:cristp&hotmail.com 2003-04 # [Cristian_Petculescu_3] Cristian Petculescu mailto:petcu40&gmail.com 2005-08 @@ -17615,6 +17704,7 @@ # [d_b_audiotechnik] d&b audiotechnik mailto:software.support&dbaudio.com 2011-10-06 # [D_J_Bernstein] D. J. Bernstein mailto:djb&silverton.berkeley.edu # [D_J_Bernstein_2] D. J. Bernstein mailto:djb&koobera.math.uic.edu +# [Daegis_Inc] Daegis, Inc. mailto:ianaportmaster&daegis.com 2012-07-12 # [Dagfinn_Saether] Dagfinn Saether mailto:Dagfinn&admins.com # [Daisuke_Shinomiya] Daisuke Shinomiya mailto:shinomiya.daisu&jp.fujitsu.com 2005-08 # [Daivd_P_Chassin] Daivd P. Chassin mailto:david.chassin&pnl.gov 2002-06 @@ -17801,6 +17891,8 @@ # [David_Lemson] David Lemson mailto:dlemson&microsoft.com # [David_Lethe] David Lethe mailto:david&santools.com 2010-12-24 # [David_Luxford] David Luxford mailto:david.luxford&asg.com 2010-07-01 +# [David_M_Gay] David M. Gay AMPL Optimization, mailto:dmg&ampl.com 2012-05-25 +# Inc. # [David_M_O_Rourke] David M. O'Rourke mailto:daveo&apple.com 2003-01 # [David_M_Rhodes] David M. Rhodes mailto:davidrho&cnd.hp.com # [David_Manns] David Manns mailto:davidm&pulsonix.com 2008-02-28 @@ -18225,6 +18317,8 @@ # [Gabriel_Kalmar] Gabriel Kalmar mailto:kalga01&ca.com 2008-03-06 # [Gabriel_Levy] Gabriel Levy mailto:glevy&riverbed.com 2008-08-29 # [Gal_Cucuy] Gal Cucuy mailto:galc&cyber-ark.com 2002-03 +# [Galaxy4D] Galaxy4D Online Game mailto:admin&galaxy4d.com 2012-06-18 +# Engine # [Gang_Gong_Moy] Gang Gong Moy # [Gangsta_Ltd] Gangsta Ltd. mailto:jc&gangstamedia.com 2011-10-13 # [Gareth_Nelson] Gareth Nelson mailto:gareth&garethnelson.com 2007-06 @@ -18268,6 +18362,7 @@ # [Geoff_Higgins] Geoff Higgins mailto:geoff.higgins&sun.com 2006-03 # [Geoff_Meacock] Geoff Meacock mailto:gbibmswl&ibmmail.com # [Geoff_Mendal] Geoff Mendal mailto:mendal&talarian.com +# [Geoffrey_Beer] Geoffrey Beer Raymarine UK Limited mailto:Geoff.Beer&raymarine.com 2012-05-24 # [Geoffrey_Wossum] Geoffrey Wossum mailto:geoffrey&pager.net 2003-02 # [Geoffry_Meek] Geoffry Meek mailto:geoff&meek.com # [George_Balesta] George Balesta mailto:George.Baletsa&tfn.com @@ -18562,6 +18657,7 @@ # [Insist] Insist mailto:support&isticky.net # [Intel] Intel mailto:joshua.boelter&intel.com 2011-10-18 # [Ira_McDonald] Ira McDonald mailto:imcdonald&sharplabs.com 2005-12 +# [Irradiated_Software] Irradiated Software mailto:info&irradiatedsoftware.com 2012-06-19 # [Isaack_Rasmussen] Isaack Rasmussen mailto:isaack&pictua.com # [Israel_Beniaminy] Israel Beniaminy mailto:israel.beniaminy&clickservice.com # [Israel_Shainert] Israel Shainert mailto:israels&209.88.177.2 @@ -18635,6 +18731,8 @@ # [James_Tavares] James Tavares Log On America mailto:krontor&loa.com # [James_W_Walker] James W. Walker mailto:jamesw&frameforge3d.com # [James_Wilkinson] James Wilkinson mailto:jwilkinson&doubletake.com 2006-04 +# [James_Wilkinson2] James Wilkinson Vision Solutions, mailto:james.wilkinson&visionsolutions.com 2012-06-06 +# Inc. # [James_Yonan] James Yonan mailto:jim&yonan.net 2004-11 # [Jamie_Halmick] Jamie Halmick mailto:jamie&tinkerbuilt.com # [Jamie_Lokier] Jamie Lokier mailto:jamie&jlokier.co.uk 2006-05 @@ -19192,7 +19290,7 @@ # [Klaus_Fellner] Klaus Fellner mailto:webmaster&segue.com # mailto:kfellner&segue.com # [Klaus_Schmidinger] Klaus Schmidinger mailto:Klaus.Schmidinger&tvdr.de 2010-03-31 -# [Klaus_Warth] Klaus Warth mailto:Klaus.Warth&heitec.de 2011-08-01 +# [Klaus_Warth] Klaus Warth Robert Bosch GmbH mailto:Klaus.Warth&bosch.com 2012-07-17 # [Klaus_Wolf] Klaus Wolf mailto:wolf&cobrow.com # [Koen_Schoofs] Koen Schoofs mailto:schoofs_koen&emc.com 2003-01 # [Koich_Nakamura] Koich Nakamura mailto:naka&case.nm.fujitsu.co.jp @@ -19223,6 +19321,7 @@ # [Lai_Zit_Seng] Lai Zit Seng mailto:lzs&pobox.com # [Laird_Popkin] Laird Popkin mailto:laird&pando.com 2008-02-27 # [Lal_Samuel_Varghese] Lal Samuel Varghese mailto:lalsam&hp.com 2005-08 +# [Lance_Drake] Lance Drake Caprice Productions mailto:bonjour&caprice.com 2012-07-05 # [Lance_Kind] Lance Kind mailto:lance_kind&hp.com # [Lance_M_Steenson] Lance M. Steenson mailto:lance&transactionwarehouse.net 2009-09-18 # [Larry_A_Young] Larry A. Young mailto:Larry.A.Young&mail.sprint.com 2005-08 @@ -19253,7 +19352,6 @@ # [Laurie_Lindsey] Laurie Lindsey mailto:llindsey&novell.com # [Lawrence_J_Dickson] Lawrence J. Dickson Land-5 Corporation mailto:ldickson&land-5.com 2002-03 # [Lawrence_Lebahn] Lawrence Lebahn mailto:DIA3&paxrv-nes.navy.mil -# [Lawrence_R_Bulduc] Lawrence R. Bulduc mailto:LBulduc&attglobal.net 2006-10 # [Lawrence_Tarbox] Lawrence Tarbox mailto:ltarbox&scr.siemens.com # [Lawrence_W_Dunn] Lawrence W. Dunn mailto:larrydunn&aptcomp.com 2003-04 # [Laxman_C_Marathe] Laxman C. Marathe mailto:lcmarathe&thomsonpress.com 2006-12 @@ -19351,6 +19449,8 @@ # [Mandos_Maintainers] Mandos Maintainers mailto:mandos&fukt.bsnet.se # [Manfred_Randelzofer] Manfred Randelzofer mailto:manfred.randelzofer&fujitsu-siemens.com # [Manickam_R_Sridhar] Manickam R.Sridhar mailto:msridhar&sitaranetworks.com +# [Manish_Talreja] Manish Talreja Crestron Electronics, mailto:mtalreja@crestron.com> 2012-06-27 +# Inc. # [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 @@ -19550,6 +19650,7 @@ # [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 +# [Matt_Ferrari] Matt Ferrari XXT LLC mailto:xxt.matt&sbcglobal.net 2012-07-12 # [Matt_Hammond] Matt Hammond mailto:matt_hammond&four-sight.co.uk # [Matt_Jensen] Matt Jensen mailto:mattj&newsblip.com # [Matt_King] Matt King mailto:m&manyone.net 2002-04 @@ -19563,6 +19664,7 @@ # [Matthew_Baker] Matthew Baker mailto:matt.baker&intermec.com # [Matthew_Darwin] Matthew Darwin mailto:matthew.darwin&hp.com 2005-08 # [Matthew_Ford] Matthew Ford mailto:Matthew.Ford&forward.com.au 2003-03 +# [Matthew_Gast] Matthew Gast Aerohive Networks mailto:mgast&aerohive.com 2012-05-31 # [Matthew_Horoschun] Matthew Horoschun mailto:mhoroschun&canprint.com.au # [Matthew_Lloyd] Matthew Lloyd mailto:mlloyd&google.com 2010-04-26 # [Matthew_MacKenzie] Matthew MacKenzie mailto:mattm&adobe.com @@ -19705,6 +19807,7 @@ # [Micromat] Micromat mailto:support&micromat.com # [Microsoft_Corporation] Microsoft Corporation mailto:pratshar&microsoft.com 2011-08-04 # [Microsoft_Corporation_2] Microsoft Corporation mailto:stdsreq&microsoft.com 2012-03-15 +# [Microsoft_Corporation_3] Microsoft Corporation mailto:sachins&microsoft.com 2012-06-27 # [Microtec_Informatique] Microtec Informatique mailto:raph&microtec.fr 2012-03-15 # [MIDI_Manufacturers_Assoc_Inc] MIDI Manufacturers mailto:info&midi.org 2011-11-14 # Assoc Inc @@ -19876,6 +19979,7 @@ # [Nigel_Warren] Nigel Warren mailto:info&flyobjectspace.com 2009-02-12 # [Niklas_Weiss] Niklas Weiss mailto:n.weiss&d-trust.net 2004-11 # [Nikolaus_Gerteis] Nikolaus Gerteis mailto:ngerteis&apple.com +# [Nils_Durner] Nils Durner SOFTPRO GmbH mailto:Nils.Durner&softpro.de 2012-07-19 # [Nimrod_Diamant] Nimrod Diamant mailto:nimrod.diamant&intel.com 2005-02 # [Nine_Technology_LLC] Nine Technology, LLC mailto:astoev&ninetechnology.com 2011-08-01 # [Nir_Baroz] Nir Baroz mailto:nbaroz&encore.com @@ -19924,6 +20028,8 @@ # [Olivier_Delecluse] Olivier Delecluse mailto:odelecluse&intego.com # [Olivier_Guezenec] Olivier Guezenec mailto:olivier.guezenec&cogilab.com 2006-12 # [Olivier_Mascia] Olivier Mascia mailto:om&tipgroup.com +# [Olivier_St-Laurent] Olivier St-Laurent Galaxy4D Online Game mailto:admin&galaxy4d.com 2012-06-18 +# Engine # [One_Laptop_per_Child] One Laptop per mailto:devel&lists.laptop.org # Child/Collabora Ltd. # [Open_Mobile_Alliance] Open Mobile Alliance mailto:Technical-Comments&mail.openmobilealliance.org 2011-08-19 @@ -19950,6 +20056,7 @@ # [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 +# [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 # [Pat_Calhoun] Pat Calhoun mailto:CALHOUN&admin.eicon.qc.ca @@ -20166,6 +20273,7 @@ # [Piotr_Parlewicz] Piotr Parlewicz mailto:pparlewicz&queryobject.com # [Pisharath_Krishnan] Pisharath Krishnan mailto:krishnan&axis-inc.com # [Pit_Vetterick] Pit Vetterick mailto:pit&3dgo.com 2002-05 +# [PLASA] PLASA mailto:standards.na&plasa.org 2012-06-01 # [Portnoy_Boxman] Portnoy Boxman mailto:portnoy_boxman&bmc.com 2005-01 # [Portnoy_Boxman_2] Portnoy Boxman mailto:Portnoy_Boxman&bmc.com 2006-09 # [POWERSOFT_SRL] POWERSOFT S.R.L. mailto:claudio.lastrucci&powersoft.it 2012-01-03 @@ -20204,9 +20312,12 @@ # [Radware_LTD] Radware LTD. mailto:samuelb&radware.com 2011-08-05 # [Rafael_Zimberoff] Rafael Zimberoff mailto:rafael&zfirmllc.com 2003-11 # [Raghurama_Bhat] Raghurama Bhat mailto:raghu&quintus.com +# [Rahul_Bahadur] Rahul Bahadur Check Point Software mailto:rbahadur&checkpoint.com 2012-06-28 +# Technologies Ltd. # [Raimond_Diederik] Raimond Diederik mailto:rdiederik&descartes.com # [Rajeev_Verma] Rajeev Verma mailto:rajeev_verma&symantec.com 2006-02 # [Rajesh_Akkineni] Rajesh Akkineni mailto:rajesh&vimukti.com 2007-01 +# [Rajesh_Batra] Rajesh Batra Western Digital Inc. mailto:rajesh.batra&wdc.com 2012-07-11 # [Rajesh_D] Rajesh Dav SQRT(c) mailto:rajdave&microsoft.com 2009-02-03 # [Rajesh_Nandyalam] Rajesh Nandyalam mailto:rnandyal&emc.com # [Rajesh_Srinivasaragh] Rajesh Srinivasaraghavan mailto:srajesh&cup.hp.com @@ -20257,6 +20368,7 @@ # [Ray_Jantz] Ray Jantz mailto:ray.jantz&lsil.com # [Ray_Ozzie] Ray Ozzie mailto:ray&rocks.net # [Rayan_Zachariassen] Rayan Zachariassen mailto:rayan&ai.toronto.edu +# [Raymarine_UK_Limited] Raymarine UK Limited mailto:Geoff.Beer&raymarine.com 2012-05-24 # [Raymond_A_Diedrichs] Raymond A. Diedrichs mailto:rayd&slu.tr.unisys.com # [Raymond_Chaw] Raymond Chaw mailto:Raymond&esecutech.com 2007-05 # [Raymond_J_Young] Raymond J. Young mailto:Raymond.Young&ca.com 2002-04 @@ -20369,12 +20481,13 @@ # [Robert_Baldwin] Robert Baldwin mailto:baldwin&plusfive.com 2004-11 # [Robert_Ball] Robert Ball mailto:rob.ball&ge.com 2008-03-26 # [Robert_Banfill] Robert Banfill mailto:robert&banfill.net 2003-04 -# [Robert_Bosch_GmbH] Thomas Beck Robert Bosch GmbH mailto:Thomas.Beck8&bosch.com 2011-08-01 +# [Robert_Bosch_GmbH] Robert Bosch GmbH mailto:Klaus.Warth&bosch.com 2012-07-17 # [Robert_Boudrie] Robert Boudrie mailto:boudrie_rob&emc.com 2008-06-09 # [Robert_Byrne] Robert Byrne mailto:robert.byrne&ie.abb.com 2006-09 # [Robert_C_Henningsga] Robert C. Henningsgard mailto:rhenn_iana&laptwo.com # [Robert_Ciochon] Robert Ciochon mailto:robert.ciochon&ca.com 2006-08 # [Robert_D_Vincent] Robert D. Vincent mailto:bert&willowpond.com +# [Robert_Diamond] Robert Diamond mailto:rmd6502&gmail.com 2012-07-06 # [Robert_Dye] Robert Dye mailto:rob&natinst.com # [Robert_E_Johnson_II] Robert E. Johnson III mailto:johnson.robert&cimcor.com 2003-04 # [Robert_E_Minnear] Robert E. Minnear mailto:minnear&ipsilon.com @@ -20464,6 +20577,7 @@ # [Roman_Kriis] Roman Kriis mailto:roman&previo.ee # [Roman_Oliynyk] Roman Oliynyk mailto:romano&netinst.com # [Roman_Oliynyk_2] Roman Oliynyk mailto:roman&netinst.com 2007-08-30 +# [Roman_Stepanek] Roman Stepanek SODATSW spol. s r.o. mailto:roman.stepanek&sodatsw.cz 2012-05-31 # [Romeo_Kasanwidjojo] Romeo Kasanwidjojo mailto:romeo&microcomgroup.com # [Ron_Achin] Ron Achin mailto:RAchin&genscan.com # [Ron_Barber] Ron Barber mailto:ron.barber&amx.com 2003-11 @@ -20541,6 +20655,7 @@ # [Ryozo_Furutani] Ryozo Furutani mailto:furutani&np.lps.cs.fujitsu.co.jp # [Ryuichi_Horie] Ryuichi Horie mailto:horie&spad.sysrap.cs.fujitsu.co.jp # [Ryuichi_Suzuki] Ryuichi Suzuki mailto:SCI00376&niftyserve.or.jp +# [Ryusuke_Okuhara] Ryusuke Okuhara Canon Inc. mailto:okuhara.ryuusuke&canon.co.jp 2012-06-08 # SEGGER # [SEGGER] Microcontroller GmbH mailto:info&segger.com 2009-01-16 # & Co. KG @@ -20556,6 +20671,7 @@ # [Sabri_Berisha] Sabri Berisha mailto:sabri&cluecentral.net 2003-06 # [Sabu_Das] Sabu Das mailto:sabud&zicomsecure.com 2003-06 # [Sachin_Desai] Sachin Desai mailto:sachin&clairmail.com +# [Sachin_Sheth] Sachin Sheth Microsoft Corporation mailto:sachins&microsoft.com 2012-06-27 # [Sailalong_Software] Sailalong Software mailto:CustomerService&sailalong.com # [Salvo_Nassisi] Salvo Nassisi mailto:sdtech&tin.it # [Sam_Borman] Sam Borman mailto:sam_borman&uk.ibm.com @@ -20659,6 +20775,8 @@ # [Shankar_Prasad_2] Shankar Prasad mailto:shankar.prasad&honeywell.com # [Shannon_Yeh] Shannon Yeh mailto:yeh&netix.com # [Shantonu_Sen] Shantonu Sen mailto:ssen&apple.com +# [Shaper_Automation] Shaper Automation mailto:ports&shaperai.com 2012-06-22 +# Inc. # [Shaun_Byrne] Shaun Byrne mailto:s_byrne&tunstall.co.uk 2009-08-18 # [Shaun_Wexler] Shaun Wexler mailto:dev&macfoh.com # [Shawn_Casey] Shawn Casey mailto:Shawn.Casey&matrixone.com @@ -20699,6 +20817,7 @@ # [Simon_Hovell] Simon Hovell mailto:simonh&brandcomms.com # [Simon_J_Gerraty] Simon J. Gerraty mailto:sjg&quick.com.au # [Simon_Jolly] Simon Jolly mailto:simon.jolly&origin-data.co.uk 2002-07 +# [Simon_Newton] Simon Newton mailto:simon&nomis52.net 2012-06-01 # [Simon_P_Jackson] Simon P Jackson mailto:jacko&kring.co.uk # [Simon_Parker] Simon Parker mailto:simon.j.parker&philips.com # [Simon_Phipps] Simon Phipps mailto:sphipps&vnet.ibm.com @@ -20719,6 +20838,8 @@ # [Smith_Micro] Smith Micro mailto:cs&smithmicro.com # [Smith_Micro_Software_Inc] Smith Micro Software, mailto:dsperling&smithmicro.com 2011-10-10 # Inc. +# [SODATSW_spol] SODATSW spol. s r.o. mailto:info&sodatsw.cz 2012-05-31 +# [SOFTPRO_GmbH] SOFTPRO GmbH mailto:Dirk.Claussen&softpro.de 2012-07-19 # [softthere_com] softthere.com mailto:technical&softthere.com 2011-10-17 # [Software_Horizons_In] Software Horizons mailto:oi2000&shorizons.com # Inc. @@ -20890,6 +21011,7 @@ # [Support_Staff] Support Staff Sierra Photonics, mailto:support&sierraphotonics.com 2011-10-20 # Inc. # [Support_Team] Support Team mailto:support&eucalyptus.com +# [Surendra_Kumar] Surendra Kumar Cisco mailto:smkumar&cisco.com 2012-06-11 # [Susan_Hinrichs] Susan Hinrichs mailto:shinrich&cisco.com # [Susan_Sauter] Susan Sauter mailto:ssauter&cisco.com 2006-07 # [Sushil_Thomas] Sushil Thomas mailto:iana-comm&3par.com 2008-03-10 @@ -20972,6 +21094,8 @@ # [Theo_Schlossnagle] Theo Schlossnagle mailto:jesus&omniti.com 2009-05-19 # [Theodore_Ts_o] Theodore Ts'o mailto:tytso&mit.edu # [Therese_Hunt] Therese Hunt mailto:hunt&marcam.com +# [Thermo-Calc_Software] Thermo-Calc Software mailto:thomasr&thermocalc.se 2012-06-28 +# AB # [Thierry_Turletti] Thierry Turletti mailto:Thierry.Turletti&sophia.inria.fr # [Thom_McGrath] Thom McGrath mailto:thom&thezaz.com # [Thomas_Boerkel] Thomas Boerkel mailto:tbo&ap-ag.com 2008-06-06 @@ -21004,6 +21128,8 @@ # [Thomas_Martin] Thomas Martin mailto:thomas&datus-usa.com # [Thomas_McCabe] Thomas McCabe mailto:tmcca&westell.com # [Thomas_Obermair] Thomas Obermair mailto:tommy&inlab.m.eunet.de +# [Thomas_Revesz] Thomas Revesz Thermo-Calc Software mailto:thomasr&thermocalc.se 2012-06-28 +# AB # [Thomas_Ruchti] Thomas Ruchti mailto:thomasmruchti&eaton.com 2003-06 # [Thomas_Russell] Thomas Russell mailto:trussell&scte.org 2005-05 # [Thomas_Schleu] Thomas Schleu mailto:tschleu&canto.de @@ -21012,6 +21138,7 @@ # [Thomas_Sciorilli] Thomas Sciorilli Wi-Fi Alliance mailto:tsciorilli&wi-fi.org 2012-04-09 # [Thomas_Soerensen] Thomas Soerensen mailto:thomassoerensen&stofanet.dk 2002-04 # [Thomas_Soranno] Thomas Soranno mailto:tom_soranno&cipartners.com +# [Thomas_Tempelmann] Thomas Tempelmann mailto:tt&tempel.org 2012-06-19 # [Thomas_Weise] Thomas Weise mailto:weise&vs.uni-kassel.de 2006-04 # [Thomas_Zwick] Thomas Zwick mailto:thomas.zwick&tz-software.de 2011-10-12 # [Thor_Olson] Thor Olson mailto:Thor&terabase.com @@ -21239,6 +21366,8 @@ # [Vishal_Dharmadhikari] Vishal Dharmadhikari Hall Research mailto:vishal&hallresearch.com 2011-11-29 # [Vishnu_Varadaraj] Vishnu Varadaraj mailto:vishnuv&parabay.com # [Vishwas_Lele] Vishwas Lele mailto:Vishwas_Lele&appliedis.com +# [Vision_Solutions] Vision Solutions, mailto:james.wilkinson&visionsolutions.com 2012-06-06 +# Inc. # [Vitali_Fomine] Vitali Fomine mailto:info&winpopup-lan-messenger.com 2005-11 # [Vitaly_Revsin] Vitaly Revsin mailto:vitaly&webmanage.com # [Vitaly_Revsin_2] Vitaly Revsin mailto:vitaly&netapp.com @@ -21278,6 +21407,7 @@ # [Wes_Peters] Wes Peters mailto:wes&softweyr.com 2007-04 # [Wes_Wilson] Wes Wilson mailto:wwilson&iss.net 2003-10 # [Westell] Westell, Inc. mailto:jronk&westell.com +# [Western_Digital] Western Digital Inc. mailto:rajesh.batra&wdc.com 2012-07-11 # [Whamb] Whamb mailto:support&whamb.com # [Widgetschmie_de] Widgetschmie.de # [Wi-Fi_Alliance] Wi-Fi Alliance mailto:certifications&wi-fi.org 2012-04-09 @@ -21331,9 +21461,10 @@ # [www_nsovocal_com] www.nsovocal.com mailto:ben&nsovocal.com 2011-10-18 # [Wyatt_Williams] Wyatt Williams mailto:wyattw&icall.com # [Xavier_Roques] Xavier Roques mailto:xroques&infovista.fr +# [XMPP_Registrar] XMPP Registrar mailto:registrar&xmpp.org # [Xnet_Communications] Xnet Communications mailto:croco&xdsnet.de # [XuiS_Software_Ltd] XuiS Software Ltd. mailto:100322.2376&compuserve.com -# [XMPP_Registrar] XMPP Registrar mailto:registrar&xmpp.org +# [XXT_LLC] XXT LLC mailto:xxt.matt&sbcglobal.net 2012-07-12 # [Y_Ohiwa] Y. Ohiwa mailto:y-ohiwa&ael.fujitsu.co.jp # [Y_Y_Goland] Y. Y. Goland mailto:yarong&microsoft.com # [Yakov_Rekhter] Yakov Rekhter mailto:Yakov&ibm.com @@ -21353,6 +21484,7 @@ # [Yoann_Vandoorselaere] Yoann Vandoorselaere mailto:yoann&prelude-ids.org 2005-08 # [Yochai_Cohen] Yochai Cohen mailto:yochai&combox.co.il # [Yogesh_P_Gajjar] Yogesh P. Gajjar mailto:yogesh&cytel.com +# [Yohann_Sulaiman] Yohann Sulaiman mailto:ports&shaperai.com 2012-06-22 # [Yoneda_Terumasa] Yoneda Terumasa mailto:yonedat&pfu.co.jp # [Yong_Cai] Yong Cai mailto:ycai&emc.com # [YoonSoo_Kim] YoonSoo Kim mailto:ys71.kim&samsung.com 2006-05 @@ -21376,6 +21508,7 @@ # [Yusuke_Asai] Yusuke Asai mailto:yasai&nw1.file.fc.nec.co.jp # [Yutaka_Ono] Yutaka Ono mailto:ono&saint.nm.fujitsu.co.jp # [Yuval_Hager] Yuval Hager mailto:yuval&avramzon.net 2006-01 +# [Yuval_Rakavy] Yuval Rakavy mailto:yuval&villarakavy.com 2012-07-10 # [Yves_Gattegno] Yves Gattegno mailto:iana&qualystem.org 2004-12 # [Yvon_Marineau] Yvon Marineau mailto:yvon&simware.com # [Zach_Metzinger] Zach Metzinger mailto:zach.metzinger&maxim-ic.com

@@ -1,2 +1,2 @@ -#define SVNVERSION "SVN Rev 42761" +#define SVNVERSION "SVN Rev 43938" #define SVNPATH "/trunk-1.6"

@@ -66,7 +66,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -70,7 +70,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in

@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win32-setup.sh 41784 2012-03-27 00:56:28Z gerald $ +# $Id: win32-setup.sh 42858 2012-05-25 23:09:58Z gerald $ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2012-03-26-1.6" +export DOWNLOAD_TAG="2012-05-25-1.6" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/`

@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win64-setup.sh 41830 2012-03-29 20:19:56Z gerald $ +# $Id: win64-setup.sh 42858 2012-05-25 23:09:58Z gerald $ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2012-03-29-1.6" +export DOWNLOAD_TAG="2012-05-25-1.6" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/`

@@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 41975 2012-04-06 20:03:55Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z 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:8:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 1:9:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ if HAVE_WARNINGS_AS_ERRORS AM_NON_GENERATED_CFLAGS = -Werror @@ -91,12 +91,14 @@ # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml - rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \ - mkdir abi-check-headers; cp *.h abi-check-headers/; \ + rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz + mkdir abi-check-headers + cp *.h abi-check-headers/ abi-compliance-checker -l libwiretap -v1 `ls .libs/libwiretap.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml ; \ - cp -f abi_dumps/libwiretap/libwiretap_* .libs/; \ - cd .libs; ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwiretap/[0-9]*/log.txt + cp -f abi_dumps/libwiretap/libwiretap_* .libs/ + cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error

@@ -17,7 +17,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 41975 2012-04-06 20:03:55Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -115,7 +115,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in @@ -600,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:8:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 1:9:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror INCLUDES = -I$(srcdir)/.. CLEANFILES = \ @@ -1329,12 +1328,14 @@ # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml - rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \ - mkdir abi-check-headers; cp *.h abi-check-headers/; \ + rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz + mkdir abi-check-headers + cp *.h abi-check-headers/ abi-compliance-checker -l libwiretap -v1 `ls .libs/libwiretap.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml ; \ - cp -f abi_dumps/libwiretap/libwiretap_* .libs/; \ - cd .libs; ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwiretap/[0-9]*/log.txt + cp -f abi_dumps/libwiretap/libwiretap_* .libs/ + cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)

@@ -1,6 +1,6 @@ /* netscreen.c * - * $Id: netscreen.c 36748 2011-04-21 09:41:52Z guy $ + * $Id: netscreen.c 43867 2012-07-20 18:52:56Z gerald $ * * Juniper NetScreen snoop output parser * Created by re-using a lot of code from cosine.c @@ -358,7 +358,7 @@ char direction[2]; char cap_src[13]; - if (sscanf(line, "%9d.%9d: %15[a-z0-9/:.](%1[io]) len=%9d:%12s->%12s/", + if (sscanf(line, "%9d.%9d: %15[a-z0-9/:.-](%1[io]) len=%9d:%12s->%12s/", &sec, &dsec, cap_int, direction, &pkt_len, cap_src, cap_dst) < 5) { *err = WTAP_ERR_BAD_RECORD; *err_info = g_strdup("netscreen: Can't parse packet-header");

@@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -127,12 +127,14 @@ # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml - rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \ - mkdir abi-check-headers; cp ../config.h *.h abi-check-headers/; \ + rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz + mkdir abi-check-headers + cp ../config.h *.h abi-check-headers/ abi-compliance-checker -l libwsutil -v1 `ls .libs/libwsutil.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \ - cp -f abi_dumps/libwsutil/libwsutil_* .libs/; \ - cd .libs; ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwsutil/[0-9]*/log.txt + cp -f abi_dumps/libwsutil/libwsutil_* .libs/ + cd .libs && ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \

@@ -16,7 +16,7 @@ # Makefile.am # -# $Id: Makefile.am 41782 2012-03-26 22:34:36Z gerald $ +# $Id: Makefile.am 43168 2012-06-08 22:43:50Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -125,7 +125,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \ $(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \ - $(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \ $(top_srcdir)/aclocal-fallback/libgcrypt.m4 \ $(top_srcdir)/aclocal-fallback/libsmi.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in @@ -827,12 +826,14 @@ # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 dumpabi: all abi-descriptor.xml - rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \ - mkdir abi-check-headers; cp ../config.h *.h abi-check-headers/; \ + rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz + mkdir abi-check-headers + cp ../config.h *.h abi-check-headers/ abi-compliance-checker -l libwsutil -v1 `ls .libs/libwsutil.so.?.?.?|sed 's/.*\.so\.//'` \ - -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \ - cp -f abi_dumps/libwsutil/libwsutil_* .libs/; \ - cd .libs; ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz + -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ + cat logs/libwsutil/[0-9]*/log.txt + cp -f abi_dumps/libwsutil/libwsutil_* .libs/ + cd .libs && ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz checkapi: $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \

Changes of Revision 18